lib/anubis: do not apply bot rules if address check fails

Closes #83

Author: Xe

docs/docs/CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed and clarified installation instructions
 - Introduced integration tests using Playwright
 - Refactor & Split up Anubis into cmd and lib.go
+- Fixed bot check to only apply if address range matches
 
 ## v1.14.2
 

lib/anubis.go

@@ -478,13 +478,13 @@ func (s *Server) check(r *http.Request) (CheckResult, *policy.Bot, error) {
 
 	for _, b := range s.policy.Bots {
 		if b.UserAgent != nil {
-			if uaMatch := b.UserAgent.MatchString(r.UserAgent()); uaMatch || (uaMatch && s.checkRemoteAddress(b, addr)) {
+			if b.UserAgent.MatchString(r.UserAgent()) && s.checkRemoteAddress(b, addr) {
 				return cr("bot/"+b.Name, b.Action), &b, nil
 			}
 		}
 
 		if b.Path != nil {
-			if pathMatch := b.Path.MatchString(r.URL.Path); pathMatch || (pathMatch && s.checkRemoteAddress(b, addr)) {
+			if b.Path.MatchString(r.URL.Path) && s.checkRemoteAddress(b, addr) {
 				return cr("bot/"+b.Name, b.Action), &b, nil
 			}
 		}
@@ -507,7 +507,7 @@ func (s *Server) check(r *http.Request) (CheckResult, *policy.Bot, error) {
 
 func (s *Server) checkRemoteAddress(b policy.Bot, addr net.IP) bool {
 	if b.Ranger == nil {
-		return false
+		return true
 	}
 
 	ok, err := b.Ranger.Contains(addr)