Home

ugit @main - refs - log -
- 
https://git.jolheiser.com/ugit.git
The code powering this h*ckin' site
tree log patch
refactor: move repo to middleware/context Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmWqAd0ACgkQuFOtpdp7 v3qTuw/+J6/lzjRV6q/M+ZaEzOr1ZuDiah4KcMrCeh1yO1vEzyzU1bPIvhvYHOcH XJIb/Zneva0vOw4V+DEqunWoMvvaCJ7uVp0RKq3msDOniFEPfajeoj9rW8bfPBLQ GSl3QavEOzJ4lGuGXafKj/dj9Ls7sTMpbbMzRDHh/rY6EE20TK18K5zOIsbYHFfd c/LiPyDv3fcx+2Det+iVf22UtvIBd39kQ0HpbIS7SvDgEJ/72jepu5B2weti5d1M 4eeNww9w1gwHjPUjf+0/n7m8hiGIdSlBKo4tSl5G3FjTL+oKAqObDTQGqUbWN0EO 7pDP37NJ/w9mf7CNTcbfds7R0fcQ1p+Px3t4/oBACudSVUkOCt2ChvJt75ATyUX5 SCyt0BnmXIXSchrzGZIMyVdRHsqRuMUnFVfQ3QWm7mi2TyMmRycA82BF3WcBC4rn ashG7j3JakAonFAWfhgR/il84dO0kGHXpngkkOfqyCWp6jq8GdUjHF3MPeHZ5LkX SMsQ0WVduiks73pkM+Juc8xGrAnS1ZZ4PkhzCuThQ+NBr2OfxSYc2UmQBpAu3Ck6 bL7bz9R7up8Tm5F4MHEv8lHMlrF3mE7kK1Dmfm407rD+iKgSQO+s1lDXc2MldmeX 8cl1RKqsOHL+X5hDO6uOPC7LmtbliYQE8p0vR/mx8F/wMqeZno0= =2npQ -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
3 changed files, 47 additions(+), 62 deletions(-)
internal/http/http.gointernal/http/middleware.gointernal/http/repo.go
M internal/http/http.go → internal/http/http.go
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22

diff --git a/internal/http/http.go b/internal/http/http.go
index 7e1bf4abc35c5104cab2cc6b237e479532d45f12..3fc9b6d59cd32ae61d2959f15d58f63f01834d48 100644
--- a/internal/http/http.go
+++ b/internal/http/http.go
@@ -62,6 +62,9 @@ 	mux.Use(middleware.Recoverer)
 
 	rh := repoHandler{s: settings}
 	mux.Route("/{repo}.git", func(r chi.Router) {
+		r.Get("/", func(w http.ResponseWriter, r *http.Request) {
+			http.Redirect(w, r, "/"+chi.URLParam(r, "repo"), http.StatusFound)
+		})
 		r.Get("/info/refs", httperr.Handler(rh.infoRefs))
 		r.Post("/git-upload-pack", httperr.Handler(rh.uploadPack))
 	})
