public/AdGuardHome
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/AdGuardHome.git synced 2026-08-03 22:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull request 2420: AGDNS-2743-auth-middleware-glinet

Browse Source 
Merge in DNS/adguard-home from AGDNS-2743-auth-middleware-glinet to master

Squashed commit of the following:

commit 66b6b3d94ec2e19c9fd7dc07c2496a7600d4395a
Merge: 7adae7e2a e1f87ac8f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jun 5 16:08:23 2025 +0300

    Merge branch 'master' into AGDNS-2743-auth-middleware-glinet

commit 7adae7e2a58bba2d224057e4079b4d1330d33b5d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jun 5 15:02:21 2025 +0300

    all: imp code

commit fbdc43cde06368db591e29618d0b7281f8342ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jun 4 21:50:38 2025 +0300

    home: add todo

commit 891db077a7bfc41ace66ec593e57253f50500737
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jun 4 20:36:29 2025 +0300

    home: imp docs

commit c706ab6fc4293ce504a2e7b04393296e34cec03e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Jun 3 22:40:07 2025 +0300

    home: imp code

commit 5c75efd020f94a72f6ed48a78e12409a98d2bdc7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jun 2 21:06:30 2025 +0300

    home: auth middleware glinet config

commit f537365ca40ac75046c0ca31746af139572fde84
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jun 2 15:46:26 2025 +0300

    home: auth middleware glinet
This commit is contained in:
Stanislav Chzhen
2025-06-05 17:26:39 +03:00
parent e1f87ac8f4
commit f69da062eb
6 changed files with 213 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/home/authhttp.go
View File

@@ -20,6 +20,7 @@ import (
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/logutil/slogutil"
"github.com/AdguardTeam/golibs/netutil"
"github.com/AdguardTeam/golibs/netutil/httputil"
"github.com/AdguardTeam/golibs/timeutil"
"github.com/AdguardTeam/golibs/validate"
)
@@ -392,8 +393,12 @@ func newAuthMiddlewareDefault(c *authMiddlewareDefaultConfig) (mw *authMiddlewar
}
}
// wrap adds authentication logic to the provided HTTP handler.
func (mw *authMiddlewareDefault) wrap(h http.Handler) (wrapped http.Handler) {
// type check
var _ httputil.Middleware = (*authMiddlewareDefault)(nil)
// Wrap implements the [httputil.Middleware] interface for
// *authMiddlewareDefault.
func (mw *authMiddlewareDefault) Wrap(h http.Handler) (wrapped http.Handler) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
if !mw.needsAuthentication(ctx, r) {