Skip to content

Fix CLI allowing creation of access tokens with existing name #26071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 25, 2023
Merged

Fix CLI allowing creation of access tokens with existing name #26071

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb3436
Fix CLI allowing creation of access tokens with existing name
yardenshoham Jul 23, 2023
ea82f6c
Merge branch 'main' into issues/26044
GiteaBot Jul 25, 2023
ef64c6b
Merge branch 'main' into issues/26044
GiteaBot Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions cmd/admin_user_generate_access_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,28 @@ func runGenerateAccessToken(c *cli.Context) error {
return err
}

accessTokenScope, err := auth_model.AccessTokenScope(c.String("scopes")).Normalize()
// construct token with name and user so we can make sure it is unique
t := &auth_model.AccessToken{
Name: c.String("token-name"),
UID: user.ID,
}

exist, err := auth_model.AccessTokenByNameExists(t)
if err != nil {
return err
}
if exist {
return fmt.Errorf("access token name has been used already")
}

t := &auth_model.AccessToken{
Name: c.String("token-name"),
UID: user.ID,
Scope: accessTokenScope,
// make sure the scopes are valid
accessTokenScope, err := auth_model.AccessTokenScope(c.String("scopes")).Normalize()
if err != nil {
return fmt.Errorf("invalid access token scope provided: %w", err)
}
t.Scope = accessTokenScope

// create the token
if err := auth_model.NewAccessToken(t); err != nil {
return err
}
Expand Down