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:
-rw-r--r--internal/domain/domain.go6
-rw-r--r--internal/domain/domain_test.go10
-rw-r--r--shared/pages/group.acme/with.acme.challenge/public/.well-known/acme-challenge/foldertoken/index.html1
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