diff options
| author | Xe Iaso <me@xeiaso.net> | 2025-01-19 08:23:16 -0500 |
|---|---|---|
| committer | Xe Iaso <me@xeiaso.net> | 2025-01-19 08:23:16 -0500 |
| commit | 6a3ce167da2d2b02f772418576d32b00f25e1b44 (patch) | |
| tree | 7373b9f5e1ebb528e1a82aab8693e569ef41b1ed /cmd/anubis/main.go | |
| parent | d9a76c12763bb118ca708afcb0863e334c011f39 (diff) | |
| download | x-6a3ce167da2d2b02f772418576d32b00f25e1b44.tar.xz x-6a3ce167da2d2b02f772418576d32b00f25e1b44.zip | |
cmd/build: fix other merge conflicts that I accidentally incurred by coding while waking up
Signed-off-by: Xe Iaso <me@xeiaso.net>
Diffstat (limited to 'cmd/anubis/main.go')
| -rw-r--r-- | cmd/anubis/main.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cmd/anubis/main.go b/cmd/anubis/main.go index 1956c83..bb56bef 100644 --- a/cmd/anubis/main.go +++ b/cmd/anubis/main.go @@ -254,12 +254,7 @@ func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request) { return } -<<<<<<< Updated upstream - if claims["challenge"] != challengeFor(r) { -======= - claims := token.Claims.(jwt.MapClaims) if claims["challenge"] != s.challengeFor(r) { ->>>>>>> Stashed changes slog.Debug("invalid challenge", "path", r.URL.Path) clearCookie(w) s.renderIndex(w, r) |