Fix host api endpoints

This commit is contained in:
George Shammas 2022-01-05 10:46:22 -05:00
parent 8906365897
commit 7b2fcd7473
1 changed files with 4 additions and 5 deletions

View File

@ -118,14 +118,13 @@ func mainHandler(c *gin.Context) {
c.Set("referer", c.Request.Header.Get("Referer")) c.Set("referer", c.Request.Header.Get("Referer"))
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"))
c.Set("host", ip.IP.String())
// 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] == "" && !isReqFromCmdLine(ua)) { if fields[0] == "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", "")
} else {
c.Set("host", hostnames[0]) c.Set("host", hostnames[0])
} }
} }
@ -200,7 +199,7 @@ func main() {
for _, route := range []string{ for _, route := range []string{
"ip", "ua", "port", "lang", "encoding", "method", "ip", "ua", "port", "lang", "encoding", "method",
"mime", "referer", "forwarded", "country_code", "mime", "referer", "forwarded", "country_code",
"all", "headers", "porttest", "all", "headers", "porttest", "host",
} { } {
r.GET(fmt.Sprintf("/%s", route), mainHandler) r.GET(fmt.Sprintf("/%s", route), mainHandler)
r.GET(fmt.Sprintf("/%s.json", route), mainHandler) r.GET(fmt.Sprintf("/%s.json", route), mainHandler)