kenmirrors
/
ifconfig.io
mirror of https://github.com/georgyo/ifconfig.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Recognize requests from HTTPie and treat them like requests from curl

This commit is contained in:
Buildkite 2021-06-24 17:25:10 +08:00 committed by George Shammas
parent ef8a65594a
commit 6b6e51d03b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main.go
View File

@ -105,9 +105,11 @@ func mainHandler(c *gin.Context) {
c.Set("ifconfig_hostname", configuration.hostname) c.Set("ifconfig_hostname", configuration.hostname)
ua := c.Request.UserAgent()
c.Set("ip", ip.IP.String()) c.Set("ip", ip.IP.String())
c.Set("port", ip.Port) c.Set("port", ip.Port)
c.Set("ua", c.Request.UserAgent()) c.Set("ua", ua)
c.Set("lang", c.Request.Header.Get("Accept-Language")) c.Set("lang", c.Request.Header.Get("Accept-Language"))
c.Set("encoding", c.Request.Header.Get("Accept-Encoding")) c.Set("encoding", c.Request.Header.Get("Accept-Encoding"))
c.Set("method", c.Request.Method) c.Set("method", c.Request.Method)
@ -116,11 +118,9 @@ func mainHandler(c *gin.Context) {
c.Set("forwarded", c.Request.Header.Get("X-Forwarded-For")) c.Set("forwarded", c.Request.Header.Get("X-Forwarded-For"))
c.Set("country_code", c.Request.Header.Get("CF-IPCountry")) c.Set("country_code", c.Request.Header.Get("CF-IPCountry"))
ua := strings.Split(c.Request.UserAgent(), "/")
// Only lookup hostname if the results are going to need it. // Only lookup hostname if the results are going to need it.
// if stringInSlice(fields[0], []string{"all", "host"}) || (fields[0] == "" && ua[0] != "curl") { // if stringInSlice(fields[0], []string{"all", "host"}) || (fields[0] == "" && ua[0] != "curl") {
if stringInSlice(fields[0], []string{"host"}) || (fields[0] == "" && ua[0] != "curl") { if stringInSlice(fields[0], []string{"host"}) || (fields[0] == "" && !isReqFromCmdLine(ua)) {
hostnames, err := net.LookupAddr(ip.IP.String()) hostnames, err := net.LookupAddr(ip.IP.String())
if err != nil { if err != nil {
c.Set("host", "") c.Set("host", "")
@ -129,15 +129,13 @@ func mainHandler(c *gin.Context) {
} }
} }
wantsJSON := false wantsJSON := len(fields) >= 2 && fields[1] == "json"
if len(fields) >= 2 && fields[1] == "json" {
wantsJSON = true
}
switch fields[0] { switch fields[0] {
case "": case "":
//If the user is using curl, then we should just return the IP, else we show the home page. // If the user is using a command line agent like curl/HTTPie,
if ua[0] == "curl" { // then we should just return the IP, else we show the home page.
if isReqFromCmdLine(ua) {
c.String(200, fmt.Sprintln(ip.IP)) c.String(200, fmt.Sprintln(ip.IP))
} else { } else {
c.HTML(200, "index.html", c.Keys) c.HTML(200, "index.html", c.Keys)
@ -228,3 +226,7 @@ func main() {
fmt.Println(<-errc) fmt.Println(<-errc)
} }
func isReqFromCmdLine(ua string) bool {
return strings.HasPrefix(ua, "curl") || strings.HasPrefix(ua, "HTTPie")
}