mirror of
https://github.com/grafana/grafana.git
synced 2024-11-28 11:44:26 -06:00
dc9ec7dc91
* Modify backend to allow expiration of API Keys * Add middleware test for expired api keys * Modify frontend to enable expiration of API Keys * Fix frontend tests * Fix migration and add index for `expires` field * Add api key tests for database access * Substitude time.Now() by a mock for test usage * Front-end modifications * Change input label to `Time to live` * Change input behavior to comply with the other similar * Add tooltip * Modify AddApiKey api call response Expiration should be *time.Time instead of string * Present expiration date in the selected timezone * Use kbn for transforming intervals to seconds * Use `assert` library for tests * Frontend fixes Add checks for empty/undefined/null values * Change expires column from datetime to integer * Restrict api key duration input It should be interval not number * AddApiKey must complain if SecondsToLive is negative * Declare ErrInvalidApiKeyExpiration * Move configuration to auth section * Update docs * Eliminate alias for models in modified files * Omit expiration from api response if empty * Eliminate Goconvey from test file * Fix test Do not sleep, use mocked timeNow() instead * Remove index for expires from api_key table The index should be anyway on both org_id and expires fields. However this commit eliminates completely the index for now since not many rows are expected to be in this table. * Use getTimeZone function * Minor change in api key listing The frontend should display a message instead of empty string if the key does not expire.
93 lines
2.1 KiB
Go
93 lines
2.1 KiB
Go
package sqlstore
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/bus"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
)
|
|
|
|
func init() {
|
|
bus.AddHandler("sql", GetApiKeys)
|
|
bus.AddHandler("sql", GetApiKeyById)
|
|
bus.AddHandler("sql", GetApiKeyByName)
|
|
bus.AddHandlerCtx("sql", DeleteApiKeyCtx)
|
|
bus.AddHandler("sql", AddApiKey)
|
|
}
|
|
|
|
func GetApiKeys(query *models.GetApiKeysQuery) error {
|
|
sess := x.Limit(100, 0).Where("org_id=? and ( expires IS NULL or expires >= ?)",
|
|
query.OrgId, timeNow().Unix()).Asc("name")
|
|
if query.IncludeInvalid {
|
|
sess = x.Limit(100, 0).Where("org_id=?", query.OrgId).Asc("name")
|
|
}
|
|
|
|
query.Result = make([]*models.ApiKey, 0)
|
|
return sess.Find(&query.Result)
|
|
}
|
|
|
|
func DeleteApiKeyCtx(ctx context.Context, cmd *models.DeleteApiKeyCommand) error {
|
|
return withDbSession(ctx, func(sess *DBSession) error {
|
|
var rawSql = "DELETE FROM api_key WHERE id=? and org_id=?"
|
|
_, err := sess.Exec(rawSql, cmd.Id, cmd.OrgId)
|
|
return err
|
|
})
|
|
}
|
|
|
|
func AddApiKey(cmd *models.AddApiKeyCommand) error {
|
|
return inTransaction(func(sess *DBSession) error {
|
|
updated := timeNow()
|
|
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 models.ErrInvalidApiKeyExpiration
|
|
}
|
|
t := models.ApiKey{
|
|
OrgId: cmd.OrgId,
|
|
Name: cmd.Name,
|
|
Role: cmd.Role,
|
|
Key: cmd.Key,
|
|
Created: updated,
|
|
Updated: updated,
|
|
Expires: expires,
|
|
}
|
|
|
|
if _, err := sess.Insert(&t); err != nil {
|
|
return err
|
|
}
|
|
cmd.Result = &t
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func GetApiKeyById(query *models.GetApiKeyByIdQuery) error {
|
|
var apikey models.ApiKey
|
|
has, err := x.Id(query.ApiKeyId).Get(&apikey)
|
|
|
|
if err != nil {
|
|
return err
|
|
} else if !has {
|
|
return models.ErrInvalidApiKey
|
|
}
|
|
|
|
query.Result = &apikey
|
|
return nil
|
|
}
|
|
|
|
func GetApiKeyByName(query *models.GetApiKeyByNameQuery) error {
|
|
var apikey models.ApiKey
|
|
has, err := x.Where("org_id=? AND name=?", query.OrgId, query.KeyName).Get(&apikey)
|
|
|
|
if err != nil {
|
|
return err
|
|
} else if !has {
|
|
return models.ErrInvalidApiKey
|
|
}
|
|
|
|
query.Result = &apikey
|
|
return nil
|
|
}
|