public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,219 Commits 655 Branches 650 Tags
324197bb7eb5941eee9b059ce75c2c2540887f55
Commit Graph

15 Commits

Author SHA1 Message Date
Misi 1b3d09fdda [v10.2.x] Auth: Use cfg.Raw in OAuthStrategy for loading settings (#80157) 
Auth: Use cfg.Raw in OAuthStrategy for loading settings (#80136)

Use cfg.Raw in OAuthStrategy, remove unnecessary tests

(cherry picked from commit eae6adf002)
 2024-01-08 16:40:39 +01:00
Misi 50f4e78a39 Auth: Use SSO settings service to load social connectors + refactor (#79005) 
* Refactor to prevent cyclic dependencies

* Move list authorization to the API layer

* Init connectors using the SSO settings service in case the ssoSettingsApi feature toggle is enabled

* wip, need to handle the cyclic dep

* Remove cyclic dependency

* Align tests + refactor

* Move back OAuthInfo to social

* Delete pkg/login/social/constants

* Move reloadable registration to the social providers

* Rename connectors.Error to connectors.SocialError
 2023-12-08 11:20:42 +01:00
Mihai Doarna d7641b0ecb Auth: encrypt secrets for oauth providers in SSO settings API service (#79081) 
encrypt secrets for oauth providers
 2023-12-06 14:37:10 +02:00
Misi d3a269ab3b Auth: Load ini/env vars settings in the fallback strategy (#78495) 
* Return data in camelCase from the OAuth fb strategy

* changes

* wip

* Add defaults for oauth fb strategy

* revert other changes

* Add tests

* Add Defaults to cfg and use it in OAuthStrategy

* Return *OAuthInfo from OAuthStrategy

* lint

* Remove unnecessary Defaults

* Introduce const for fields, fix import order

* Align failing tests

* clean up

* Changes requested by @gamab

* Update pkg/services/ssosettings/strategies/oauth_strategy_test.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Load data on startup

* Rename + simplify

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2023-12-01 15:35:44 +01:00
Mihai Doarna 2e2b1cd9e4 Refactor SSOSettings to use types (#78675) 
* refactor SSOSettings to use types

* test struct

* refactor SSOSettings struct to use types

* fix database tests

* fix populateSSOSettings() to accept an SSOSettings param

* fix all tests from the database layer

* handle errors for converting to/from SSOSettings

* add json tag on OAuthInfo fields

* use continue instead of if/else

* add the source field to SSOSettingsDTO conversion

* remove omitempty from json tags in OAuthInfo struct
 2023-11-29 18:02:04 +02:00
Mihai Doarna 27d8b68c9c Auth: Add more tests for the SSO settings upsert function (#78544) 
* add more tests for the SSO settings upsert function

* fix client id to match provider

* use time now in tests
 2023-11-24 12:02:05 +02:00
Mihai Doarna f0d3e27ea7 Add unit tests for the removeSSOSettings API method (#78476) 
add unit tests for the removeSSOSettings api method
 2023-11-22 15:57:12 +02:00
Misi 3607a00692 Auth: Use camelCase in SSO Settings API (#78480) 
Return/accept camelCase fields in sso setting api
 2023-11-21 17:41:47 +01:00
Mihai Doarna 875ea092df Add more unit tests for removeSSOSettings method (#78329) 
* add more unit tests for remove sso settings

* add unit tests for the service method
 2023-11-21 10:11:52 +02:00
Misi 437ae8e8c5 Auth: Refactor OAuth connectors' initialization (#77919) 
* Refactor AzureAD to init itself

* Use mapstructure to convert data to OAuthInfo

* Update

* Align tests

* Remove unused functions

* Add owner to mapstructure

* Clean up, lint

* Refactor Okta init, Align tests

* Address review comments, fix name in newSocialBase

* Update newSocialBase first param

* Refactor GitLab init, align tests

* Update pkg/login/social/common.go

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

* Use ini conversion to map

* Leftovers

* Refactor GitHub connector initialization, align tests

* Refactor Google connector init, align tests

* Refactor grafana_com connector, align tests

* Refactor generic_oauth connector init, align tests

* cleanup

* Remove util.go

* Add tests for custom field init

* Change OAuthInfo's Extra type

* Fix

* Replace interface{} with any

* clean up

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2023-11-20 09:45:40 +01:00
Mihai Doarna 9da9bbf907 Add swagger code for the removeProviderSettings API method (#78270) 
* add swagger code for the remove provider SSO settings API method

* replace fine grained with role based

* address feedback
 2023-11-17 14:07:26 +02:00
Misi 7ae0ff1309 RBAC: Add OAuth provider scopes separately to fixed:authentication.config:writer (#78202) 
Add OAuth provider setting scopes to fixed:authentication writer

* Change SSO Settings api scopes

* Remove unused RBAC Action
 2023-11-16 09:15:51 +01:00
Ryan McKinley f69fd3726b FeatureToggles: Add context and and an explicit global check (#78081) 2023-11-14 12:50:27 -08:00
Mihai Doarna 6d74746997 Auth: Replace literal http status codes with constants from http pkg (#78116) 
replace literal http status codes with constants from http pkg
 2023-11-14 17:07:51 +02:00
Misi 5285e9503b Auth: SSO settings foundations (#77724) 
* inital changes, db migration

* changes

* Implement basic GetAll, Delete

* Add first batch of tests

* Add more tests

* Add service tests for GetForProvider, List

* Update http_server.go + wire.go

* Lint + update fixed role

* Update CODEOWNERS

* Change API init

* Change roles, rename

* Review with @kalleep

* Revert a mistakenly changed part

* Updates based on @dmihai 's feedback

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2023-11-08 10:50:01 +01:00