ADD: root folder

Author: jarpsimoes

Dockerfile

@@ -20,7 +20,7 @@ ENV PATH_WEBHOOK "_hook"
 ENV PATH_HEALTH "_health"
 ENV REPO_BRANCH "main"
 ENV REPO_TARGET_FOLDER "target-git"
-ENV REPO_URL "https://github.com/jarpsimoes/git-http-server.git"
+ENV REPO_URL ""
 ENV HTTP_PORT 8081
 
 RUN mkdir -p ${APP_HOME}

README.md

@@ -23,14 +23,16 @@ The GIT-HttpServer only support basic authentication on repositories by protocol
 | PATH_VERSION              | Set get git commit version path                          | _version                                          | Yes       |
 | PATH_WEBHOOK              | Set webhook path                                         | _hook                                             | Yes       |
 | PATH_HEALTH               | Set health check path                                    | _health                                           | Yes       |
-| REPO_BRANCH               | Set default branch to clone content                      | main                                              | Yes       |
-| REPO_TARGET_FOLDER        | Set folder to clone source                               | target-git                                        | Yes       |
-| REPO_URL                  | Set url as a source origin                               | https://github.com/jarpsimoes/git-http-server.git | Yes       |
+| REPO_BRANCH               | Set default branch to clone content                      | main                                              | No        |
+| REPO_TARGET_FOLDER        | Set folder to clone source                               | target-git                                        | No        |
+| REPO_URL                  | Set url as a source origin                               | https://github.com/jarpsimoes/git-http-server.git | No        |
 | REPO_USERNAME             | Set username or token identifier to basic authentication | N/D                                               | No        |
 | REPO_PASSWORD             | Set password or token to basic authentication            | N/D                                               | No        |
 | HTTP_PORT                 | Set port to expose content                               | 8081                                              | Yes       |
 | GHS_CUSTOM_PATH_<path>    | Custom path to work as a proxy server                    | N/D                                               | No        |
 | GHS_CUSTOM_REWRITE_<path> | Set to remove from proxy request base path               | N/D                                               | No        |
+| FOLDER_ROOT               | Select root folder inside cloned repository              | $REPO_TARGET_FOLDER/                              | No        |
+
 
 ## Implementation
 

src/handlers/default_handlers.go

@@ -14,6 +14,7 @@ import (
 // StaticContentHandler it's a provider static content cloned from repository
 func StaticContentHandler(w http.ResponseWriter, r *http.Request) {
 	repoConfig := utils.GetRepositoryConfigInstance()
+
 	keys, ok := r.URL.Query()["_branch"]
 
 	branch := repoConfig.GetBranch()
@@ -25,6 +26,15 @@ func StaticContentHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	basePath := utils.BuildBranchPath(repoConfig.GetTargetFolder(), branch)
+
+	if repoConfig.GetRootFolder() != "" {
+		basePath = fmt.Sprintf("%s/%s", basePath, repoConfig.GetRootFolder())
+
+		if strings.Contains(basePath, "//") {
+			basePath = strings.ReplaceAll(basePath, "//", "/")
+		}
+	}
+
 	log.Printf("[Request] Path %s", basePath)
 
 	fs := http.FileServer(http.Dir(basePath))
@@ -66,6 +76,15 @@ func PullHandler(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, "Last commit [%s]", commit.ToString())
 }
 
+// FeatureNotEnabled it's a handler to response feature not enabled
+func FeatureNotEnabled(w http.ResponseWriter, r *http.Request) {
+
+	w.WriteHeader(http.StatusNotAcceptable)
+
+	fmt.Fprintf(w, "Operation %s not supported with present configuration \n", r.URL)
+
+}
+
 // HealthCheckHandler it's a handler to return server status
 func HealthCheckHandler(w http.ResponseWriter, r *http.Request) {
 	healthCheck := utils.GetHealthCheckControlInstance()

src/server.go

@@ -16,10 +16,15 @@ func main() {
 	repo := utils.GetRepositoryConfigInstance()
 	customPaths := utils.GetCustomPathsInstance()
 
-	utils.CloneRepository(repo.GetRepo(), repo.GetBranch(), repo.GetTargetFolder(), true)
+	if repo.GetRepo() != "" {
+		utils.CloneRepository(repo.GetRepo(), repo.GetBranch(), repo.GetTargetFolder(), true)
+		http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetClone()), handlers.CloneHandler)
+		http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetPull()), handlers.PullHandler)
+	} else {
+		http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetClone()), handlers.FeatureNotEnabled)
+		http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetPull()), handlers.FeatureNotEnabled)
+	}
 
-	http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetClone()), handlers.CloneHandler)
-	http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetPull()), handlers.PullHandler)
 	http.HandleFunc(fmt.Sprintf("/%s/", routeConfig.GetHealthCheck()), handlers.HealthCheckHandler)
 	if len(*customPaths) > 0 {
 

src/utils/environment_config.go

@@ -28,6 +28,7 @@ type BaseRepositoryConfig struct {
 	repoURL      string
 	branch       string
 	targetFolder string
+	rootFolder   string
 }
 
 // BasicAuthenticationMethod it's a struct to represent authorization configuration
@@ -121,6 +122,11 @@ func (brc BaseRepositoryConfig) GetTargetFolder() string {
 	return brc.targetFolder
 }
 
+// GetRootFolder (baseRepositoryConfig) it's a method to get root folder
+func (brc BaseRepositoryConfig) GetRootFolder() string {
+	return brc.rootFolder
+}
+
 // Show (BasicAuthenticationMethod) it's a function print strut content as string
 func (bam BasicAuthenticationMethod) Show() string {
 	return fmt.Sprintf("username=%v, password=******", bam.username)
@@ -149,14 +155,14 @@ func GetRouteConfigInstance() *BaseRouteConfig {
 		if baseRouteConfigInstance == nil {
 			log.Println("[BaseRouteConfig] Creating new instance ")
 
-			// TODO Replace with Environment Variables
 			baseRouteConfigInstance = &BaseRouteConfig{
 				clonePath:          os.Getenv("PATH_CLONE"),
 				webhookPath:        os.Getenv("PATH_WEBHOOK"),
 				pullPath:           os.Getenv("PATH_PULL"),
 				versionPath:        os.Getenv("PATH_VERSION"),
 				healthCheckControl: os.Getenv("PATH_HEALTH"),
 			}
+
 		}
 	}
 	return baseRouteConfigInstance
@@ -175,6 +181,7 @@ func GetRepositoryConfigInstance() *BaseRepositoryConfig {
 				repoURL:      os.Getenv("REPO_URL"),
 				branch:       os.Getenv("REPO_BRANCH"),
 				targetFolder: os.Getenv("REPO_TARGET_FOLDER"),
+				rootFolder:   os.Getenv("FOLDER_ROOT"),
 			}
 
 		}