Pull request 2202: Fix access error

Squashed commit of the following:

commit 55074010c38c0824c1df4a7c682a3baef4755015
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 16 17:16:41 2024 +0300

    all: rm replace

commit 983f8d133199225f495e25efa4afae3ef6d2eee4
Merge: d9fc69d69 201ac73cf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 16 16:06:28 2024 +0300

    Merge branch 'master' into fix-access-error

commit d9fc69d69a315de83ef50a64bf9f5b4b2e50c8d3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 11 19:18:24 2024 +0300

    all: fix before request, upd golibs
This commit is contained in:
Eugene Burkov 2024-04-16 17:23:46 +03:00
parent 201ac73cf0
commit 6f7d5cc4be
4 changed files with 8 additions and 5 deletions
internal/dnsforward

View file

@ -25,7 +25,10 @@ func (s *Server) HandleBefore(
) (err error) {
clientID, err := s.clientIDFromDNSContext(pctx)
if err != nil {
return fmt.Errorf("getting clientid: %w", err)
return &proxy.BeforeRequestError{
Err: fmt.Errorf("getting clientid: %w", err),
Response: s.NewMsgSERVFAIL(pctx.Req),
}
}
blocked, _ := s.IsBlockedClient(pctx.Addr.Addr(), clientID)