Skip to content
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.

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

Auth check #439

Merged
merged 6 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion backend/cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ func newRunCMD() *cobra.Command {
}

resolver := config.NewResolver(c)

logger := resolver.Logger()

serv, err := resolver.Server(cmd.Context())
Expand Down
5 changes: 5 additions & 0 deletions backend/pkg/config/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,17 @@ func (r *Resolver) SetupOIDC(ctx context.Context, engine *gin.Engine) ([]gin.Han
if oid.SecretRef != "" {
values, err := r.LoadSecret(ctx, oid.SecretRef)
if err != nil {
zap.L().Error("failed to load openIDConnect secret", zap.String("secret", oid.SecretRef), zap.Error(err))
return nil, err
}

oid = oid.FromValues(values)
}

zap.L().Debug("setup openIDConnect", zap.String("callback", oid.Callback()), zap.String("discovery", oid.Discovery()))
provider, err := openidConnect.New(oid.ClientID, oid.ClientSecret, oid.Callback(), oid.Discovery(), oid.Scopes...)
if err != nil {
zap.L().Error("failed to create openIDConnect provider", zap.Error(err))
return nil, err
}

Expand All @@ -293,13 +296,15 @@ func (r *Resolver) Server(ctx context.Context) (*server.Server, error) {
handler, err := r.SetupOIDC(ctx, engine)
if err != nil {
zap.L().Error("failed to setup oidc", zap.Error(err))
return nil, err
}

middleware = append(middleware, handler...)
} else if r.config.OAuth.Enabled {
handler, err := r.SetupOAuth(ctx, engine)
if err != nil {
zap.L().Error("failed to setup oauth", zap.Error(err))
return nil, err
}

middleware = append(middleware, handler...)
Expand Down
Loading