diff options
author | zeripath | 2021-09-02 17:34:49 +0100 |
---|---|---|
committer | GitHub | 2021-09-02 12:34:49 -0400 |
commit | ceae89c8c7a5edcff82a5d088f373a598901824d (patch) | |
tree | e3cbc27de25530de88fba994576ea86533b86630 | |
parent | 8f300781ad5aa52b004cb394bcc6c703da0303fb (diff) |
Allow BASIC authentication access to /:owner/:repo/releases/download/* (#16916) (#16923)
Backport #16916
Duplicate #15987 to allow access to releases download through BASIC authentication.
Fix #16914
Signed-off-by: Andrew Thornton <art27@cantab.net>
-rw-r--r-- | services/auth/auth.go | 6 | ||||
-rw-r--r-- | services/auth/auth_test.go | 14 | ||||
-rw-r--r-- | services/auth/basic.go | 2 | ||||
-rw-r--r-- | services/auth/reverseproxy.go | 2 |
4 files changed, 14 insertions, 10 deletions
diff --git a/services/auth/auth.go b/services/auth/auth.go index 5492a8b74..274a17564 100644 --- a/services/auth/auth.go +++ b/services/auth/auth.go @@ -80,11 +80,11 @@ func isAttachmentDownload(req *http.Request) bool { return strings.HasPrefix(req.URL.Path, "/attachments/") && req.Method == "GET" } -var gitRawPathRe = regexp.MustCompile(`^/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(?:(?:git-(?:(?:upload)|(?:receive))-pack$)|(?:info/refs$)|(?:HEAD$)|(?:objects/)|raw/)`) +var gitRawReleasePathRe = regexp.MustCompile(`^/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(?:(?:git-(?:(?:upload)|(?:receive))-pack$)|(?:info/refs$)|(?:HEAD$)|(?:objects/)|(?:raw/)|(?:releases/download/))`) var lfsPathRe = regexp.MustCompile(`^/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/info/lfs/`) -func isGitRawOrLFSPath(req *http.Request) bool { - if gitRawPathRe.MatchString(req.URL.Path) { +func isGitRawReleaseOrLFSPath(req *http.Request) bool { + if gitRawReleasePathRe.MatchString(req.URL.Path) { return true } if setting.LFS.StartServer { diff --git a/services/auth/auth_test.go b/services/auth/auth_test.go index f6b43835f..b0d23bb4e 100644 --- a/services/auth/auth_test.go +++ b/services/auth/auth_test.go @@ -83,6 +83,10 @@ func Test_isGitRawOrLFSPath(t *testing.T) { "/owner/repo/commit/123456789012345678921234567893124567894", false, }, + { + "/owner/repo/releases/download/tag/repo.tar.gz", + true, + }, } lfsTests := []string{ "/owner/repo/info/lfs/", @@ -102,11 +106,11 @@ func Test_isGitRawOrLFSPath(t *testing.T) { t.Run(tt.path, func(t *testing.T) { req, _ := http.NewRequest("POST", "http://localhost"+tt.path, nil) setting.LFS.StartServer = false - if got := isGitRawOrLFSPath(req); got != tt.want { + if got := isGitRawReleaseOrLFSPath(req); got != tt.want { t.Errorf("isGitOrLFSPath() = %v, want %v", got, tt.want) } setting.LFS.StartServer = true - if got := isGitRawOrLFSPath(req); got != tt.want { + if got := isGitRawReleaseOrLFSPath(req); got != tt.want { t.Errorf("isGitOrLFSPath() = %v, want %v", got, tt.want) } }) @@ -115,11 +119,11 @@ func Test_isGitRawOrLFSPath(t *testing.T) { t.Run(tt, func(t *testing.T) { req, _ := http.NewRequest("POST", tt, nil) setting.LFS.StartServer = false - if got := isGitRawOrLFSPath(req); got != setting.LFS.StartServer { - t.Errorf("isGitOrLFSPath(%q) = %v, want %v, %v", tt, got, setting.LFS.StartServer, gitRawPathRe.MatchString(tt)) + if got := isGitRawReleaseOrLFSPath(req); got != setting.LFS.StartServer { + t.Errorf("isGitOrLFSPath(%q) = %v, want %v, %v", tt, got, setting.LFS.StartServer, gitRawReleasePathRe.MatchString(tt)) } setting.LFS.StartServer = true - if got := isGitRawOrLFSPath(req); got != setting.LFS.StartServer { + if got := isGitRawReleaseOrLFSPath(req); got != setting.LFS.StartServer { t.Errorf("isGitOrLFSPath(%q) = %v, want %v", tt, got, setting.LFS.StartServer) } }) diff --git a/services/auth/basic.go b/services/auth/basic.go index 0bce4f1d0..36684bb10 100644 --- a/services/auth/basic.go +++ b/services/auth/basic.go @@ -49,7 +49,7 @@ func (b *Basic) Free() error { // Returns nil if header is empty or validation fails. func (b *Basic) Verify(req *http.Request, w http.ResponseWriter, store DataStore, sess SessionStore) *models.User { // Basic authentication should only fire on API, Download or on Git or LFSPaths - if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawOrLFSPath(req) { + if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawReleaseOrLFSPath(req) { return nil } diff --git a/services/auth/reverseproxy.go b/services/auth/reverseproxy.go index f958d28c9..d1487718f 100644 --- a/services/auth/reverseproxy.go +++ b/services/auth/reverseproxy.go @@ -78,7 +78,7 @@ func (r *ReverseProxy) Verify(req *http.Request, w http.ResponseWriter, store Da } // Make sure requests to API paths, attachment downloads, git and LFS do not create a new session - if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawOrLFSPath(req) { + if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitRawReleaseOrLFSPath(req) { if sess != nil && (sess.Get("uid") == nil || sess.Get("uid").(int64) != user.ID) { handleSignIn(w, req, sess, user) } |