From 6a3ce167da2d2b02f772418576d32b00f25e1b44 Mon Sep 17 00:00:00 2001 From: Xe Iaso Date: Sun, 19 Jan 2025 08:23:16 -0500 Subject: cmd/build: fix other merge conflicts that I accidentally incurred by coding while waking up Signed-off-by: Xe Iaso --- cmd/anubis/.gitignore | 3 ++- cmd/anubis/main.go | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'cmd') diff --git a/cmd/anubis/.gitignore b/cmd/anubis/.gitignore index 8d5bedc..061bf12 100644 --- a/cmd/anubis/.gitignore +++ b/cmd/anubis/.gitignore @@ -1 +1,2 @@ -*.rpm \ No newline at end of file +*.rpm +anubis 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) -- cgit v1.2.3