ProfessionalUwU/echoip
1
0
Fork 0
mirror of https://github.com/mpolden/echoip.git synced 2025-06-26 20:57:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Martin Polden
2018-02-11 11:19:50 +01:00
parent 5d43f175d4
commit d49f1f7376
4 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
http/http.go
View File

@ -23,14 +23,11 @@ const (
textMediaType = "text/plain"
)
type LookupAddr func(net.IP) ([]string, error)
type LookupPort func(net.IP, uint64) error
type Server struct {
Template string
IPHeader string
lookupAddr LookupAddr
lookupPort LookupPort
LookupAddr func(net.IP) ([]string, error)
LookupPort func(net.IP, uint64) error
db database.Client
log *logrus.Logger
}
@ -50,8 +47,8 @@ type PortResponse struct {
Reachable bool `json:"reachable"`
}
func New(db database.Client, lookupAddr LookupAddr, lookupPort LookupPort, log *logrus.Logger) *Server {
return &Server{lookupAddr: lookupAddr, lookupPort: lookupPort, db: db, log: log}
func New(db database.Client, log *logrus.Logger) *Server {
return &Server{db: db, log: log}
}
func ipFromRequest(header string, r *http.Request) (net.IP, error) {
@ -85,8 +82,8 @@ func (s *Server) newResponse(r *http.Request) (Response, error) {
s.log.Debug(err)
}
var hostnames []string
if s.lookupAddr != nil {
h, err := s.lookupAddr(ip)
if s.LookupAddr != nil {
h, err := s.LookupAddr(ip)
if err != nil {
s.log.Debug(err)
}
@ -115,7 +112,7 @@ func (s *Server) newPortResponse(r *http.Request) (PortResponse, error) {
if err != nil {
return PortResponse{Port: port}, err
}
err = s.lookupPort(ip, port)
err = s.LookupPort(ip, port)
return PortResponse{
IP: ip,
Port: port,
@ -210,7 +207,7 @@ func (s *Server) DefaultHandler(w http.ResponseWriter, r *http.Request) *appErro
response,
r.Host,
string(json),
s.lookupPort != nil,
s.LookupPort != nil,
response.Country != "" && response.City != "",
}
if err := t.Execute(w, &data); err != nil {
@ -281,7 +278,7 @@ func (s *Server) Handler() http.Handler {
r.Handle("/", appHandler(s.DefaultHandler)).Methods("GET")
// Port testing
if s.lookupPort != nil {
if s.LookupPort != nil {
r.Handle("/port/{port:[0-9]+}", appHandler(s.PortHandler)).Methods("GET")
}

8
http/http_test.go
View File

@ -24,7 +24,7 @@ func (t *testDb) City(net.IP) (string, error) { return "Bornyasherk", nil }
func (t *testDb) IsEmpty() bool { return false }
func testServer() *Server {
return &Server{db: &testDb{}, lookupAddr: lookupAddr, lookupPort: lookupPort}
return &Server{db: &testDb{}, LookupAddr: lookupAddr, LookupPort: lookupPort}
}
func httpGet(url string, acceptMediaType string, userAgent string) (string, int, error) {
@ -85,9 +85,9 @@ func TestCLIHandlers(t *testing.T) {
func TestDisabledHandlers(t *testing.T) {
log.SetOutput(ioutil.Discard)
server := testServer()
server.lookupPort = nil
server.lookupAddr = nil
server.db = database.Empty()
server.LookupPort = nil
server.LookupAddr = nil
server.db, _ = database.New("", "")
s := httptest.NewServer(server.Handler())
var tests = []struct {