mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 20:26:09 +01:00
Do some missing checks (#28423)
(cherry picked from commit 717d0f5934
)
Conflicts:
routers/api/v1/api.go
trivial contextual conflict
This commit is contained in:
parent
5528072d04
commit
7aa1e1a54d
|
@ -693,6 +693,24 @@ func buildAuthGroup() *auth.Group {
|
||||||
return group
|
return group
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func individualPermsChecker(ctx *context.APIContext) {
|
||||||
|
// org permissions have been checked in context.OrgAssignment(), but individual permissions haven't been checked.
|
||||||
|
if ctx.ContextUser.IsIndividual() {
|
||||||
|
switch {
|
||||||
|
case ctx.ContextUser.Visibility == api.VisibleTypePrivate:
|
||||||
|
if ctx.Doer == nil || (ctx.ContextUser.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin) {
|
||||||
|
ctx.NotFound("Visit Project", nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case ctx.ContextUser.Visibility == api.VisibleTypeLimited:
|
||||||
|
if ctx.Doer == nil {
|
||||||
|
ctx.NotFound("Visit Project", nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Routes registers all v1 APIs routes to web application.
|
// Routes registers all v1 APIs routes to web application.
|
||||||
func Routes(ctx gocontext.Context) *web.Route {
|
func Routes(ctx gocontext.Context) *web.Route {
|
||||||
m := web.NewRoute()
|
m := web.NewRoute()
|
||||||
|
@ -798,7 +816,7 @@ func Routes(ctx gocontext.Context) *web.Route {
|
||||||
}, reqBasicAuth())
|
}, reqBasicAuth())
|
||||||
|
|
||||||
m.Get("/activities/feeds", user.ListUserActivityFeeds)
|
m.Get("/activities/feeds", user.ListUserActivityFeeds)
|
||||||
}, context_service.UserAssignmentAPI())
|
}, context_service.UserAssignmentAPI(), individualPermsChecker)
|
||||||
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser))
|
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser))
|
||||||
|
|
||||||
// Users (requires user scope)
|
// Users (requires user scope)
|
||||||
|
|
|
@ -686,6 +686,24 @@ func registerRoutes(m *web.Route) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
individualPermsChecker := func(ctx *context.Context) {
|
||||||
|
// org permissions have been checked in context.OrgAssignment(), but individual permissions haven't been checked.
|
||||||
|
if ctx.ContextUser.IsIndividual() {
|
||||||
|
switch {
|
||||||
|
case ctx.ContextUser.Visibility == structs.VisibleTypePrivate:
|
||||||
|
if ctx.Doer == nil || (ctx.ContextUser.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin) {
|
||||||
|
ctx.NotFound("Visit Project", nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
case ctx.ContextUser.Visibility == structs.VisibleTypeLimited:
|
||||||
|
if ctx.Doer == nil {
|
||||||
|
ctx.NotFound("Visit Project", nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ***** START: Organization *****
|
// ***** START: Organization *****
|
||||||
m.Group("/org", func() {
|
m.Group("/org", func() {
|
||||||
m.Group("/{org}", func() {
|
m.Group("/{org}", func() {
|
||||||
|
@ -871,11 +889,11 @@ func registerRoutes(m *web.Route) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
}, reqUnitAccess(unit.TypeProjects, perm.AccessModeRead, true), individualPermsChecker)
|
||||||
|
|
||||||
m.Group("", func() {
|
m.Group("", func() {
|
||||||
m.Get("/code", user.CodeSearch)
|
m.Get("/code", user.CodeSearch)
|
||||||
}, reqUnitAccess(unit.TypeCode, perm.AccessModeRead, false))
|
}, reqUnitAccess(unit.TypeCode, perm.AccessModeRead, false), individualPermsChecker)
|
||||||
}, ignSignIn, context_service.UserAssignmentWeb(), context.OrgAssignment()) // for "/{username}/-" (packages, projects, code)
|
}, ignSignIn, context_service.UserAssignmentWeb(), context.OrgAssignment()) // for "/{username}/-" (packages, projects, code)
|
||||||
|
|
||||||
m.Group("/{username}/{reponame}", func() {
|
m.Group("/{username}/{reponame}", func() {
|
||||||
|
|
23
tests/integration/project_test.go
Normal file
23
tests/integration/project_test.go
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/tests"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestPrivateRepoProject(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
// not logged in user
|
||||||
|
req := NewRequest(t, "GET", "/user31/-/projects")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
|
||||||
|
sess := loginUser(t, "user1")
|
||||||
|
req = NewRequest(t, "GET", "/user31/-/projects")
|
||||||
|
sess.MakeRequest(t, req, http.StatusOK)
|
||||||
|
}
|
Loading…
Reference in a new issue