starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-03-17 23:14:01 +01:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/main' into feat-list-tags-of-machines

Browse Source
This commit is contained in:
Adrien Raffin-Caboisse
2022-05-03 20:35:28 +02:00
parent fec8cda16a 3fbfc5a649
commit a2fb5b2b9d
32 changed files with 1326 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/headscale/cli/utils.go
View File

@@ -15,6 +15,7 @@ import (
"strings"
"time"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/juanfont/headscale"
v1 "github.com/juanfont/headscale/gen/go/headscale/v1"
"github.com/rs/zerolog/log"
@@ -68,6 +69,7 @@ func LoadConfig(path string) error {
viper.SetDefault("cli.timeout", "5s")
viper.SetDefault("cli.insecure", false)
viper.SetDefault("oidc.scope", []string{oidc.ScopeOpenID, "profile", "email"})
viper.SetDefault("oidc.strip_email_domain", true)
if err := viper.ReadInConfig(); err != nil {
@@ -369,6 +371,10 @@ func getHeadscaleConfig() headscale.Config {
Issuer: viper.GetString("oidc.issuer"),
ClientID: viper.GetString("oidc.client_id"),
ClientSecret: viper.GetString("oidc.client_secret"),
Scope: viper.GetStringSlice("oidc.scope"),
ExtraParams: viper.GetStringMapString("oidc.extra_params"),
AllowedDomains: viper.GetStringSlice("oidc.allowed_domains"),
AllowedUsers: viper.GetStringSlice("oidc.allowed_users"),
StripEmaildomain: viper.GetBool("oidc.strip_email_domain"),
},