From 0ee4835dc24c65acd51b85d7f668089a2d4de78c Mon Sep 17 00:00:00 2001
From: feistel <6742251-feistel@users.noreply.gitlab.com>
Date: Wed, 20 Apr 2022 20:26:55 +0200
Subject: Fix acme middleware passing handled requests to parent middlewares

---
 internal/acme/acme.go      | 2 +-
 internal/acme/acme_test.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'internal')

diff --git a/internal/acme/acme.go b/internal/acme/acme.go
index 039be32a..7b086eeb 100644
--- a/internal/acme/acme.go
+++ b/internal/acme/acme.go
@@ -31,7 +31,7 @@ func (m *Middleware) ServeAcmeChallenges(w http.ResponseWriter, r *http.Request,
 	}
 
 	if domain.ServeFileHTTP(w, r) {
-		return false
+		return true
 	}
 
 	return m.redirectToGitlab(w, r)
diff --git a/internal/acme/acme_test.go b/internal/acme/acme_test.go
index 1c3025d9..225d1dc4 100644
--- a/internal/acme/acme_test.go
+++ b/internal/acme/acme_test.go
@@ -51,7 +51,7 @@ func TestServeAcmeChallengeMalformed(t *testing.T) {
 }
 
 func TestServeAcmeChallengeWhenPresent(t *testing.T) {
-	require.HTTPStatusCode(t, serveAcmeOrNotFound(middleware, domainWithChallenge), http.MethodGet, challengeURL, nil, http.StatusNotFound)
+	require.HTTPStatusCode(t, serveAcmeOrNotFound(middleware, domainWithChallenge), http.MethodGet, challengeURL, nil, http.StatusOK)
 }
 
 func TestServeAcmeChallengeWhenMissing(t *testing.T) {
-- 
cgit v1.2.3