mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
* ServiceAccounts: Fix token-apikey cross deletion * ServiceAccounts: separate API key store and service account token store * ServiceAccounts: hide service account tokens from API Keys page * ServiceAccounts: uppercase statement * ServiceAccounts: fix and add new tests for SAT store * ServiceAccounts: remove service account ID from add API key * ServiceAccounts: clear up errors
64 lines
1.6 KiB
Go
64 lines
1.6 KiB
Go
package database
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/models"
|
|
"github.com/grafana/grafana/pkg/services/sqlstore"
|
|
)
|
|
|
|
func (s *ServiceAccountsStoreImpl) AddServiceAccountToken(ctx context.Context, saID int64, cmd *models.AddApiKeyCommand) error {
|
|
return s.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
|
|
key := models.ApiKey{OrgId: cmd.OrgId, Name: cmd.Name}
|
|
exists, _ := sess.Get(&key)
|
|
if exists {
|
|
return &ErrDuplicateSAToken{cmd.Name}
|
|
}
|
|
|
|
updated := time.Now()
|
|
var expires *int64 = nil
|
|
if cmd.SecondsToLive > 0 {
|
|
v := updated.Add(time.Second * time.Duration(cmd.SecondsToLive)).Unix()
|
|
expires = &v
|
|
} else if cmd.SecondsToLive < 0 {
|
|
return &ErrInvalidExpirationSAToken{}
|
|
}
|
|
|
|
t := models.ApiKey{
|
|
OrgId: cmd.OrgId,
|
|
Name: cmd.Name,
|
|
Role: cmd.Role,
|
|
Key: cmd.Key,
|
|
Created: updated,
|
|
Updated: updated,
|
|
Expires: expires,
|
|
ServiceAccountId: &saID,
|
|
}
|
|
|
|
if _, err := sess.Insert(&t); err != nil {
|
|
return err
|
|
}
|
|
cmd.Result = &t
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func (s *ServiceAccountsStoreImpl) DeleteServiceAccountToken(ctx context.Context, orgID, serviceAccountID, tokenID int64) error {
|
|
rawSQL := "DELETE FROM api_key WHERE id=? and org_id=? and service_account_id=?"
|
|
|
|
return s.sqlStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
|
|
result, err := sess.Exec(rawSQL, tokenID, orgID, serviceAccountID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
n, err := result.RowsAffected()
|
|
if err != nil {
|
|
return err
|
|
} else if n == 0 {
|
|
return &ErrMisingSAToken{}
|
|
}
|
|
return nil
|
|
})
|
|
}
|