From 7db17f27f020e7d0c4e0d35025335892996ec9d2 Mon Sep 17 00:00:00 2001 From: Joel Speed Date: Wed, 6 Oct 2021 17:29:30 +0100 Subject: [PATCH] Fixup providers with verbose type --- providers/azure.go | 16 ++++++++-------- providers/github.go | 12 ++++++------ providers/internal_util.go | 6 +++--- providers/logger.go | 7 +++---- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/providers/azure.go b/providers/azure.go index dc985772..cd501756 100644 --- a/providers/azure.go +++ b/providers/azure.go @@ -89,7 +89,7 @@ func NewAzureProvider(p *ProviderData) *AzureProvider { func (p *AzureProvider) Configure(tenant string) { if tenant == "" || tenant == "common" { // tenant is empty or default, remain on the default "common" tenant - infoLogger().Infof("Azure provider configured for common tenant") + infoLogger.Infof("Azure provider configured for common tenant") return } @@ -97,7 +97,7 @@ func (p *AzureProvider) Configure(tenant string) { p.Tenant = tenant overrideTenantURL(p.LoginURL, azureDefaultLoginURL, tenant, "authorize") overrideTenantURL(p.RedeemURL, azureDefaultRedeemURL, tenant, "token") - infoLogger().Infof("Azure provider configured for tenant: %s", tenant) + infoLogger.Infof("Azure provider configured for tenant: %s", tenant) } func overrideTenantURL(current, defaultURL *url.URL, tenant, path string) { @@ -161,7 +161,7 @@ func (p *AzureProvider) Redeem(ctx context.Context, redirectURL, code string) (* if err == nil && email != "" { session.Email = email } else { - debugLogger().Infof("Unable to get email claim from id_token: %v", err) + debugLogger.Infof("Unable to get email claim from id_token: %v", err) } if session.Email == "" { @@ -169,7 +169,7 @@ func (p *AzureProvider) Redeem(ctx context.Context, redirectURL, code string) (* if err == nil && email != "" { session.Email = email } else { - debugLogger().Infof("Unable to get email claim from access token: %v", err) + debugLogger.Infof("Unable to get email claim from access token: %v", err) } } @@ -228,10 +228,10 @@ func (p *AzureProvider) verifyTokenAndExtractEmail(ctx context.Context, token st if err == nil { email = claims.Email } else { - debugLogger().Infof("Unable to get claims from token: %v", err) + debugLogger.Infof("Unable to get claims from token: %v", err) } } else { - debugLogger().Infof("Unable to verify token: %v", err) + debugLogger.Infof("Unable to verify token: %v", err) } } @@ -298,7 +298,7 @@ func (p *AzureProvider) redeemRefreshToken(ctx context.Context, s *sessions.Sess if err == nil && email != "" { s.Email = email } else { - debugLogger().Infof("Unable to get email claim from id_token: %v", err) + debugLogger.Infof("Unable to get email claim from id_token: %v", err) } if s.Email == "" { @@ -306,7 +306,7 @@ func (p *AzureProvider) redeemRefreshToken(ctx context.Context, s *sessions.Sess if err == nil && email != "" { s.Email = email } else { - debugLogger().Infof("Unable to get email claim from access token: %v", err) + debugLogger.Infof("Unable to get email claim from access token: %v", err) } } diff --git a/providers/github.go b/providers/github.go index 0479b694..b21e31ee 100644 --- a/providers/github.go +++ b/providers/github.go @@ -161,13 +161,13 @@ func (p *GitHubProvider) hasOrg(ctx context.Context, accessToken string) (bool, presentOrgs := make([]string, 0, len(orgs)) for _, org := range orgs { if p.Org == org.Login { - debugLogger().Infof("Found Github Organization: %q", org.Login) + debugLogger.Infof("Found Github Organization: %q", org.Login) return true, nil } presentOrgs = append(presentOrgs, org.Login) } - debugLogger().Infof("Missing Organization:%q in %v", p.Org, presentOrgs) + debugLogger.Infof("Missing Organization:%q in %v", p.Org, presentOrgs) return false, nil } @@ -269,7 +269,7 @@ func (p *GitHubProvider) hasOrgAndTeam(ctx context.Context, accessToken string) ts := strings.Split(p.Team, ",") for _, t := range ts { if t == team.Slug { - debugLogger().Infof("Found Github Organization:%q Team:%q (Name:%q)", team.Org.Login, team.Slug, team.Name) + debugLogger.Infof("Found Github Organization:%q Team:%q (Name:%q)", team.Org.Login, team.Slug, team.Name) return true, nil } } @@ -277,13 +277,13 @@ func (p *GitHubProvider) hasOrgAndTeam(ctx context.Context, accessToken string) } } if hasOrg { - debugLogger().Infof("Missing Team:%q from Org:%q in teams: %v", p.Team, p.Org, presentTeams) + debugLogger.Infof("Missing Team:%q from Org:%q in teams: %v", p.Team, p.Org, presentTeams) } else { var allOrgs []string for org := range presentOrgs { allOrgs = append(allOrgs, org) } - debugLogger().Infof("Missing Organization:%q in %#v", p.Org, allOrgs) + debugLogger.Infof("Missing Organization:%q in %#v", p.Org, allOrgs) } return false, nil } @@ -372,7 +372,7 @@ func (p *GitHubProvider) isCollaborator(ctx context.Context, username, accessTok result.StatusCode(), endpoint.String(), result.Body()) } - traceLogger().Infof("Checking collaborator status: Got %d from %q %s", result.StatusCode(), endpoint.String(), result.Body()) + traceLogger.Infof("Checking collaborator status: Got %d from %q %s", result.StatusCode(), endpoint.String(), result.Body()) return true, nil } diff --git a/providers/internal_util.go b/providers/internal_util.go index ba3e6b82..d7bb0619 100644 --- a/providers/internal_util.go +++ b/providers/internal_util.go @@ -61,12 +61,12 @@ func validateToken(ctx context.Context, p Provider, accessToken string, header h WithHeaders(header). Do() if result.Error() != nil { - debugLogger().Infof("GET %s", stripToken(endpoint)) - debugLogger().Infof("token validation request failed: %s", result.Error()) + debugLogger.Infof("GET %s", stripToken(endpoint)) + debugLogger.Infof("token validation request failed: %s", result.Error()) return false } - traceLogger().Infof("%d GET %s %s", result.StatusCode(), stripToken(endpoint), result.Body()) + traceLogger.Infof("%d GET %s %s", result.StatusCode(), stripToken(endpoint), result.Body()) if result.StatusCode() == 200 { return true diff --git a/providers/logger.go b/providers/logger.go index ec47ba5a..d2ff5a6e 100644 --- a/providers/logger.go +++ b/providers/logger.go @@ -2,11 +2,10 @@ package providers import ( "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/logger" - "k8s.io/klog/v2" ) var ( - infoLogger = func() klog.Verbose { return klog.V(logger.ProviderInfo) } - debugLogger = func() klog.Verbose { return klog.V(logger.ProviderDebug) } - traceLogger = func() klog.Verbose { return klog.V(logger.ProviderTrace) } + infoLogger = logger.Verbose(logger.ProviderInfo) + debugLogger = logger.Verbose(logger.ProviderDebug) + traceLogger = logger.Verbose(logger.ProviderTrace) )