128 Commits (306f0785e122a94de00895ada7866ebedb30277f)

Author	SHA1	Message	Date
Gabriel MABILLE	0f36152127	UserCacheService: Use value instead of pointer (#41549)	4 years ago
Eric Leijonmarck	4fd3dd41bc	ServiceAccounts: Delete ServiceAccount (#40470) ... * Add extra fields to OSS types to support enterprise * WIP service accounts * Update public/app/features/api-keys/ApiKeysForm.tsx Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Throw better error * Use Boolean for "create service account button" * 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 * Start work cloning permissions onto service account * 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 * Commented * Add CloneUserToServiceAccount * Update mock.go * Put graphical bits behind a feature toggle * Start adding LinkAPIKeyToServiceAccount * Update pkg/models/user.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Finish LinkAPIKeyToServiceAccount * Update comment * Handle api key link error * Update pkg/services/sqlstore/apikey.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Feature toggle * Update pkg/services/accesscontrol/accesscontrol.go Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * Not needed (yet) * Better error messages for OSS accesscontrol * Set an invalid user id as default * ServiceAccountId should be string * Re-arrange field names * ServiceAccountId is integer * Update ossaccesscontrol.go * Linter * Remove fronend edits * Remove console log * Update ApiKeysForm.tsx * feat: add serviceaccount deletion * feat: make sure we do not accidently delete serviceaccount * feat: ServiceAccount Type * refactor: userDeletions function * refactor: serviceaccount deletions\ * refactor: error name and removed attribute for userDeletecommand * refactor:: remove serviceaccount type for now * WIP * add mocked function * Remove unnecessary db query, move to right place * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Better error messages * Better and correcter error messages * add mocked function * refactor: move function call, add error msg * add IsServiceAccount and fix table * add service accounts package * WIP * WIP * working serviceaccountsapi registration * WIP tests * test * test working * test running for service * moved the error out of the models package * fixed own review * linting errors * Update pkg/services/serviceaccounts/database/database.go Co-authored-by: Jeremy Price <Jeremy.price@grafana.com> * tests running for api * WIP * WIP * removed unused secrets background svc * removed background svc for serviceaccount infavor or wire.go * serviceaccounts manager tests * registering as backend service Co-authored-by: Jeremy Price <jeremy.price@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.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
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
idafurjes	5a087d2708	Chore: Add context to team (#40504) ... * Add ctx to team * Remove convey from team	4 years ago
Selene	a1230f44dc	Fix user's total count in search (#40415)	4 years ago
Selene	da813877fb	Create search filters by interface (#39843) ... * Extract search users to a new service * Fix wire provider * Fix common_test and remove RouteRegister * Remove old endpoints * Fix test * Create search filters using interfaces * Move Enterprise filter, rename filter for filters and allow use filters with params * Each filter has unique key * Back activeLast30Days filter to OSS * Fix tests * Delete unusued param * Move filters to searchusers service and small refactor * Fix tests	4 years ago
idafurjes	f4f0d74838	Chore: Add context to user (#39649) ... * Add context to user * Add context for enterprise * Add context for UpdateUserLastSeenAtCommand * Remove xorm	4 years ago
Selene	e47a60f511	Add filter to search users by active (#38637) ... * Add filter to search users by active * Fix query	4 years ago
Carl Bergquist	9ef4c21033	add context to getsignedinUser calls (#35963) ... Signed-off-by: bergquist <carl.bergquist@gmail.com>	5 years ago
Carl Bergquist	a10fa5cad3	Instrumentation: Start tracing database requests (#34572) ... Signed-off-by: bergquist <carl.bergquist@gmail.com>	5 years ago
Carl Bergquist	4710566514	bus: add ctx for all signed in user queries (#33970) ... Signed-off-by: bergquist <carl.bergquist@gmail.com>	5 years ago
Arve Knudsen	5a0780801b	SQLStore: Close session in withDbSession (#31775) ... * SQLStore: Close session in withDbSession Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * SQLStore.WithDbSession: Never use session from context Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	87c3a2b790	PluginManager: Make Plugins, Renderer and DataSources non-global (#31866) ... * PluginManager: Make Plugins and DataSources non-global Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Replace outdated command Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix build Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * DashboardService: Ensure it gets constructed with necessary parameters Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove FocusConvey Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Remove dead code Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Undo interface changes Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Rename to DataSourceCount Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Consolidate dashboard interfaces into one Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix test Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> * Fix dashboard integration tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
dependabot[bot]	4f918e37f4	Chore(deps): Bump xorm.io/xorm from 0.8.1 to 0.8.2 (#30773) ... * Chore(deps): Bump xorm.io/xorm from 0.8.1 to 0.8.2 Bumps xorm.io/xorm from 0.8.1 to 0.8.2. Signed-off-by: dependabot[bot] <support@github.com> * Fix limit for snapshots * Fix limit for org and users Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>	5 years ago
Arve Knudsen	25048ebdf8	Chore: Add CloudWatch HTTP API tests (#29691) ... * CloudWatch: Add HTTP API tests Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	b5379c5335	Chore: Fix SQL related Go variable naming (#28887) ... * Chore: Fix variable naming Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	a5d9196a53	Chore/fix lint issues (#27704) ... * Chore: Fix linting issues Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Joan López de la Franca Beltran	ef631582ba	Users: Improve conflict error handling (#26958) ... * API: Improve error handling (#26934) * New ErrUserAlreadyExists error has been introduced * Create user endpoint returns 412 Precondition Failed on ErrUserAlreadyExists errors * Make ErrUserAlreadyExists error message clearer Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Use errors.Is instead of equality comparator on AdminCreateUser handler * Improve sqlstore/user test definition Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Improve sqlstore/user tests for ErrUserAlreadyExists cases * Remove no needed string fmt and err declaration on sqlstore/user tests * Code improvements for sqlstore/user tests Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Use err.Error() instead of sentinel error value on AdminCreateUser Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Add ErrUserAlreadyExists handling for signup & org invite use cases Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Arve Knudsen	d4e4cb4c71	Chore: Enable Go linter gocritic (#26224) ... * Chore: Enable gocritic linter Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	41d432b5ae	Chore: Enable whitespace linter (#25903) ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Alexander Zobnin	c4eca530ce	Fix active LDAP sync (#25321) ... * LDAP: sync only users with 'ldap' module as a most recent auth module * LDAP: tests for searching ldap users	6 years ago
Émile Fugulin	d721dd13cd	Allow API to assign new user to a specific organization (#21775) ... * Allow API to assign new user to a specific organization * Add defer block to test * Add API tests and return 400 instead of 500 for bad orgId * Minor test improvements	6 years ago
Vikky Omkar	97184c1750	Fix: Show organization popup in alphabetical order (#22259) ... * Show organization popup in alphabetical order * GetUserOrgList: Sort organizations by name in API Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	6 years ago
Arve Knudsen	0fd6edab64	services/sqlstore: Order results in UserSearch by username/email (#23328) ... * services/sqlstore: Order results in UserSearch by username/email * Add index (login,email) on user table	6 years ago
Pavlos Daoglou	53007e07e3	ApiUser: Fix response when enabling, disabling or deleting a nonexistent user (#21391) ... * ApiUser: Fix response when enabling, disabling or deleting a nonexistent user	6 years ago
Shavonn Brown	3e5abe7c21	Admin: Adds setting to disable creating initial admin user (#19505) ... Adds a new setting disable_admin_user and when true the default admin user will not be created when Grafana starts for the first time (or no users exists in the system). Closes #19038	6 years ago
Arve Knudsen	35e0e078b7	pkg/util: Check errors (#19832) ... * pkg/util: Check errors * pkg/services: DRY up code	6 years ago
Arve Knudsen	2a78d2a61c	pkg/services: Check errors (#19712) ... * pkg/services: Check errors * pkg/services: Don't treat context.Canceled|context.DeadlineExceeded as error	6 years ago
Rafael George	e1b2bf711d	API: Add createdAt field to /api/users/:id (#19475) ... It would help for auditing purposes to have the user's created date exposed via the API along with the other fields already exposed via the API.	6 years ago
gotjosh	fa007423e3	API: Add `updatedAt` to api/users/:id (#19004) ... * API: Add `updatedAt` to api/users/:id This adds the timestamp of when a particular user was last updated to the `api/users/:id` endpoint. This helps our administrators understand when was the user information last updated. Particularly when it comes from external systems e.g. LDAP	6 years ago
Oleg Gaidarenko	d9f01cb822	SQLStore: use bool pointer instead of string (#18111)	7 years ago
Oleg Gaidarenko	8e0f091f14	SQLStore: allow to look for `is_disabled` flag (#18032) ... * Add support for `is_disabled` to `CreateUser()` * Add support for `is_disabled` to `SearchUsers()` Had to add it as a `string` type not as `bool`, since if that's property is omitted, we would have add it to SQL request, which might be dangerous * Restructure desctructive tests and add more	7 years ago
Alexander Zobnin	dad894f1cc	API: get list of users with additional auth info (#17305) ... * batch disable users * batch revoke users tokens * split batch disable user and revoke token * API: get users with auth info and isExternal flag * fix tests for batch disable users * Users: refactor /api/users/search endpoint * Users: use alias for "user" table * Chore: add BatchDisableUsers() to the bus * Users: order user list by id explicitly * Users: return AuthModule from /api/users/:id endpoint * Users: do not return unused fields * Users: fix SearchUsers method after last changes * User: return auth module as array for future purposes * User: tests for SearchUsers() * User: return only latest auth module in SearchUsers() * User: fix JOIN, get only most recent auth module	7 years ago
Oleg Gaidarenko	c853ef7318	SQLStore: extend `user.SearchUsers` method (#17514) ... * SQLStore: extend `user.SearchUsers` method Allow `user.SearchUsers` to search users based on their auth type	7 years ago
Kyle Brandt	a95c7bfa6f	sqlstore: clean quota and user_auth_tokens when removing users (#17487) ... fixes #17392	7 years ago
Alexander Zobnin	60ddad8fdb	Batch disable users (#17254) ... * batch disable users * batch revoke users tokens * split batch disable user and revoke token * fix tests for batch disable users * Chore: add BatchDisableUsers() to the bus	7 years ago
Alexander Zobnin	2d03815770	Users: Disable users removed from LDAP (#16820) ... * Users: add is_disabled column * Users: disable users removed from LDAP * Auth: return ErrInvalidCredentials for failed LDAP auth * User: return isDisabled flag in user search api * User: mark disabled users at the server admin page * Chore: refactor according to review * Auth: prevent disabled user from login * Auth: re-enable user when it found in ldap * User: add api endpoint for disabling user * User: use separate endpoints to disable/enable user * User: disallow disabling external users * User: able do disable users from admin UI * Chore: refactor based on review * Chore: use more clear error check when disabling user * Fix login tests * Tests for disabling user during the LDAP login * Tests for disable user API * Tests for login with disabled user * Remove disable user UI stub * Sync with latest LDAP refactoring	7 years ago
Oleg Gaidarenko	54c1bf0cc9	Chore: a bit of spring cleaning (#16710) ... * Chore: use early return technic everywhere And enable "indent-error-flow" revive rule * Chore: remove if-return rule from revive config * Chore: improve error messages And enable "error-strings" revive rule * Chore: enable "error-naming" revive rule * Chore: make linter happy * Chore: do not duplicate gofmt execution * Chore: make linter happy * Chore: address the pull review comments	7 years ago
Marcus Efraimsson	e82b3632f6	fix signed in user for orgId=0 result should return active org id	7 years ago
danielbh	d1b8f13c66	feat: #11067 prevent removing last grafana admin permissions	7 years ago
Marcus Efraimsson	818d48c2c0	always execute the user teams query	7 years ago
Marcus Efraimsson	5be2332c66	handle error before populating cache	7 years ago
Marcus Efraimsson	6ef941ea17	fix failing tests	7 years ago
Torkel Ödegaard	93453c2d94	added caching of signed in user DB calls	7 years ago
Marcus Efraimsson	70ddf93688	include teams on signed in user	7 years ago
Torkel Ödegaard	5b5cb6622d	Remove user form org now completely removes the user from the system if the user is orphaned	7 years ago
Mario Trangoni	0dea8fe1e0	pkg/services/sqlstore/user.go: empty branch ... $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline=6m ./... pkg/services/sqlstore/user.go:274:3⚠️ empty branch (SA9003) (megacheck)	7 years ago
Mario Trangoni	e85d0e8d6b	pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID alert.go:193:15⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) alert.go:252:18⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead (SA1019) (megacheck) org.go:136:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org.go:169:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:119:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:221:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) team.go:77:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:243:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:267:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:282:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:313:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:475:3⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:479:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:493:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck)	7 years ago
Mario Trangoni	f73236f8f4	pkg/services/sqlstore: Fix x.Sql is deprecated: use SQL instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep SQL alert.go:43:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) alert_notification.go:122:12⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) annotation.go:226:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:228:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:302:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:416:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) dashboard.go:635:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) migrations/user_mig.go:137:9⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) plugin_setting.go:29:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:41:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:84:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:143:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:186:13⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) quota.go:234:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:172:12⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:199:17⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) team.go:223:9⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:99:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) temp_user.go:124:10⚠️ x.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:375:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:377:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck) user.go:379:3⚠️ sess.Sql is deprecated: use SQL instead. (SA1019) (megacheck)	7 years ago
Torkel Ödegaard	92ed1f04af	sql: added code migration type	7 years ago