Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2022-04-20 21:26:55 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2022-04-22 14:03:26 +0300
commit0ee4835dc24c65acd51b85d7f668089a2d4de78c (patch)
treeec3dd93a2d950849c7d4117363a2c49bd878e242
parentdabfd71101d4598f31ab474f6a7bfc75bfa0a045 (diff)
Fix acme middleware passing handled requests to parent middlewares
-rw-r--r--internal/acme/acme.go2
-rw-r--r--internal/acme/acme_test.go2
2 files changed, 2 insertions, 2 deletions
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) {