Skip to content

fix: main sync for dex scope config override #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: main sync for dex scope config override #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85a365
misc: Dependa fix (#327)
prkhrkat Sep 2, 2025
8e6032e
fix: main sync for dex scope config override
SATYAsasini Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 23 additions & 1 deletion authenticator/client/oidcClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,35 @@ func GetSettings(conf *DexConfig) (*oidc.Settings, error) {
ClientSecret: conf.DexClientSecret,
Issuer: proxyUrl,
ServerSecret: conf.ServerSecret,
RequestedScopes: conf.DexScopes,
RequestedScopes: conf.GetDexScopes(),
},
UserSessionDuration: time.Duration(conf.UserSessionDurationSeconds) * time.Second,
AdminPasswordMtime: conf.AdminPasswordMtime,
}
return settings, nil
}
func (conf *DexConfig) GetDexScopes() []string {
// passing empty array to get default scopes
defaultScopes := oidc.GetScopesOrDefault([]string{})
additionalScopes := conf.DexScopes

occurrenceMap := make(map[string]bool)
finalScopes := make([]string, 0, len(defaultScopes)+len(additionalScopes))

// first add all the default
for _, scope := range defaultScopes {
occurrenceMap[scope] = true
finalScopes = append(finalScopes, scope)
}
// append extra configs
for _, scope := range additionalScopes {
if _, exists := occurrenceMap[scope]; !exists {
occurrenceMap[scope] = true
finalScopes = append(finalScopes, scope)
}
}
return finalScopes
}
func getOidcClient(dexServerAddress string, settings *oidc.Settings, userVerifier oidc.UserVerifier, RedirectUrlSanitiser oidc.RedirectUrlSanitiser) (*oidc.ClientApp, func(writer http.ResponseWriter, request *http.Request), error) {
dexClient := &http.Client{
Transport: &http.Transport{
Expand Down
38 changes: 20 additions & 18 deletions chart-sync/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.0

toolchain go1.24.3

replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806091511-49f0b9d1654a
replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250902070721-85c221824a14

require (
github.com/caarlos0/env v3.5.0+incompatible
Expand All @@ -16,7 +16,7 @@ require (
github.com/prometheus/client_golang v1.22.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
helm.sh/helm/v3 v3.18.1
helm.sh/helm/v3 v3.18.6
)

require (
Expand Down Expand Up @@ -81,21 +81,23 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
github.com/spf13/pflag v1.0.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/net v0.40.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.3 // indirect
golang.org/x/crypto v0.40.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/term v0.33.0 // indirect
golang.org/x/text v0.27.0 // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/grpc v1.72.2 // indirect
Expand All @@ -104,24 +106,24 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.33.0 // indirect
k8s.io/apiextensions-apiserver v0.33.0 // indirect
k8s.io/apimachinery v0.33.0 // indirect
k8s.io/cli-runtime v0.33.0 // indirect
k8s.io/client-go v0.33.0 // indirect
k8s.io/component-base v0.33.0 // indirect
k8s.io/api v0.33.3 // indirect
k8s.io/apiextensions-apiserver v0.33.3 // indirect
k8s.io/apimachinery v0.33.3 // indirect
k8s.io/cli-runtime v0.33.3 // indirect
k8s.io/client-go v0.33.3 // indirect
k8s.io/component-base v0.33.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/kubectl v0.33.0 // indirect
k8s.io/kubectl v0.33.3 // indirect
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
mellium.im/sasl v0.3.2 // indirect
oras.land/oras-go/v2 v2.5.0 // indirect
oras.land/oras-go/v2 v2.6.0 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.19.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
sigs.k8s.io/yaml v1.5.0 // indirect
)

replace github.com/devtron-labs/chart-sync => github.com/devtron-labs/devtron-services/chart-sync v0.0.0-20241024131256-7d3ba621dece
Loading
Loading