mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-20 20:07:03 +01:00
[GITEA] silently ignore obsolete sudo scope
Fixes: https://codeberg.org/forgejo/forgejo/issues/820 (cherry picked from commit6a7022ebbb
) (cherry picked from commit764eac47b5
) (cherry picked from commit1141eb7b6f
) (cherry picked from commit826b6509b6
) (cherry picked from commit9990d932b8
) (cherry picked from commit7eca570743
) (cherry picked from commit66e1d3f082
) (cherry picked from commit188226a8e6
) (cherry picked from commit4cd1bff25c
) (cherry picked from commitfad6b6d2c4
) (cherry picked from commit5b25c3d851
) (cherry picked from commit4746ece4dd
) (cherry picked from commit2a6f85afb3
) (cherry picked from commitc027d724ee
) (cherry picked from commitbe2f1eeaeb
) (cherry picked from commit3058a54fe9
) (cherry picked from commit53936d38a0
) (cherry picked from commit311983cc97
) (cherry picked from commit1651ae757b
) (cherry picked from commitd3dd8ea24d
) (cherry picked from commit9a80326ff3
)
This commit is contained in:
parent
25e96cfcb2
commit
66eb33235e
2 changed files with 2 additions and 2 deletions
|
@ -250,7 +250,7 @@ func (s AccessTokenScope) parse() (accessTokenScopeBitmap, error) {
|
|||
remainingScopes = remainingScopes[i+1:]
|
||||
}
|
||||
singleScope := AccessTokenScope(v)
|
||||
if singleScope == "" {
|
||||
if singleScope == "" || singleScope == "sudo" {
|
||||
continue
|
||||
}
|
||||
if singleScope == AccessTokenScopeAll {
|
||||
|
|
|
@ -20,7 +20,7 @@ func TestAccessTokenScope_Normalize(t *testing.T) {
|
|||
tests := []scopeTestNormalize{
|
||||
{"", "", nil},
|
||||
{"write:misc,write:notification,read:package,write:notification,public-only", "public-only,write:misc,write:notification,read:package", nil},
|
||||
{"all", "all", nil},
|
||||
{"all,sudo", "all", nil},
|
||||
{"write:activitypub,write:admin,write:misc,write:notification,write:organization,write:package,write:issue,write:repository,write:user", "all", nil},
|
||||
{"write:activitypub,write:admin,write:misc,write:notification,write:organization,write:package,write:issue,write:repository,write:user,public-only", "public-only,all", nil},
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue