aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/anubis/.gitignore3
-rw-r--r--cmd/anubis/main.go5
2 files changed, 2 insertions, 6 deletions
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)