diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/server/hits.go | 16 | ||||
| -rw-r--r-- | cmd/server/site.go | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/cmd/server/hits.go b/cmd/server/hits.go index 776e610..63b21c1 100644 --- a/cmd/server/hits.go +++ b/cmd/server/hits.go @@ -5,12 +5,11 @@ import ( "crypto/sha1" "encoding/base64" "fmt" - "net" "net/http" "strings" "text/template" - "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru" "src.userspace.com.au/sws" ) @@ -47,11 +46,6 @@ func handleHitCounter(db sws.CounterStore, mmdbPath string) http.HandlerFunc { return } - hit.Addr = r.RemoteAddr - if strings.Contains(r.RemoteAddr, ":") { - hit.Addr, _, err = net.SplitHostPort(r.RemoteAddr) - } - if r.Header.Get("X-Moz") == "prefetch" || r.Header.Get("X-Purpose") == "preview" { w.Header().Set("Content-Type", "image/gif") w.Write(gifBytes) @@ -105,12 +99,8 @@ func verifyHit(db sws.SiteGetter, h *sws.Hit) (*sws.Site, error) { debug(h.Host, "equals site name:", site.Name) return site, nil } - if strings.Contains(site.Aliases, h.Host) { - debug(h.Host, "equals site alias:", site.Name) - return site, nil - } - if site.AcceptSubdomains && strings.HasSuffix(h.Host, site.Name) { - debug(h.Host, "is subdomain:", site.Name) + if site.IncludesDomain(h.Host) { + debug(h.Host, "includes:", site.Name) return site, nil } return nil, fmt.Errorf("invalid host") diff --git a/cmd/server/site.go b/cmd/server/site.go index 9156bc6..728d571 100644 --- a/cmd/server/site.go +++ b/cmd/server/site.go @@ -54,7 +54,7 @@ func handleSite(db sws.SiteStore, rndr Renderer) http.HandlerFunc { } } if _, ok := filter["referrer"]; !ok { - if rs := sws.NewReferrerSet(hitSet); rs != nil { + if rs := sws.NewReferrerSet(hitSet, *site); rs != nil { rs.SortByHits() payload.ReferrerSet = rs } |