medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extract hardcoded jwt claim names into config (#97) 

* extract hardcoded jwt field names into config

* Update config.go

Co-authored-by: James Read <contact@jread.com>
This commit is contained in:
Bernard Crnković 2023-01-10 23:29:31 +01:00 committed by GitHub
parent edf10fdd9f
commit e18df74d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/config/config.go
View File

@ -72,6 +72,8 @@ type Config struct {
ShowNewVersions bool ShowNewVersions bool
AuthJwtCookieName string AuthJwtCookieName string
AuthJwtSecret string AuthJwtSecret string
AuthJwtClaimUsername string
AuthJwtClaimUserGroup string
DefaultPermissions PermissionsList DefaultPermissions PermissionsList
AccessControlLists []AccessControlList AccessControlLists []AccessControlList
} }
@ -93,6 +95,8 @@ func DefaultConfig() *Config {
config.CheckForUpdates = true config.CheckForUpdates = true
config.DefaultPermissions.Exec = true config.DefaultPermissions.Exec = true
config.DefaultPermissions.View = true config.DefaultPermissions.View = true
config.AuthJwtClaimUsername = "name"
config.AuthJwtClaimUserGroup = "group"
return &config return &config
} }

4
internal/httpservers/restapi.go
View File

@ -88,8 +88,8 @@ func startRestAPIServer(globalConfig *config.Config) error {
return nil return nil
} }
username := lookupClaimValueOrDefault(claims, "name", "none") username := lookupClaimValueOrDefault(claims, cfg.AuthJwtClaimUsername, "none")
usergroup := lookupClaimValueOrDefault(claims, "group", "none") usergroup := lookupClaimValueOrDefault(claims, cfg.AuthJwtClaimUserGroup, "none")
md := metadata.Pairs( md := metadata.Pairs(
"username", username, "username", username,