49 Commits (59eb2f68b7078f5aa90fcd980c829c02b9a0145b)

Author	SHA1	Message	Date
Eric Leijonmarck	15c9ced944	Revert "APIkeys: Add metrics for apikey endpoints (#66732)" (#66754) ... This reverts commit c505d26430.	2 years ago
Eric Leijonmarck	c505d26430	APIkeys: Add metrics for apikey endpoints (#66732) ... add metrics for apikey endpoints	2 years ago
Eric Leijonmarck	2031997994	API keys: Add deprecation to api keys (#65948) ... * add: deprecation to api keys write path * boolean w. meessage * add read and delete endpoints * better description of deprecation * updated with puncutations	2 years ago
Serge Zaitsev	743d66396a	Chore: Remove result field from API keys commands and queries (#65055) ... * Chore: remove result field from api keys * fix shadowing * actually shadowing was all right	2 years ago
Eric Leijonmarck	17537b033d	API keys: Add last_used_at and docs changes for migration (#64293) ... * feat: last_used_at for apikeys * add: docs and copy changes * refactor: use br correctly * remove docs * removed more docs	2 years ago
idafurjes	982939111b	Rename Id to ID for annotation models (#62886) ... * Rename Id to ID for annotation models * Add xorm tags * Rename Id to ID for API key models * Add xorm tags	2 years ago
idafurjes	6c5a573772	Chore: Move ReqContext to contexthandler service (#62102) ... * Chore: Move ReqContext to contexthandler service * Rename package to contextmodel * Generate ngalert files * Remove unused imports	2 years ago
Sofia Papagiannaki	b157fcdd87	Chore: fix formating for swagger definitions (#54993)	3 years ago
idafurjes	a14621fff6	Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343) ... * Chore: Add user service method SetUsingOrg * Chore: Add user service method GetSignedInUserWithCacheCtx * Use method GetSignedInUserWithCacheCtx from user service * Fix lint after rebase * Fix lint * Fix lint error * roll back some changes * Roll back changes in api and middleware * Add xorm tags to SignedInUser ID fields	3 years ago
Serge Zaitsev	191ab3bb01	Chore: Move api key models into apikey service package (#53241) ... * Chore: move api key models into apikey service package * force table name for api key	3 years ago
Serge Zaitsev	64488f6b90	Chore: split APIKey store (#52781) ... * move apikey store into a separate service * add apikey service to wire graph * fix linter * switch api to use apikey service * fix provideservice in tests * add apikey service test double * try different sql syntax * rolling back the dialect * trigger drone * trigger drone	3 years ago
Sofia Papagiannaki	7ba076de10	Chore: Move swagger definitions to the handlers (#52643)	3 years ago
Karl Persson	6c6137f45a	Access control: Pass access control metadata for api keys (#48445) ... * Move ApiKeyDTO to dtos package * Add access control filter to api keys * pass user in GetApiKeysQuery * Add api key metadata to DTO * Remove scope all requirement from get api keys endpoint * Handle api key access control metadata in frondend	3 years ago
ying-jeanne	7ddae870e7	fix status code 200 (#47818)	3 years ago
Ieva	a245531f0c	Access control: service account role check (#47710) ... * forbid setting role higher than user's role * change response code * can assign API key permissions to non-admin users * add: assign viewer role directly upon creation * refactor: add AddSATcommand infavor of AddAPIkey * refactor: frontend fixes for ServiceAccountToken Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>	3 years ago
J Guerreiro	5cb03d6e62	Separate API key store from SA token store (#45862) ... * 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	3 years ago
J Guerreiro	94820e1f29	Add/Delete API keys to Service accounts (#44871) ... * ServiceAccounts: move token handlers to specific file * ServiceAccounts: move Add API key to Service account * APIKeys: api keys can still be used even when service accounts are enabled * APIKeys: legacy endpoint can't be used to add SA tokens * ServiceAccount: add tests for creation with nil and non-nil service account ids * ServiceAccounts: fix unnasigned cfg and AC typo * Test: test service account token adding * fix linting error * ServiceAccounts: Handle Token deletion * rename token funcs * rename token funcs and api wrapping * add token deletion tests * review Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * remove bus * Update pkg/api/apikey.go Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>	3 years ago
ying-jeanne	69c764897e	remove dispatch from apikey (#44955)	3 years ago
Ryan McKinley	5d66194ec5	FeatureFlags: define features outside settings.Cfg (take 3) (#44443)	3 years ago
Agnès Toulet	65bdb3a899	FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382) ... * Revert "FeatureToggles: register all enterprise feature toggles (#44336)" This reverts commit f53b3fb007. * Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)" This reverts commit f94c0decbd.	3 years ago
Ryan McKinley	f94c0decbd	FeatureFlags: manage feature flags outside of settings.Cfg (#43692)	3 years ago
ying-jeanne	7422789ec7	Remove Macaron ParamsInt64 function from code base (#43810) ... * draft commit * change all calls * Compilation errors	3 years ago
Jeremy Price	e894837b7e	Accesscontrol: Remove service account creation code from addapikey (#43900) ... * Remove service account creation code from addapikey Co-authored-by: J Guerreiro <joao.guerreiro@grafana.com>	3 years ago
idafurjes	8e6d6af744	Rename DispatchCtx to Dispatch (#43563)	3 years ago
Jeremy Price	13fdc5231d	AccessControl: upgrade apikeys by adding service accounts (#42425) ... Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Change default options for cloned service account * Run in background * Add endpoint to upgrade api keys to service accounts	4 years ago
Serge Zaitsev	d9cdcb550e	Chore: Refactor api handlers to use web.Bind (#42199) ... * Chore: Refactor api handlers to use web.Bind * fix comments * fix comment * trying to fix most of the tests and force routing.Wrap type check * fix library panels tests * fix frontend logging tests * allow passing nil as a response to skip writing * return nil instead of the response * rewrite login handler function types * remove handlerFuncCtx * make linter happy * remove old bindings from the libraryelements * restore comments	4 years ago
Jeremy Price	a145ec37bb	Handle request service account when not enabled (#42122) ... * Handle request service account when not enabled	4 years ago
Jeremy Price	69c5370e94	Accesscontrol: Add additional API keys to service account, move cloneserviceaccount to sqlstore (#41189) ... * Add additional api key, move cloneserviceaccount * Remove TODOs, for now * Error messages * Linter * Security check * Add comments * Take service account id from correct variable * Update user.go	4 years ago
Jeremy Price	6dbb6408d4	Access Control: Add service accounts (#38994) ... * Add extra fields to OSS types to support enterprise * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Add CloneUserToServiceAccount * Adding LinkAPIKeyToServiceAccount * Handle api key link error * Better error messages for OSS accesscontrol * Set an invalid user id as default * Re-arrange field names * ServiceAccountId is integer * Better error messages Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
Carl Bergquist	f20de5588b	add context to api crud calls (#40047) ... Signed-off-by: bergquist <carl.bergquist@gmail.com>	4 years ago
Christian Haudum	076e2ce06a	Return 404 when deleting non-existing API key (#33346) ... The server needs to return a HTTP 404 (Not Found) when an API key that does not exist is deleted.	4 years ago
Hugo Häggmark	3d41267fc4	Chore: Moves common and response into separate packages (#30298) ... * Chore: moves common and response into separate packages * Chore: moves common and response into separate packages * Update pkg/api/utils/common.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Chore: changes after PR comments * Chore: move wrap to routing package * Chore: move functions in common to response package * Chore: move functions in common to response package * Chore: formats imports Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	4 years ago
Arve Knudsen	294770f411	Chore: Handle wrapped errors (#29223) ... * Chore: Handle wrapped errors Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	5 years ago
Agnès Toulet	6dd109b927	API: return resource ID for auth key creation, folder permissions update and user invite complete endpoints (#27419) ... * API: add ID to auth key and folder endpoints * API: add test for folder permissions update * API: add created user id for /invite/complete endpoint	5 years ago
Sofia Papagiannaki	d1c523838b	API: Optionally list expired keys (#20468) ... * API: Optionally list expired keys * Update docs	6 years ago
Arve Knudsen	35e0e078b7	pkg/util: Check errors (#19832) ... * pkg/util: Check errors * pkg/services: DRY up code	6 years ago
Anthony Templeton	3680b95b44	Auth: Duplicate API Key Name Handle With Useful HTTP Code (#17905) ... * API: Duplicate API Key Name Handle With Useful HTTP Code * 17447: make changes requested during review - use dialect.IsUniqueContraintViolation - change if statement to match others - return error properly * Revert "17447: make changes requested during review" This reverts commit a4a674ea83. * API: useful http code on duplicate api key error w/ tests * API: API Key Duplicate Handling fixed small typo associated with error	6 years ago
Sofia Papagiannaki	dc9ec7dc91	Auth: Allow expiration of API keys (#17678) ... * 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.	6 years ago
Julian Kornberger	0a415c50d0	Make golint happier	7 years ago
Julian Kornberger	7aab6a8887	Make golint happier	7 years ago
Dan Cech	c0ecdee375	rename Context to ReqContext	7 years ago
Dan Cech	338655dd37	move Context and session out of middleware	7 years ago
Torkel Ödegaard	89418a155a	More work on email and notification infra #1456	10 years ago
Torkel Ödegaard	c709a28f02	More work on email and notification infra #1456	10 years ago
Torkel Ödegaard	3f5ab189cd	Began work on emailing service #1456	10 years ago
Torkel Ödegaard	f81bde5643	Refactoring some api handlers to use the new Response return object	10 years ago
Torkel Ödegaard	c75aa23092	New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440	10 years ago
Torkel Ödegaard	26e4809e2e	Big Backend Refatoring: Renamed Account -> Org	10 years ago
Torkel Ödegaard	5269422f7c	Began work on hashing api keys	10 years ago
Torkel Ödegaard	10820f31c2	Changed go package path	10 years ago