The goal is to enable access to Git LFS resources with Authorized Integrations JWTs. Blocker that needed to be resolved is that adding the `AuthorizedIntegration` auth method would conflict with the LFS tokens, which are handed out during git ssh clones to allow access to LFS resources -- `AuthorizedIntegration` would mark these as `AuthenticationAttemptedIncorrectCredential`, and therefore the requests would 401 before they got to the LFS-specific token validation routines. The fix is to move LFS token authentication into an authentication group so that it could be resolved at the same time as the authorized integration, rather than doing it inside the LFS server routines. Refactors for LFS tokens are covered by refreshed test automation. Authorized integrations LFS Access has been manually tested, and will be further covered in an end-to-end integration test (https://code.forgejo.org/forgejo/end-to-end/pulls/1954). ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. All work and communication must conform to Forgejo's [AI Agreement](https://codeberg.org/forgejo/governance/src/branch/main/AIAgreement.md). There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [ ] `make pr-go` before pushing ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12725 Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org>
183 lines
7.9 KiB
Go
183 lines
7.9 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package integration
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"testing"
|
|
"time"
|
|
|
|
repo_model "forgejo.org/models/repo"
|
|
"forgejo.org/models/unittest"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/lfs"
|
|
"forgejo.org/modules/setting"
|
|
api "forgejo.org/modules/structs"
|
|
"forgejo.org/tests"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestAPILFSLocksNotStarted(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
setting.LFS.StartServer = false
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
|
|
req := NewRequestf(t, "GET", "/%s/%s.git/info/lfs/locks", user.Name, repo.Name)
|
|
MakeRequest(t, req, http.StatusNotFound)
|
|
req = NewRequestf(t, "POST", "/%s/%s.git/info/lfs/locks", user.Name, repo.Name)
|
|
MakeRequest(t, req, http.StatusNotFound)
|
|
req = NewRequestf(t, "GET", "/%s/%s.git/info/lfs/locks/verify", user.Name, repo.Name)
|
|
MakeRequest(t, req, http.StatusNotFound)
|
|
req = NewRequestf(t, "GET", "/%s/%s.git/info/lfs/locks/10/unlock", user.Name, repo.Name)
|
|
MakeRequest(t, req, http.StatusNotFound)
|
|
}
|
|
|
|
func TestAPILFSLocksNotLogin(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
setting.LFS.StartServer = true
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
|
|
req := NewRequestf(t, "GET", "/%s/%s.git/info/lfs/locks", user.Name, repo.Name)
|
|
req.Header.Set("Accept", lfs.MediaType)
|
|
resp := MakeRequest(t, req, http.StatusUnauthorized)
|
|
var lfsLockError api.LFSLockError
|
|
DecodeJSON(t, resp, &lfsLockError)
|
|
assert.Equal(t, "You must have pull access to list locks", lfsLockError.Message)
|
|
}
|
|
|
|
func TestAPILFSLocksLogged(t *testing.T) {
|
|
defer tests.PrepareTestEnv(t)()
|
|
setting.LFS.StartServer = true
|
|
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // in org 3
|
|
user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // in org 3
|
|
|
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) // own by org 3
|
|
|
|
tests := []struct {
|
|
user *user_model.User
|
|
repo *repo_model.Repository
|
|
path string
|
|
httpResult int
|
|
addTime []int
|
|
}{
|
|
{user: user2, repo: repo1, path: "foo/bar.zip", httpResult: http.StatusCreated, addTime: []int{0}},
|
|
{user: user2, repo: repo1, path: "path/test", httpResult: http.StatusCreated, addTime: []int{0}},
|
|
{user: user2, repo: repo1, path: "path/test", httpResult: http.StatusConflict},
|
|
{user: user2, repo: repo1, path: "Foo/BaR.zip", httpResult: http.StatusConflict},
|
|
{user: user2, repo: repo1, path: "Foo/Test/../subFOlder/../Relative/../BaR.zip", httpResult: http.StatusConflict},
|
|
{user: user4, repo: repo1, path: "FoO/BaR.zip", httpResult: http.StatusUnauthorized},
|
|
{user: user4, repo: repo1, path: "path/test-user4", httpResult: http.StatusUnauthorized},
|
|
{user: user2, repo: repo1, path: "patH/Test-user4", httpResult: http.StatusCreated, addTime: []int{0}},
|
|
{user: user2, repo: repo1, path: "some/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/long/path", httpResult: http.StatusCreated, addTime: []int{0}},
|
|
|
|
{user: user2, repo: repo3, path: "test/foo/bar.zip", httpResult: http.StatusCreated, addTime: []int{1, 2}},
|
|
{user: user4, repo: repo3, path: "test/foo/bar.zip", httpResult: http.StatusConflict},
|
|
{user: user4, repo: repo3, path: "test/foo/bar.bin", httpResult: http.StatusCreated, addTime: []int{1, 2}},
|
|
}
|
|
|
|
resultsTests := []struct {
|
|
user *user_model.User
|
|
repo *repo_model.Repository
|
|
totalCount int
|
|
oursCount int
|
|
theirsCount int
|
|
locksOwners []*user_model.User
|
|
locksTimes []time.Time
|
|
}{
|
|
{user: user2, repo: repo1, totalCount: 4, oursCount: 4, theirsCount: 0, locksOwners: []*user_model.User{user2, user2, user2, user2}, locksTimes: []time.Time{}},
|
|
{user: user2, repo: repo3, totalCount: 2, oursCount: 1, theirsCount: 1, locksOwners: []*user_model.User{user2, user4}, locksTimes: []time.Time{}},
|
|
{user: user4, repo: repo3, totalCount: 2, oursCount: 1, theirsCount: 1, locksOwners: []*user_model.User{user2, user4}, locksTimes: []time.Time{}},
|
|
}
|
|
|
|
deleteTests := []struct {
|
|
user *user_model.User
|
|
repo *repo_model.Repository
|
|
lockID string
|
|
}{}
|
|
|
|
// create locks
|
|
for _, test := range tests {
|
|
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks", test.repo.FullName()), map[string]string{"path": test.path})
|
|
req.AddBasicAuth(test.user.Name)
|
|
req.Header.Set("Accept", lfs.AcceptHeader)
|
|
req.Header.Set("Content-Type", lfs.MediaType)
|
|
resp := MakeRequest(t, req, test.httpResult)
|
|
if len(test.addTime) > 0 {
|
|
var lfsLock api.LFSLockResponse
|
|
DecodeJSON(t, resp, &lfsLock)
|
|
assert.Equal(t, test.user.Name, lfsLock.Lock.Owner.Name)
|
|
assert.Equal(t, lfsLock.Lock.LockedAt.Format(time.RFC3339), lfsLock.Lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second
|
|
for _, id := range test.addTime {
|
|
resultsTests[id].locksTimes = append(resultsTests[id].locksTimes, time.Now())
|
|
}
|
|
}
|
|
}
|
|
|
|
// check creation
|
|
for _, test := range resultsTests {
|
|
req := NewRequestf(t, "GET", "/%s.git/info/lfs/locks", test.repo.FullName())
|
|
req.AddBasicAuth(test.user.Name)
|
|
req.Header.Set("Accept", lfs.AcceptHeader)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
var lfsLocks api.LFSLockList
|
|
DecodeJSON(t, resp, &lfsLocks)
|
|
assert.Len(t, lfsLocks.Locks, test.totalCount)
|
|
for i, lock := range lfsLocks.Locks {
|
|
assert.Equal(t, test.locksOwners[i].Name, lock.Owner.Name)
|
|
assert.WithinDuration(t, test.locksTimes[i], lock.LockedAt, 10*time.Second)
|
|
assert.Equal(t, lock.LockedAt.Format(time.RFC3339), lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second
|
|
}
|
|
|
|
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks/verify", test.repo.FullName()), map[string]string{})
|
|
req.AddBasicAuth(test.user.Name)
|
|
req.Header.Set("Accept", lfs.AcceptHeader)
|
|
req.Header.Set("Content-Type", lfs.MediaType)
|
|
resp = MakeRequest(t, req, http.StatusOK)
|
|
var lfsLocksVerify api.LFSLockListVerify
|
|
DecodeJSON(t, resp, &lfsLocksVerify)
|
|
assert.Len(t, lfsLocksVerify.Ours, test.oursCount)
|
|
assert.Len(t, lfsLocksVerify.Theirs, test.theirsCount)
|
|
for _, lock := range lfsLocksVerify.Ours {
|
|
assert.Equal(t, test.user.Name, lock.Owner.Name)
|
|
deleteTests = append(deleteTests, struct {
|
|
user *user_model.User
|
|
repo *repo_model.Repository
|
|
lockID string
|
|
}{test.user, test.repo, lock.ID})
|
|
}
|
|
for _, lock := range lfsLocksVerify.Theirs {
|
|
assert.NotEqual(t, test.user.DisplayName(), lock.Owner.Name)
|
|
}
|
|
}
|
|
|
|
// remove all locks
|
|
for _, test := range deleteTests {
|
|
req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks/%s/unlock", test.repo.FullName(), test.lockID), map[string]string{})
|
|
req.AddBasicAuth(test.user.Name)
|
|
req.Header.Set("Accept", lfs.AcceptHeader)
|
|
req.Header.Set("Content-Type", lfs.MediaType)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
var lfsLockRep api.LFSLockResponse
|
|
DecodeJSON(t, resp, &lfsLockRep)
|
|
assert.Equal(t, test.lockID, lfsLockRep.Lock.ID)
|
|
assert.Equal(t, test.user.Name, lfsLockRep.Lock.Owner.Name)
|
|
}
|
|
|
|
// check that we don't have any lock
|
|
for _, test := range resultsTests {
|
|
req := NewRequestf(t, "GET", "/%s.git/info/lfs/locks", test.repo.FullName())
|
|
req.AddBasicAuth(test.user.Name)
|
|
req.Header.Set("Accept", lfs.AcceptHeader)
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
var lfsLocks api.LFSLockList
|
|
DecodeJSON(t, resp, &lfsLocks)
|
|
assert.Empty(t, lfsLocks.Locks)
|
|
}
|
|
}
|