From ec8227b98db2576e7213c76ce424df3fa3e4331c Mon Sep 17 00:00:00 2001
From: ebner <simon.ebner@psi.ch>
Date: Wed, 12 Mar 2025 17:31:13 +0100
Subject: [PATCH] improve path handling if path query parameters are present

---
 .gitignore    |  3 ++-
 giteapages.go | 40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index c8a6991..b38186e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 caddy
-Caddyfile
\ No newline at end of file
+Caddyfile
+Caddyfile_gitea-test.psi.ch
\ No newline at end of file
diff --git a/giteapages.go b/giteapages.go
index f7a271a..371b4a7 100644
--- a/giteapages.go
+++ b/giteapages.go
@@ -6,6 +6,7 @@ import (
 	"io/fs"
 	"mime"
 	"net/http"
+	"net/url"
 	"strings"
 
 	"code.gitea.io/sdk/gitea"
@@ -103,12 +104,18 @@ func (module *GiteaPagesModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error
 func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *http.Request, _ caddyhttp.Handler) error {
 
 	var organization, repository, path string
+
+	// the path might  have url query parameters e.g. "?h=vpn" - this need to be stripped of
+	parsedUrl, _ := url.Parse(request.URL.Path)
+	parsedUrl.RawQuery = "" // Clear the query parameters
+	path = parsedUrl.String()
+
 	if module.URLScheme == "simple" {
 		// "Simple" URL case - we expect the organization and repository in the URL
 		// The URL/path looks like http(s)://<giteaserver>[:<port>]/<organization>/<repository>[/<filepath>]
 
 		// Remove a potential "/" prefix and trailing "/" -  then split up the path
-		parts := strings.Split(strings.TrimSuffix(strings.TrimPrefix(request.URL.Path, "/"), "/"), "/")
+		parts := strings.Split(strings.TrimSuffix(strings.TrimPrefix(path, "/"), "/"), "/")
 
 		length := len(parts)
 		if length <= 1 {
@@ -130,7 +137,7 @@ func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *ht
 		organization = strings.Split(request.Host, ".")[0]
 
 		// Remove a potential "/" prefix and trailing "/" -  then split up the path
-		path = strings.TrimSuffix(strings.TrimPrefix(request.URL.Path, "/"), "/")
+		path = strings.TrimSuffix(strings.TrimPrefix(path, "/"), "/")
 
 		if path == "" {
 			// Case http(s)://<organization>.<giteaserver>[:<port>]
@@ -177,12 +184,20 @@ func (module GiteaPagesModule) ServeHTTP(writer http.ResponseWriter, request *ht
 	// Handle request
 	content, err := module.getFile(organization, repository, module.PagesBranch, path)
 	if err != nil {
-		module.Logger.Error("Unable to retrieve file - error: " + err.Error())
-		return caddyhttp.Error(http.StatusNotFound, err)
+		module.Logger.Error("Unable to retrieve file: " + path + " - error: " + err.Error())
+
+		// append an index.html and retry
+		path = path + "/index.html"
+		content, err = module.getFile(organization, repository, module.PagesBranch, path)
+		if err != nil {
+			module.Logger.Error("Unable to retrieve file: " + path + " - error: " + err.Error())
+			return caddyhttp.Error(http.StatusNotFound, err)
+		}
+		// return caddyhttp.Error(http.StatusNotFound, err)
 	}
 
 	// Try to determine mime type based on extenstion of file
-	parts := strings.Split(request.URL.Path, ".")
+	parts := strings.Split(path, ".")
 	if len(parts) > 1 {
 		extension := parts[len(parts)-1] // get file extension
 		writer.Header().Add("Content-Type", mime.TypeByExtension("."+extension))
@@ -210,21 +225,6 @@ func (module GiteaPagesModule) repoBranchExists(organization, repository, branch
 	return branchInfo.Name == branch
 }
 
-// Check if a repo has a specific topic assigned
-func (module GiteaPagesModule) topicExists(organization, repository, topic string) bool {
-	topics, _, err := module.GiteaClient.ListRepoTopics(organization, repository, gitea.ListRepoTopicsOptions{})
-	if err != nil {
-		return false
-	}
-
-	for _, topicName := range topics {
-		if topicName == topic {
-			return true
-		}
-	}
-	return false
-}
-
 // Interface guards
 var (
 	_ caddy.Provisioner           = (*GiteaPagesModule)(nil)