@@ -69,6 +72,7 @@
 	mux.Route("/", func(r chi.Router) {
 		r.Get("/", httperr.Handler(rh.index))
 		r.Route("/{repo}", func(r chi.Router) {
+			r.Use(rh.repoMiddleware)
 			r.Get("/", func(w http.ResponseWriter, r *http.Request) {
 				if r.URL.Query().Has("go-get") {
 					repo := chi.URLParam(r, "repo")
I internal/http/middleware.go
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42

diff --git a/internal/http/middleware.go b/internal/http/middleware.go
new file mode 100644
index 0000000000000000000000000000000000000000..90e3afc95b5ff1e594ed363fb7ea4d2860a6fb17
--- /dev/null
+++ b/internal/http/middleware.go
@@ -0,0 +1,36 @@
+package http
+
+import (
+	"context"
+	"errors"
+	"io/fs"
+	"net/http"
+
+	"github.com/go-chi/chi/v5"
+	"go.jolheiser.com/ugit/internal/git"
+	"go.jolheiser.com/ugit/internal/http/httperr"
+)
+
+type ugitCtxKey string
+
+var repoCtxKey = ugitCtxKey("repo")
+
+func (rh repoHandler) repoMiddleware(next http.Handler) http.Handler {
+	return httperr.Handler(func(w http.ResponseWriter, r *http.Request) error {
+		repoName := chi.URLParam(r, "repo")
+		repo, err := git.NewRepo(rh.s.RepoDir, repoName)
+		if err != nil {
+			httpErr := http.StatusInternalServerError
+			if errors.Is(err, fs.ErrNotExist) {
+				httpErr = http.StatusNotFound
+			}
+			return httperr.Status(err, httpErr)
+		}
+		if repo.Meta.Private {
+			return httperr.Status(errors.New("could not get git repo"), http.StatusNotFound)
+		}
+		r = r.WithContext(context.WithValue(r.Context(), repoCtxKey, repo))
+		next.ServeHTTP(w, r)
+		return nil
+	})
+}
M internal/http/repo.go → internal/http/repo.go
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123

diff --git a/internal/http/repo.go b/internal/http/repo.go
index bc0196e159d32ab5b4167c8a599711e997d2a691..2c4aa9358a63521f591ceb32318e27ff4b6ac94a 100644
--- a/internal/http/repo.go
+++ b/internal/http/repo.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"go.jolheiser.com/ugit/internal/html/markup"
-	"io/fs"
 	"mime"
 	"net/http"
 	"path/filepath"
@@ -19,19 +18,9 @@ )
 
 func (rh repoHandler) repoTree(ref, path string) http.HandlerFunc {
 	return httperr.Handler(func(w http.ResponseWriter, r *http.Request) error {
-		repoName := chi.URLParam(r, "repo")
-		repo, err := git.NewRepo(rh.s.RepoDir, repoName)
-		if err != nil {
-			httpErr := http.StatusInternalServerError
-			if errors.Is(err, fs.ErrNotExist) {
-				httpErr = http.StatusNotFound
-			}
-			return httperr.Status(err, httpErr)
-		}
-		if repo.Meta.Private {
-			return httperr.Status(errors.New("could not get git repo"), http.StatusNotFound)
-		}
+		repo := r.Context().Value(repoCtxKey).(*git.Repo)
 
+		var err error
 		if ref == "" {
 			ref, err = repo.DefaultBranch()
 			if err != nil {
@@ -61,7 +50,7 @@ 			Description:                repo.Meta.Description,
 			BaseContext:                rh.baseContext(),
 			RepoHeaderComponentContext: rh.repoHeaderContext(repo, r),
 			RepoTreeComponentContext: html.RepoTreeComponentContext{
-				Repo: repoName,
+				Repo: repo.Name(),
 				Ref:  ref,
 				Tree: tree,
 				Back: back,
@@ -110,18 +99,7 @@ 	return nil
 }
 
 func (rh repoHandler) repoRefs(w http.ResponseWriter, r *http.Request) error {
-	repoName := chi.URLParam(r, "repo")
-	repo, err := git.NewRepo(rh.s.RepoDir, repoName)
-	if err != nil {
-		httpErr := http.StatusInternalServerError
-		if errors.Is(err, fs.ErrNotExist) {
-			httpErr = http.StatusNotFound
-		}
-		return httperr.Status(err, httpErr)
-	}
-	if repo.Meta.Private {
-		return httperr.Status(errors.New("could not get git repo"), http.StatusNotFound)
-	}
+	repo := r.Context().Value(repoCtxKey).(*git.Repo)
 
 	branches, err := repo.Branches()
 	if err != nil {
@@ -146,18 +124,7 @@ 	return nil
 }
 
 func (rh repoHandler) repoLog(w http.ResponseWriter, r *http.Request) error {
-	repoName := chi.URLParam(r, "repo")
-	repo, err := git.NewRepo(rh.s.RepoDir, repoName)
-	if err != nil {
-		httpErr := http.StatusInternalServerError
-		if errors.Is(err, fs.ErrNotExist) {
-			httpErr = http.StatusNotFound
-		}
-		return httperr.Status(err, httpErr)
-	}
-	if repo.Meta.Private {
-		return httperr.Status(errors.New("could not get git repo"), http.StatusNotFound)
-	}
+	repo := r.Context().Value(repoCtxKey).(*git.Repo)
 
 	commits, err := repo.Commits(chi.URLParam(r, "ref"))
 	if err != nil {
@@ -176,18 +143,7 @@ 	return nil
 }
 
 func (rh repoHandler) repoCommit(w http.ResponseWriter, r *http.Request) error {
-	repoName := chi.URLParam(r, "repo")
-	repo, err := git.NewRepo(rh.s.RepoDir, repoName)
-	if err != nil {
-		httpErr := http.StatusInternalServerError
-		if errors.Is(err, fs.ErrNotExist) {
-			httpErr = http.StatusNotFound
-		}
-		return httperr.Status(err, httpErr)
-	}
-	if repo.Meta.Private {
-		return httperr.Status(errors.New("could not get git repo"), http.StatusNotFound)
-	}
+	repo := r.Context().Value(repoCtxKey).(*git.Repo)
 
 	commit, err := repo.Commit(chi.URLParam(r, "commit"))
 	if err != nil {
@@ -214,18 +170,7 @@ 	return nil
 }
 
 func (rh repoHandler) repoPatch(w http.ResponseWriter, r *http.Request) error {
-	repoName := chi.URLParam(r, "repo")
-	repo, err := git.NewRepo(rh.s.RepoDir, repoName)
-	if err != nil {
-		httpErr := http.StatusInternalServerError
-		if errors.Is(err, fs.ErrNotExist) {
-			httpErr = http.StatusNotFound
-		}
-		return httperr.Status(err, httpErr)
-	}
-	if repo.Meta.Private {
-		return httperr.Status(errors.New("could not get git repo"), http.StatusNotFound)
-	}
+	repo := r.Context().Value(repoCtxKey).(*git.Repo)
 
 	commit, err := repo.Commit(chi.URLParam(r, "commit"))
 	if err != nil {