ProfessionalUwU/echoip
1
0
Fork 0
mirror of https://github.com/mpolden/echoip.git synced 2025-07-15 13:33:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve tests

Browse Source 
Fixes #8.
This commit is contained in:
Martin Polden
2015-09-29 20:39:21 +02:00
parent 04383146ed
commit fa32c7ff66
2 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
api/api.go
View File

@ -29,20 +29,32 @@ const (
var cliUserAgentExp = regexp.MustCompile("^(?i)(curl|wget|fetch\\slibfetch)\\/.*$")
type API struct {
db *geoip2.Reader
CORS bool
ReverseLookup bool
Template string
lookupAddr func(string) ([]string, error)
lookupCountry func(net.IP) (string, error)
ipFromRequest func(*http.Request) (net.IP, error)
}
func New() *API { return &API{} }
func New() *API {
return &API{
lookupAddr: net.LookupAddr,
lookupCountry: func(ip net.IP) (string, error) { return "", nil },
ipFromRequest: ipFromRequest,
}
}
func NewWithGeoIP(filepath string) (*API, error) {
db, err := geoip2.Open(filepath)
if err != nil {
return nil, err
}
return &API{db: db}, nil
api := New()
api.lookupCountry = func(ip net.IP) (string, error) {
return lookupCountry(db, ip)
}
return api, nil
}
type Cmd struct {
@ -100,11 +112,11 @@ func headerPairFromRequest(r *http.Request) (string, string, error) {
return header, value, nil
}
func (a *API) lookupCountry(ip net.IP) (string, error) {
if a.db == nil {
func lookupCountry(db *geoip2.Reader, ip net.IP) (string, error) {
if db == nil {
return "", nil
}
record, err := a.db.Country(ip)
record, err := db.Country(ip)
if err != nil {
return "", err
}
@ -187,25 +199,24 @@ func cliMatcher(r *http.Request, rm *mux.RouteMatch) bool {
func (a *API) requestFilter(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ip, err := ipFromRequest(r)
ip, err := a.ipFromRequest(r)
if err != nil {
r.Header.Set(IP_HEADER, err.Error())
log.Print(err)
r.Header.Set(IP_HEADER, "")
} else {
r.Header.Set(IP_HEADER, ip.String())
country, err := a.lookupCountry(ip)
if err != nil {
r.Header.Set(COUNTRY_HEADER, err.Error())
} else {
r.Header.Set(COUNTRY_HEADER, country)
log.Print(err)
}
r.Header.Set(COUNTRY_HEADER, country)
}
if a.ReverseLookup {
hostname, err := net.LookupAddr(ip.String())
hostname, err := a.lookupAddr(ip.String())
if err != nil {
r.Header.Set(HOSTNAME_HEADER, err.Error())
} else {
r.Header.Set(HOSTNAME_HEADER, strings.Join(hostname, ", "))
log.Print(err)
}
r.Header.Set(HOSTNAME_HEADER, strings.Join(hostname, ", "))
}
if a.CORS {
w.Header().Set("Access-Control-Allow-Methods", "GET")