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.

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

Jump to bottom

move OIDC and Google provider options processing #16

Merged
merged 1 commit into from
Feb 4, 2019
Merged

move OIDC and Google provider options processing #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 18 additions & 34 deletions options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
"context"
"crypto"
"crypto/tls"
"encoding/base64"
Expand All @@ -13,7 +12,6 @@ import (
"strings"
"time"

oidc "github.com/coreos/go-oidc"
"github.com/mbland/hmacauth"
"github.com/ploxiln/oauth2_proxy/providers"
)
Expand Down Expand Up @@ -87,7 +85,6 @@ type Options struct {
CompiledRegex []*regexp.Regexp
provider providers.Provider
signatureData *SignatureData
oidcVerifier *oidc.IDTokenVerifier
}

type SignatureData struct {
Expand Down Expand Up @@ -151,22 +148,6 @@ func (o *Options) Validate() error {
"\n use email-domain=* to authorize all email addresses")
}

if o.OIDCIssuerURL != "" {
// Configure discoverable provider data.
provider, err := oidc.NewProvider(context.Background(), o.OIDCIssuerURL)
if err != nil {
return err
}
o.oidcVerifier = provider.Verifier(&oidc.Config{
ClientID: o.ClientID,
})
o.LoginURL = provider.Endpoint().AuthURL
o.RedeemURL = provider.Endpoint().TokenURL
if o.Scope == "" {
o.Scope = "openid email profile"
}
}

o.redirectURL, msgs = parseURL(o.RedirectURL, "redirect", msgs)

for _, u := range o.Upstreams {
Expand All @@ -189,6 +170,7 @@ func (o *Options) Validate() error {
}
o.CompiledRegex = append(o.CompiledRegex, CompiledRegex)
}

msgs = parseProviderInfo(o, msgs)

if o.PassAccessToken || (o.CookieRefresh != time.Duration(0)) {
Expand Down Expand Up @@ -224,18 +206,6 @@ func (o *Options) Validate() error {
o.CookieExpire.String()))
}

if len(o.GoogleGroups) > 0 || o.GoogleAdminEmail != "" || o.GoogleServiceAccountJSON != "" {
if len(o.GoogleGroups) < 1 {
msgs = append(msgs, "missing setting: google-group")
}
if o.GoogleAdminEmail == "" {
msgs = append(msgs, "missing setting: google-admin-email")
}
if o.GoogleServiceAccountJSON == "" {
msgs = append(msgs, "missing setting: google-service-account-json")
}
}

msgs = parseSignatureKey(o, msgs)
msgs = validateCookieName(o, msgs)

Expand Down Expand Up @@ -268,6 +238,17 @@ func parseProviderInfo(o *Options, msgs []string) []string {
case *providers.GitLabProvider:
p.SetGroups(o.GitLabGroups)
case *providers.GoogleProvider:
if len(o.GoogleGroups) > 0 || o.GoogleAdminEmail != "" || o.GoogleServiceAccountJSON != "" {
if len(o.GoogleGroups) < 1 {
msgs = append(msgs, "missing setting: google-group")
}
if o.GoogleAdminEmail == "" {
msgs = append(msgs, "missing setting: google-admin-email")
}
if o.GoogleServiceAccountJSON == "" {
msgs = append(msgs, "missing setting: google-service-account-json")
}
}
if o.GoogleServiceAccountJSON != "" {
file, err := os.Open(o.GoogleServiceAccountJSON)
if err != nil {
Expand All @@ -277,10 +258,13 @@ func parseProviderInfo(o *Options, msgs []string) []string {
}
}
case *providers.OIDCProvider:
if o.oidcVerifier == nil {
msgs = append(msgs, "oidc provider requires an oidc issuer URL")
if o.OIDCIssuerURL == "" {
msgs = append(msgs, "missing-setting: oidc-issuer-url")
} else {
p.Verifier = o.oidcVerifier
err := p.SetIssuerURL(o.OIDCIssuerURL)
if err != nil {
msgs = append(msgs, err.Error())
}
}
}
return msgs
Expand Down
23 changes: 23 additions & 0 deletions providers/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package providers
import (
"context"
"fmt"
"net/url"
"time"

"golang.org/x/oauth2"
Expand All @@ -21,6 +22,28 @@ func NewOIDCProvider(p *ProviderData) *OIDCProvider {
return &OIDCProvider{ProviderData: p}
}

func (p *OIDCProvider) SetIssuerURL(issuerURL string) error {
provider, err := oidc.NewProvider(context.Background(), issuerURL)
if err != nil {
return fmt.Errorf("error looking up issuer-url=%q %s", issuerURL, err)
}
p.Verifier = provider.Verifier(&oidc.Config{
ClientID: p.ClientID,
})
p.LoginURL, err = url.Parse(provider.Endpoint().AuthURL)
if err != nil {
return fmt.Errorf("error parsing login-url=%q %s", provider.Endpoint().AuthURL, err)
}
p.RedeemURL, err = url.Parse(provider.Endpoint().TokenURL)
if err != nil {
return fmt.Errorf("error parsing redeem-url=%q %s", provider.Endpoint().TokenURL, err)
}
if p.Scope == "" {
p.Scope = "openid email profile"
}
return nil
}

func (p *OIDCProvider) Redeem(redirectURL, code string) (s *SessionState, err error) {
ctx := context.Background()
c := oauth2.Config{
Expand Down