From 320564ec18d39f453e00027f0e63461128cec083 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Thu, 18 Aug 2022 11:40:29 +0200
Subject: [PATCH] add first default branch on DNS query

---
 cmd/main.go                         | 1 +
 server/certificates/certificates.go | 3 ++-
 server/dns/dns.go                   | 8 ++++----
 server/handler.go                   | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index aa361a8..1830cef 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -123,6 +123,7 @@ func Serve(ctx *cli.Context) error {
 
 	listener = tls.NewListener(listener, certificates.TLSConfig(mainDomainSuffix,
 		giteaClient,
+		defaultBranches[0],
 		dnsProvider,
 		acmeUseRateLimits,
 		keyCache, challengeCache, dnsLookupCache, canonicalDomainCache,
diff --git a/server/certificates/certificates.go b/server/certificates/certificates.go
index 8944468..b1c1329 100644
--- a/server/certificates/certificates.go
+++ b/server/certificates/certificates.go
@@ -38,6 +38,7 @@ import (
 // TLSConfig returns the configuration for generating, serving and cleaning up Let's Encrypt certificates.
 func TLSConfig(mainDomainSuffix []byte,
 	giteaClient *gitea.Client,
+	firstDefaultBranch,
 	dnsProvider string,
 	acmeUseRateLimits bool,
 	keyCache, challengeCache, dnsLookupCache, canonicalDomainCache cache.SetGetKey,
@@ -75,7 +76,7 @@ func TLSConfig(mainDomainSuffix []byte,
 				sni = string(sniBytes)
 			} else {
 				var targetRepo, targetBranch string
-				targetOwner, targetRepo, targetBranch = dnsutils.GetTargetFromDNS(sni, string(mainDomainSuffix), dnsLookupCache)
+				targetOwner, targetRepo, targetBranch = dnsutils.GetTargetFromDNS(sni, string(mainDomainSuffix), firstDefaultBranch, dnsLookupCache)
 				if targetOwner == "" {
 					// DNS not set up, return main certificate to redirect to the docs
 					sniBytes = mainDomainSuffix
diff --git a/server/dns/dns.go b/server/dns/dns.go
index dc759b0..d30f1e0 100644
--- a/server/dns/dns.go
+++ b/server/dns/dns.go
@@ -9,7 +9,7 @@ import (
 
 // GetTargetFromDNS searches for CNAME or TXT entries on the request domain ending with MainDomainSuffix.
 // If everything is fine, it returns the target data.
-func GetTargetFromDNS(domain, mainDomainSuffix string, dnsLookupCache cache.SetGetKey) (targetOwner, targetRepo, targetBranch string) {
+func GetTargetFromDNS(domain, mainDomainSuffix, firstDefaultBranch string, dnsLookupCache cache.SetGetKey) (targetOwner, targetRepo, targetBranch string) {
 	// Get CNAME or TXT
 	var cname string
 	var err error
@@ -46,10 +46,10 @@ func GetTargetFromDNS(domain, mainDomainSuffix string, dnsLookupCache cache.SetG
 		targetBranch = cnameParts[len(cnameParts)-3]
 	}
 	if targetRepo == "" {
-		targetRepo = "pages"
+		targetRepo = firstDefaultBranch
 	}
-	if targetBranch == "" && targetRepo != "pages" {
-		targetBranch = "pages"
+	if targetBranch == "" && targetRepo != firstDefaultBranch {
+		targetBranch = firstDefaultBranch
 	}
 	// if targetBranch is still empty, the caller must find the default branch
 	return
diff --git a/server/handler.go b/server/handler.go
index 5f56e0f..eaa2feb 100644
--- a/server/handler.go
+++ b/server/handler.go
@@ -263,7 +263,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
 			trimmedHostStr := string(trimmedHost)
 
 			// Serve pages from external domains
-			targetOwner, targetRepo, targetBranch = dns.GetTargetFromDNS(trimmedHostStr, string(mainDomainSuffix), dnsLookupCache)
+			targetOwner, targetRepo, targetBranch = dns.GetTargetFromDNS(trimmedHostStr, string(mainDomainSuffix), defaultBranches[0], dnsLookupCache)
 			if targetOwner == "" {
 				html.ReturnErrorPage(ctx, fasthttp.StatusFailedDependency)
 				return
@@ -288,7 +288,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
 					return
 				} else if canonicalDomain != trimmedHostStr {
 					// only redirect if the target is also a codeberg page!
-					targetOwner, _, _ = dns.GetTargetFromDNS(strings.SplitN(canonicalDomain, "/", 2)[0], string(mainDomainSuffix), dnsLookupCache)
+					targetOwner, _, _ = dns.GetTargetFromDNS(strings.SplitN(canonicalDomain, "/", 2)[0], string(mainDomainSuffix), defaultBranches[0], dnsLookupCache)
 					if targetOwner != "" {
 						ctx.Redirect("https://"+canonicalDomain+string(ctx.RequestURI()), fasthttp.StatusTemporaryRedirect)
 						return