grafana

Commit Graph

Author	SHA1	Message	Date
Gabriel MABILLE	bf363b3234	ServiceAccounts: Use `isManaged` in DTO instead of `isExternal` (#77634 ) * ServiceAccounts: Use IsManaged in DTO instead of isExternal * Revert omitempty * Modify the other DTO * Swagger	2 years ago
linoman	c50ada3a1a	auth: wire service account proxy (#77215 ) * Add interface verification compliance * rework service account api to a provider * wire the service accounts api * rewire the implementation of sa srv for the proxy --------- Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>	2 years ago
Gabriel MABILLE	25b30aeb6d	Plugin: Enable service account based on plugin settings on init (#77193 ) * Disable plugin service account * Revert extsvc injection * handle plugin state changes * Use isProxyEnabled * Remove plugininteg changes * Change update function to also work for mysql 😩 * Plugin: enable service account based on plugin settings on initialization * Remove misleading comment * Fix tests * test message * Clean up tests * Simplify tests * Re-order imports * Remove unecessary comment * Enable datasource plugins by default Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com> --------- Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>	2 years ago
Gabriel MABILLE	2727f41474	AuthN: Change the external service account state on plugin state change (#77157 ) * Disable plugin service account * Revert extsvc injection * handle plugin state changes * Use isProxyEnabled * Remove plugininteg changes * Change update function to also work for mysql 😩 * Change test to also check no collateral update * Update pkg/services/serviceaccounts/database/store_test.go * Update pkg/services/serviceaccounts/database/store_test.go	2 years ago
linoman	dff7403b29	auth: implement feature flag for service account proxy (#77129 ) * add FlagExternalServiceAccounts to proxy service * add FlagExternalServiceAccounts value to tests --------- Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	2 years ago
linoman	1bc81b7bd1	auth: migrate api interface implementation (#77040 ) * expand serviceaccount service interface * implemet FakeServiceAccountService * Replace SA service interface from api * merge sa proxy tests with new fake service * implement DeleteServiceAccountToken * add test for DeleteServiceAccountToken	2 years ago
Gabriel MABILLE	897e3a4dab	AuthN: Add metrics to external service accounts management (#76789 ) * AuthN: Add metrics to external service accounts management * Add a new metric to count stored external service accounts * Update variable names Co-authored-by: linoman <2051016+linoman@users.noreply.github.com> * Add test to SearchOrgServiceAccounts * Add feature flags checks before registering and using the metrics --------- Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>	2 years ago
Gabriel MABILLE	3015e5921f	Chore: Move `extsvcaccounts` package to `serviceaccounts` (#76977 ) * Chore: Move extsvcaccounts package to serviceaccounts * Fix proxy * Fix tests * Fix linting	2 years ago
linoman	359d84799e	auth: add serviceaccount proxy (#76815 ) * Add proxy service template * Replace SA srv with proxy for external SA srv * Move service account prefix to a constant * Prevent deletion from external service account * Make SA validation a resusable function * Add protection for creating service accounts * Add protection when updating service accounts * Add IsExternal field for service account * Protect ext service account token generation * Add verbose errors for form name or sa name * add tests * Add logs * Adjusts tests --------- Co-authored-by: Misi <mgyongyosi@users.noreply.github.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	2 years ago
Carl Bergquist	764478b9e7	Instrumentation: Set auth as owners for more routes (#75105 ) Signed-off-by: bergquist <carl.bergquist@gmail.com>	2 years ago
Serge Zaitsev	8187d8cb66	Chore: capitalise log message for auth packages (#74332 )	2 years ago
Ryan McKinley	025b2f3011	Chore: use any rather than interface{} (#74066 )	2 years ago
Ieva	6885b3d577	Chore: remove checks for whether RBAC is disabled (#73812 ) * remove checks for whether access control is disabled, as it is always enabled now * linting	2 years ago
Marcus Efraimsson	040b7d2571	Chore: Add errutils helpers (#73577 ) Add helpers for the errutil package in favor of errutil.NewBase.	2 years ago
linoman	1c7f89c41b	Auth: Add empty role usage metrics for service and user accounts (#73108 ) * Add tests for service accounts metrics usage * Add service account store implementation * Add service account service implementation * Add tests for org metrics usage * Add org implementation * Add service implementation	2 years ago
Jo	67de18ff06	Auth: Move Service Account service to SignedInUser Interface (#73142 ) * move service account service to identity interface * Update pkg/services/auth/identity/requester.go	2 years ago
Jo	3300488667	AccessControl: Remove acmock.New from accesscontrol service tests (#71942 ) * remove mock ac provider from service accounts * remove mock ac provider from accesscontrol tests * remove mock ac from ac service tests	2 years ago
Jo	d6c468c1c2	Auth: Add empty role definition (#64694 ) * Allow setting role as None Co-authored-by: gamab <gabi.mabs@gmail.com> Seeking for places where role.None would be used Co-authored-by: Jguer <joao.guerreiro@grafana.com> Adding None role to the frontend Co-authored-by: Jguer <joao.guerreiro@grafana.com> unify org role declaration and remove from add permission fix backend test fix backend lint * remove role none from frontend * Simplify checks Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * nits --------- Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	2 years ago
Eric Leijonmarck	5dceb5dff3	Service accounts: API key migration refactoring to parse as json object of the results (#69771 ) refactoring to parse as json object of the results	2 years ago
Eric Leijonmarck	081f59feba	Service accounts: UI migration results (#68789 ) * ui migration WIP * merge * migration tests for api * revert chagnes to align with main * revert chagnes to align with main * revert chagnes to align with main * remove unused code and comments * revert gen files * retry logic inplace * fix a any * fixed types * migraiton results now show only result if no failures * review comments * wording to make it more actionable * add migraiton summary text onyl for failed apikeys * fixed wording and added a close button to the modal * made the button close the modal * moved state into component * fix based on review, naming and removed unused code * service account migration state optional * making migration result undefined * showing total and migrated numbers for a successful migration * fix payload const to take the payload	2 years ago
Ieva	d8b66d5c4b	RBAC: remove some `IsDisabled` checks (#69272 ) * remove some access contorl IsDisabled() checks * cleaning up tests * update tests * linting	2 years ago
Gabriel MABILLE	edf1775d49	AuthN: Embed an OAuth2 server for external service authentication (#68086 ) * Moving POC files from #64283 to a new branch Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * Adding missing permission definition Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * Force the service instantiation while client isn't merged Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * Merge conf with main Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * Leave go-sqlite3 version unchanged Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * tidy Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * User SearchUserPermissions instead of SearchUsersPermissions * Replace DummyKeyService with signingkeys.Service * Use user🆔<id> as subject * Fix introspection endpoint issue * Add X-Grafana-Org-Id to get_resources.bash script * Regenerate toggles_gen.go * Fix basic.go * Add GetExternalService tests * Add GetPublicKeyScopes tests * Add GetScopesOnUser tests * Add GetScopes tests * Add ParsePublicKeyPem tests * Add database test for GetByName * re-add comments * client tests added * Add GetExternalServicePublicKey tests * Add other test case to GetExternalServicePublicKey * client_credentials grant test * Add test to jwtbearer grant * Test Comments * Add handleKeyOptions tests * Add RSA key generation test * Add ECDSA by default to EmbeddedSigningKeysService * Clean up org id scope and audiences * Add audiences to the DB * Fix check on Audience * Fix double import * Add AC Store mock and align oauthserver tests * Fix test after rebase * Adding missing store function to mock * Fix double import * Add CODEOWNER * Fix some linting errors * errors don't need type assertion * Typo codeowners * use mockery for oauthserver store * Add feature toggle check * Fix db tests to handle the feature flag * Adding call to DeleteExternalServiceRole * Fix flaky test * Re-organize routes comments and plan futur work * Add client_id check to Extended JWT client * Clean up * Fix * Remove background service registry instantiation of the OAuth server * Comment cleanup * Remove unused client function * Update go.mod to use the latest ory/fosite commit * Remove oauth2_server related configs from defaults.ini * Add audiences to DTO * Fix flaky test * Remove registration endpoint and demo scripts. Document code * Rename packages * Remove the OAuthService vs OAuthServer confusion * fix incorrect import ext_jwt_test * Comments and order * Comment basic auth * Remove unecessary todo * Clean api * Moving ParsePublicKeyPem to utils * re ordering functions in service.go * Fix comment * comment on the redirect uri * Add RBAC actions, not only scopes * Fix tests * re-import featuremgmt in migrations * Fix wire * Fix scopes in test * Fix flaky test * Remove todo, the intersection should always return the minimal set * Remove unecessary check from intersection code * Allow env overrides on settings * remove the term app name * Remove app keyword for client instead and use Name instead of ExternalServiceName * LogID remove ExternalService ref * Use Name instead of ExternalServiceName * Imports order * Inline * Using ExternalService and ExternalServiceDTO * Remove xorm tags * comment * Rename client files * client -> external service * comments * Move test to correct package * slimmer test * cachedUser -> cachedExternalService * Fix aggregate store test * PluginAuthSession -> AuthSession * Revert the nil cehcks * Remove unecessary extra * Removing custom session * fix typo in test * Use constants for tests * Simplify HandleToken tests * Refactor the HandleTokenRequest test * test message * Review test * Prevent flacky test on client as well * go imports * Revert changes from `526e48ad45` * AuthN: Change the External Service registration form (#68649) * AuthN: change the External Service registration form * Gen default permissions * Change demo script registration form * Remove unecessary comment * Nit. * Reduce cyclomatic complexity * Remove demo_scripts * Handle case with no service account * Comments * Group key gen * Nit. * Check the SaveExternalService test * Rename cachedUser to cachedClient in test * One more test case to database test * Comments * Remove last org scope Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com> * Update pkg/services/oauthserver/utils/utils_test.go * Update pkg/services/sqlstore/migrations/oauthserver/migrations.go Remove comment * Update pkg/setting/setting.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> --------- Co-authored-by: Mihály Gyöngyösi <mgyongyosi@users.noreply.github.com>	2 years ago
Ieva	4980b64274	RBAC: Remove legacy ac from authorization middleware (#68898 ) remove legacy AC fallback from RBAC middleware, and some unused auth logic	2 years ago
Jo	f9fd15c01e	fix shadow log in service accounts (#67643 ) * fix shadow log in service accounts	2 years ago
Karl Persson	e4d998dc1a	ApiKeyGenPrefix: rename package (#65623 ) * Rename package to satokengen to make it clearer that it is for service account tokens	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
Jo	0e565a2e6c	ServiceAccounts: Collect usage stat for service account forced expiry (#64833 ) collect usage stat for service account forced expiry	2 years ago
Ieva	1d1f58f0ed	Service accounts: fix usage of `errutil` errors and convert more errors to `errutil` (#64299 ) * fix usage of errutil errors and convert more errors to errutil * fix tests	2 years ago
Eric Leijonmarck	ad4b053231	API keys: Remove state hideAPIkeys and refactor interface to IsDisabled (#64018 ) * remove state and refactor interface to IsDisabled * update docs and span * Update pkg/services/apikey/apikey.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> --------- Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>	2 years ago
Sofia Papagiannaki	e6e8351ee9	Chore: Remove CreateUserForTests() (#64125 ) * Chore: Remove CreateUserForTests * Apply suggestion from code review	2 years ago
Eric Leijonmarck	76bc288d67	Service accounts: Remove revertapikeys endpoint (#64020 ) * remove revertapikeys endpoints * remove unused method	2 years ago
Emil Tullstedt	10ee900beb	Errors: Remove direct dependencies on github.com/pkg/errors (#64026 ) Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>	2 years ago
Ieva	3fb1894739	Service accounts: Creation logic simplification (#63884 ) * SA creation improvements * PR feedback - put salt and rand back in and remove an unneeded line:	2 years ago
Eric Leijonmarck	9d6ab92e39	Service accounts: Remove Add API keys buttons and remove one state of migrating for API keys tab (#63411 ) * add: hide apikeys tab on start * make use of store method * added hiding of apikeys tab for new org creation * missing err check * removed unused files * implemennted fake to make tests run * move check for globalHideApikeys from org to admin * refactor to remove the fake * removed unused method calls for interface * Update pkg/services/serviceaccounts/manager/service.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * Update pkg/services/serviceaccounts/manager/service.go Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> * remove the checkglobal method * removed duplicate global set const * add count of apikeys for performance * remove apikeys adding in UI * added back deleted file * added comment on component * changed wording and copy for hiding and migrating service accounts * refactor: remove migrationstatus in front/backend This removes the migrationstatus state from the UI in favor of only looking at the number of API keys to determine what to show to the user. This simplifies the logic and makes less calls to the backend with each page load. This was called both on the API keys page and the Service accounts page. - removes the state of migrationstatus from the UI - removes the backend call - removes the backend endpoint for migrationstatus * Update pkg/services/apikey/apikeyimpl/xorm_store.go Co-authored-by: Karl Persson <kalle.persson@grafana.com> * changes the contet to also be primary * change id of version for footer component --------- Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> Co-authored-by: Karl Persson <kalle.persson@grafana.com>	2 years ago
Jo	c8db771939	Users: Fix org user always getting org id = 1 on auto assign false (#63708 ) * fix org user always getting org id = 1 on auto assign false * make tests explicit * use correct cfg in service accounts * fix api tests * fix database test of ac * fix InsertOrgUser returning affected rows as orgID	2 years ago
Jo	f9163351fd	Support bundles: Refactor registry into separate service (#62945 ) * add bundle registry service to avoid dependency cycles * move user support bundle collector to user service * move usage stat bundle implementation to usage stats * add info for background service * fix remaining imports * whitespace	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
suntala	51bef166c2	Chore: Remove Result field from serviceaccounts, ualert (#62476 ) * Chore: Remove Result field from serviceaccounts * Chore: Remove Result field from ualert	2 years ago
Serge Zaitsev	7dbd2cd139	Chore: Fix goimports grouping (#62426 ) fix goimports ordering	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
Jo	e2ec219f6a	SecretScan: Remove placeholder image and polish errors (#61785 ) * remove placeholder image * improve http client options * add http clients options for webhook notifier * ensure http is only used in dev mode * cleanup errors	2 years ago
idafurjes	7dcb502b33	Chore: Remove org model duplicates (#61025 ) Remove org model duplicates	2 years ago
Karl Persson	0743c4eb87	ServiceAccount: Rewrite the api test to use fakes (#60441 ) * RBAC: Add fake for permissions service * ServiceAccount: Rewrite create api tests * ServiceAccount: Rewrite api delete tests * ServiceAccount: Rewrite api test for RetriveServiceAccount * ServiceAccount: Refactor UpdateServiceAccount api test * ServiceAccount: Refactor CreateToken api test * ServiceAccount: refactor delete token api tests * ServiceAccount: rewrite list tokens api test * Remove test helper that is not used any more * ServiceAccount: remove unused test helpers	2 years ago
Kristin Laemmert	cc007e9727	chore: sqlstore cleanup (#60415 ) * chore: remove unused test helper from sqlstore TimeNow() is no longer used in any tests in this package. * chore: move sqlstore.SQLBuilder to the infra/db package This required some minor refactoring; we need to be a little more explicit about passing around the dialect and engine. On the other hand, that's a few fewer uses of the `dialect` global constant! * chore: move UserDeletions into the only package using it * cleanup around moving sqlbuilder * remove dialect and sqlog global vars * rename userDeletions to serviceAccountDeletions	2 years ago
Eric Leijonmarck	371d7850a5	Auth: Service account store refactor (#58961 ) * refactor: renaming of files from database to store * refactor: make service account store private - moves store interface to manager package - adds an interface to the ProvideAPI constructor - refactors tests to use the store when necessary - adds mocks for the new interface implementations in the tests package * wip * refactor: make fakestore in service * wip * wip * wip * working tests * trailing whitespaces * Update pkg/services/serviceaccounts/api/api.go * Update pkg/services/serviceaccounts/tests/common.go * Update pkg/services/serviceaccounts/tests/common.go * refactor: doc string for retriever * fix import unused * remove: serviceaccount from featuretoggle * added: back legacy serviceaccounts feature toggle * added: docs * refactor: make query for the SearchQuery * add: validation of service input fields * add validation	2 years ago
Kristin Laemmert	70fbf47022	chore: remove CreateUser from sqlstore & replace with userService.CreateUserForTests (#59910 )	3 years ago
Jo	d833031726	ServiceAccounts: Do not display warnings about secret scanner when scanner is disabled (#59952 ) ServiceAccounts: Fix warnings about secret scanner when scanner is disabled	3 years ago
Serge Zaitsev	b3284a8330	Chore: Make getUserOrgList private to sqlstore (#59654 ) * make getUserOrgList private in sqlstore * make other identifiers private	3 years ago
Serge Zaitsev	5b861faec3	Chore: Reduce the usage of sqlstore.createorg and use orgservice instead (#59356 ) * remove legacy createorg from org service * remove another createorg from orgimpl * remove createorg from api pref tests * remove createorg from api org tests * fix tests * remove createorg from annotations test * remove createorg from team tests * remove createorg from service accounts * remove createorg from accesscontrol tests * remove createorg from provisioning * Use quotaservice from sc.hs	3 years ago
Ieva	a8bae3f0b0	Access Control: Clear user's permission cache after resource creation (#59101 ) * refresh user's permission cache after resource creation * clear the cache instead of reloading the permissions * don't error if can't clear cache * fix tests * fix tests again	3 years ago

1 2 3 4

160 Commits (2c7f3640672c312f5e8054dee40388c1d853fff5)