summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-05-28 11:32:41 +0100
committerGitHub <noreply@github.com>2019-05-28 11:32:41 +0100
commit31557b12744410633ceb6fc12b53fb09038cee35 (patch)
tree10cc9cc9bbae2b4e1562f93b22c16e3c245262f4 /modules
parent27b271d457f875ed76fae9660338f7df1013318a (diff)
downloadgitea-31557b12744410633ceb6fc12b53fb09038cee35.tar.gz
gitea-31557b12744410633ceb6fc12b53fb09038cee35.zip
Fix LFS Locks over SSH (#6999)
* Fix LFS Locks over SSH * Mark test as skipped
Diffstat (limited to 'modules')
-rw-r--r--modules/lfs/locks.go115
1 files changed, 83 insertions, 32 deletions
diff --git a/modules/lfs/locks.go b/modules/lfs/locks.go
index 525a93645f..b1ca2f094a 100644
--- a/modules/lfs/locks.go
+++ b/modules/lfs/locks.go
@@ -11,6 +11,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
)
@@ -44,7 +45,7 @@ func checkIsValidRequest(ctx *context.Context, post bool) bool {
return true
}
-func handleLockListOut(ctx *context.Context, lock *models.LFSLock, err error) {
+func handleLockListOut(ctx *context.Context, repo *models.Repository, lock *models.LFSLock, err error) {
if err != nil {
if models.IsErrLFSLockNotExist(err) {
ctx.JSON(200, api.LFSLockList{
@@ -57,7 +58,7 @@ func handleLockListOut(ctx *context.Context, lock *models.LFSLock, err error) {
})
return
}
- if ctx.Repo.Repository.ID != lock.RepoID {
+ if repo.ID != lock.RepoID {
ctx.JSON(200, api.LFSLockList{
Locks: []*api.LFSLock{},
})
@@ -75,17 +76,21 @@ func GetListLockHandler(ctx *context.Context) {
}
ctx.Resp.Header().Set("Content-Type", metaMediaType)
- err := models.CheckLFSAccessForRepo(ctx.User, ctx.Repo.Repository, models.AccessModeRead)
+ rv := unpack(ctx)
+
+ repository, err := models.GetRepositoryByOwnerAndName(rv.User, rv.Repo)
if err != nil {
- if models.IsErrLFSUnauthorizedAction(err) {
- ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
- ctx.JSON(401, api.LFSLockError{
- Message: "You must have pull access to list locks : " + err.Error(),
- })
- return
- }
- ctx.JSON(500, api.LFSLockError{
- Message: "unable to list lock : " + err.Error(),
+ log.Debug("Could not find repository: %s/%s - %s", rv.User, rv.Repo, err)
+ writeStatus(ctx, 404)
+ return
+ }
+ repository.MustOwner()
+
+ authenticated := authenticate(ctx, repository, rv.Authorization, false)
+ if !authenticated {
+ ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
+ ctx.JSON(401, api.LFSLockError{
+ Message: "You must have pull access to list locks",
})
return
}
@@ -100,19 +105,19 @@ func GetListLockHandler(ctx *context.Context) {
return
}
lock, err := models.GetLFSLockByID(int64(v))
- handleLockListOut(ctx, lock, err)
+ handleLockListOut(ctx, repository, lock, err)
return
}
path := ctx.Query("path")
if path != "" { //Case where we request a specific id
- lock, err := models.GetLFSLock(ctx.Repo.Repository, path)
- handleLockListOut(ctx, lock, err)
+ lock, err := models.GetLFSLock(repository, path)
+ handleLockListOut(ctx, repository, lock, err)
return
}
//If no query params path or id
- lockList, err := models.GetLFSLockByRepoID(ctx.Repo.Repository.ID)
+ lockList, err := models.GetLFSLockByRepoID(repository.ID)
if err != nil {
ctx.JSON(500, api.LFSLockError{
Message: "unable to list locks : " + err.Error(),
@@ -135,16 +140,36 @@ func PostLockHandler(ctx *context.Context) {
}
ctx.Resp.Header().Set("Content-Type", metaMediaType)
+ userName := ctx.Params("username")
+ repoName := strings.TrimSuffix(ctx.Params("reponame"), ".git")
+ authorization := ctx.Req.Header.Get("Authorization")
+
+ repository, err := models.GetRepositoryByOwnerAndName(userName, repoName)
+ if err != nil {
+ log.Debug("Could not find repository: %s/%s - %s", userName, repoName, err)
+ writeStatus(ctx, 404)
+ return
+ }
+ repository.MustOwner()
+
+ authenticated := authenticate(ctx, repository, authorization, true)
+ if !authenticated {
+ ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
+ ctx.JSON(401, api.LFSLockError{
+ Message: "You must have push access to create locks",
+ })
+ return
+ }
+
var req api.LFSLockRequest
dec := json.NewDecoder(ctx.Req.Body().ReadCloser())
- err := dec.Decode(&req)
- if err != nil {
+ if err := dec.Decode(&req); err != nil {
writeStatus(ctx, 400)
return
}
lock, err := models.CreateLFSLock(&models.LFSLock{
- Repo: ctx.Repo.Repository,
+ Repo: repository,
Path: req.Path,
Owner: ctx.User,
})
@@ -178,23 +203,29 @@ func VerifyLockHandler(ctx *context.Context) {
}
ctx.Resp.Header().Set("Content-Type", metaMediaType)
- err := models.CheckLFSAccessForRepo(ctx.User, ctx.Repo.Repository, models.AccessModeWrite)
+ userName := ctx.Params("username")
+ repoName := strings.TrimSuffix(ctx.Params("reponame"), ".git")
+ authorization := ctx.Req.Header.Get("Authorization")
+
+ repository, err := models.GetRepositoryByOwnerAndName(userName, repoName)
if err != nil {
- if models.IsErrLFSUnauthorizedAction(err) {
- ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
- ctx.JSON(401, api.LFSLockError{
- Message: "You must have push access to verify locks : " + err.Error(),
- })
- return
- }
- ctx.JSON(500, api.LFSLockError{
- Message: "unable to verify lock : " + err.Error(),
+ log.Debug("Could not find repository: %s/%s - %s", userName, repoName, err)
+ writeStatus(ctx, 404)
+ return
+ }
+ repository.MustOwner()
+
+ authenticated := authenticate(ctx, repository, authorization, true)
+ if !authenticated {
+ ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
+ ctx.JSON(401, api.LFSLockError{
+ Message: "You must have push access to verify locks",
})
return
}
//TODO handle body json cursor and limit
- lockList, err := models.GetLFSLockByRepoID(ctx.Repo.Repository.ID)
+ lockList, err := models.GetLFSLockByRepoID(repository.ID)
if err != nil {
ctx.JSON(500, api.LFSLockError{
Message: "unable to list locks : " + err.Error(),
@@ -223,10 +254,30 @@ func UnLockHandler(ctx *context.Context) {
}
ctx.Resp.Header().Set("Content-Type", metaMediaType)
+ userName := ctx.Params("username")
+ repoName := strings.TrimSuffix(ctx.Params("reponame"), ".git")
+ authorization := ctx.Req.Header.Get("Authorization")
+
+ repository, err := models.GetRepositoryByOwnerAndName(userName, repoName)
+ if err != nil {
+ log.Debug("Could not find repository: %s/%s - %s", userName, repoName, err)
+ writeStatus(ctx, 404)
+ return
+ }
+ repository.MustOwner()
+
+ authenticated := authenticate(ctx, repository, authorization, true)
+ if !authenticated {
+ ctx.Resp.Header().Set("WWW-Authenticate", "Basic realm=gitea-lfs")
+ ctx.JSON(401, api.LFSLockError{
+ Message: "You must have push access to delete locks",
+ })
+ return
+ }
+
var req api.LFSLockDeleteRequest
dec := json.NewDecoder(ctx.Req.Body().ReadCloser())
- err := dec.Decode(&req)
- if err != nil {
+ if err := dec.Decode(&req); err != nil {
writeStatus(ctx, 400)
return
}