repo: manipulate paths with 'filepath.Join()'

Replace manual path joining via string concatenation with use of
'filepath.Join()'. The path normalization provided by the function helps
avoid issues caused by missing (or extra) path separators and aligns paths
to the to the appropriate filesystem's conventions.

Signed-off-by: Victoria Dye <vdye@github.com>

Author: vdye

internal/core/paths.go

@@ -2,20 +2,21 @@ package core
 
 import (
 	"os/user"
+	"path/filepath"
 )
 
 func bundleroot(user *user.User) string {
-	return user.HomeDir + "/git-bundle-server/"
+	return filepath.Join(user.HomeDir, "git-bundle-server")
 }
 
 func webroot(user *user.User) string {
-	return bundleroot(user) + "www/"
+	return filepath.Join(bundleroot(user), "www")
 }
 
 func reporoot(user *user.User) string {
-	return bundleroot(user) + "git/"
+	return filepath.Join(bundleroot(user), "git")
 }
 
 func CrontabFile(user *user.User) string {
-	return bundleroot(user) + "cron-schedule"
+	return filepath.Join(bundleroot(user), "cron-schedule")
 }

internal/core/repo.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/github/git-bundle-server/internal/common"
 	"github.com/github/git-bundle-server/internal/log"
@@ -57,8 +58,8 @@ func (r *repoProvider) CreateRepository(ctx context.Context, route string) (*Rep
 		return &repo, nil
 	}
 
-	repodir := reporoot(user) + route
-	web := webroot(user) + route
+	repodir := filepath.Join(reporoot(user), route)
+	web := filepath.Join(webroot(user), route)
 
 	mkdirErr := os.MkdirAll(web, os.ModePerm)
 	if mkdirErr != nil {
@@ -105,8 +106,7 @@ func (r *repoProvider) writeRouteFile(repos map[string]Repository) error {
 	if err != nil {
 		return err
 	}
-	dir := bundleroot(user)
-	routefile := dir + "/routes"
+	routefile := filepath.Join(bundleroot(user), "routes")
 
 	contents := ""
 
@@ -128,8 +128,7 @@ func (r *repoProvider) GetRepositories(ctx context.Context) (map[string]Reposito
 
 	repos := make(map[string]Repository)
 
-	dir := bundleroot(user)
-	routefile := dir + "/routes"
+	routefile := filepath.Join(bundleroot(user), "routes")
 
 	lines, err := r.fileSystem.ReadFileLines(routefile)
 	if err != nil {
@@ -142,8 +141,8 @@ func (r *repoProvider) GetRepositories(ctx context.Context) (map[string]Reposito
 
 		repo := Repository{
 			Route:   route,
-			RepoDir: reporoot(user) + route,
-			WebDir:  webroot(user) + route,
+			RepoDir: filepath.Join(reporoot(user), route),
+			WebDir:  filepath.Join(webroot(user), route),
 		}
 		repos[route] = repo
 	}

internal/core/repo_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"os/user"
+	"path/filepath"
 	"testing"
 
 	"github.com/github/git-bundle-server/internal/core"
@@ -115,8 +116,8 @@ func TestRepos_GetRepositories(t *testing.T) {
 					a := actual[repo.Route]
 
 					assert.Equal(t, repo.Route, a.Route)
-					assert.Equal(t, repo.RepoDir, a.RepoDir)
-					assert.Equal(t, repo.WebDir, a.WebDir)
+					assert.Equal(t, filepath.Clean(repo.RepoDir), a.RepoDir)
+					assert.Equal(t, filepath.Clean(repo.WebDir), a.WebDir)
 				}
 			}
 		})