From f844fffd1ebd4178292df09ce181ad0d6db4038f Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Mon, 31 Mar 2025 18:27:01 -0400 Subject: v1.15.1: Zenos yae Galvus: Echo 1 (#181) * version 1.15.0 (#144) Signed-off-by: Xe Iaso * cmd/anubis actually check the result with the correct difficulty Signed-off-by: Xe Iaso * v1.15.1: Zenos yae Galvus: Echo 1 Signed-off-by: Xe Iaso --------- Signed-off-by: Xe Iaso Co-authored-by: Henri Vasserman --- lib/anubis.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/anubis.go b/lib/anubis.go index 83e04dd..026f912 100644 --- a/lib/anubis.go +++ b/lib/anubis.go @@ -145,14 +145,13 @@ func New(opts Options) (*Server, error) { } type Server struct { - mux *http.ServeMux - next http.Handler - priv ed25519.PrivateKey - pub ed25519.PublicKey - policy *policy.ParsedConfig - opts Options - DNSBLCache *decaymap.Impl[string, dnsbl.DroneBLResponse] - ChallengeDifficulty int + mux *http.ServeMux + next http.Handler + priv ed25519.PrivateKey + pub ed25519.PublicKey + policy *policy.ParsedConfig + opts Options + DNSBLCache *decaymap.Impl[string, dnsbl.DroneBLResponse] } func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { @@ -428,9 +427,9 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) { } // compare the leading zeroes - if !strings.HasPrefix(response, strings.Repeat("0", s.ChallengeDifficulty)) { + if !strings.HasPrefix(response, strings.Repeat("0", rule.Challenge.Difficulty)) { s.ClearCookie(w) - lg.Debug("difficulty check failed", "response", response, "difficulty", s.ChallengeDifficulty) + lg.Debug("difficulty check failed", "response", response, "difficulty", rule.Challenge.Difficulty) templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid response")), templ.WithStatus(http.StatusForbidden)).ServeHTTP(w, r) failedValidations.Inc() return -- cgit v1.2.3