mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
feat: add repo-specific & public-only authz reducers to authorized integrations (#12267)
Built on #12266; one commit added. Adds the ability to reduce the authorization scope of an authorized integration to public-only resources and repo-specific resources. Backend only -- no frontend created yet. ## 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... - [ ] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [x] `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/12267 Reviewed-by: Andreas Ahlenstorf <aahlenst@noreply.codeberg.org>
This commit is contained in:
parent
c9d8682f90
commit
900306e65a
18 changed files with 305 additions and 17 deletions
|
|
@ -0,0 +1,9 @@
|
|||
- integ_id: 1
|
||||
repo_id: 1
|
||||
created_unix: 1772158384
|
||||
- integ_id: 1
|
||||
repo_id: 2
|
||||
created_unix: 1772158384
|
||||
- integ_id: 1
|
||||
repo_id: 3
|
||||
created_unix: 1772158384
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
- id: 1
|
||||
user_id: 2
|
||||
scope: all
|
||||
resource_all_repos: false
|
||||
issuer: https://example.org/
|
||||
audience: https://forgejo.example.org/-/user/integration/abcdef123
|
||||
claim_rules: "{}"
|
||||
created_unix: 1777153359
|
||||
updated_unix: 1777153359
|
||||
|
|
@ -24,6 +24,10 @@ func init() {
|
|||
db.RegisterModel(new(AccessTokenResourceRepo))
|
||||
}
|
||||
|
||||
func (atr *AccessTokenResourceRepo) GetTargetRepoID() int64 {
|
||||
return atr.RepoID
|
||||
}
|
||||
|
||||
func GetRepositoriesAccessibleWithToken(ctx context.Context, accessTokenID int64) ([]*AccessTokenResourceRepo, error) {
|
||||
var resources []*AccessTokenResourceRepo
|
||||
err := db.GetEngine(ctx).
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
package auth
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"forgejo.org/models/db"
|
||||
"forgejo.org/modules/timeutil"
|
||||
)
|
||||
|
|
@ -25,3 +27,18 @@ type AuthorizedIntegResourceRepo struct {
|
|||
func init() {
|
||||
db.RegisterModel(new(AuthorizedIntegResourceRepo))
|
||||
}
|
||||
|
||||
func (air *AuthorizedIntegResourceRepo) GetTargetRepoID() int64 {
|
||||
return air.RepoID
|
||||
}
|
||||
|
||||
func GetRepositoriesAccessibleWithIntegration(ctx context.Context, aiID int64) ([]*AuthorizedIntegResourceRepo, error) {
|
||||
var resources []*AuthorizedIntegResourceRepo
|
||||
err := db.GetEngine(ctx).
|
||||
Where("integ_id = ?", aiID).
|
||||
Find(&resources)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resources, nil
|
||||
}
|
||||
|
|
|
|||
40
models/auth/authorized_integration_resource_repo_test.go
Normal file
40
models/auth/authorized_integration_resource_repo_test.go
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
// Copyright 2026 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
package auth_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
auth_model "forgejo.org/models/auth"
|
||||
"forgejo.org/models/unittest"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestGetRepositoriesAccessibleWithIntegration(t *testing.T) {
|
||||
defer unittest.OverrideFixtures("models/auth/TestGetRepositoriesAccessibleWithIntegration")()
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
t.Run("No Resources", func(t *testing.T) {
|
||||
resources, err := auth_model.GetRepositoriesAccessibleWithIntegration(t.Context(), 999)
|
||||
require.NoError(t, err)
|
||||
assert.Empty(t, resources)
|
||||
})
|
||||
|
||||
t.Run("Has Resources", func(t *testing.T) {
|
||||
resources, err := auth_model.GetRepositoriesAccessibleWithIntegration(t.Context(), 1)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, resources, 3)
|
||||
|
||||
// Verify all expected repo IDs are present
|
||||
repoIDs := make([]int64, len(resources))
|
||||
for i, res := range resources {
|
||||
repoIDs[i] = res.RepoID
|
||||
}
|
||||
assert.Contains(t, repoIDs, int64(1))
|
||||
assert.Contains(t, repoIDs, int64(2))
|
||||
assert.Contains(t, repoIDs, int64(3))
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue