Merge branch '228-pages-incorrectly-serve-acme-challenges-with-index-html' into 'master'

Resolve "Pages incorrectly serve acme-challenges with /index.html"

See merge request gitlab-org/gitlab-pages!151

3 files changed, 17 insertions, 0 deletions

diff --git a/internal/domain/domain.go b/internal/domain/domain.go
index 4ce8a561..eeb5519d 100644
--- a/internal/domain/domain.go
+++ b/internal/domain/domain.go
@@ -186,6 +186,12 @@ func (d *D) HasAcmeChallenge(token string) bool {
 		return true
 	}
 
+	_, err = d.resolvePath(d.projectName, ".well-known/acme-challenge", token, "index.html")
+
+	if err == nil {
+		return true
+	}
+
 	return false
 }
 
diff --git a/internal/domain/domain_test.go b/internal/domain/domain_test.go
index a05dbe7e..14e399ad 100644
--- a/internal/domain/domain_test.go
+++ b/internal/domain/domain_test.go
@@ -226,6 +226,16 @@ func TestHasAcmeChallenge(t *testing.T) {
 			expected: true,
 		},
 		{
+			name: "Project containing acme challenge",
+			domain: &D{
+				group:       group{name: "group.acme"},
+				projectName: "with.acme.challenge",
+				config:      &domainConfig{HTTPSOnly: true},
+			},
+			token:    "foldertoken",
+			expected: true,
+		},
+		{
 			name: "Project containing another token",
 			domain: &D{
 				group:       group{name: "group.acme"},
diff --git a/shared/pages/group.acme/with.acme.challenge/public/.well-known/acme-challenge/foldertoken/index.html b/shared/pages/group.acme/with.acme.challenge/public/.well-known/acme-challenge/foldertoken/index.html
new file mode 100644
index 00000000..40047a2a
--- /dev/null
+++ b/shared/pages/group.acme/with.acme.challenge/public/.well-known/acme-challenge/foldertoken/index.html
@@ -0,0 +1 @@
+foldertoken