feat(authn-oidc): use full urls for login callback/logout options
This commit is contained in:
parent
499bb3696d
commit
544326a4b7
|
@ -15,6 +15,12 @@ func NewDefaultLayersConfig() LayersConfig {
|
||||||
},
|
},
|
||||||
Authn: AuthnLayerConfig{
|
Authn: AuthnLayerConfig{
|
||||||
TemplateDir: "./layers/authn/templates",
|
TemplateDir: "./layers/authn/templates",
|
||||||
|
OIDC: AuthnOIDCLayerConfig{
|
||||||
|
HTTPClient: AuthnOIDCHTTPClientConfig{
|
||||||
|
TransportConfig: NewDefaultTransportConfig(),
|
||||||
|
Timeout: NewInterpolatedDuration(10 * time.Second),
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,4 +32,14 @@ type QueueLayerConfig struct {
|
||||||
|
|
||||||
type AuthnLayerConfig struct {
|
type AuthnLayerConfig struct {
|
||||||
TemplateDir InterpolatedString `yaml:"templateDir"`
|
TemplateDir InterpolatedString `yaml:"templateDir"`
|
||||||
|
OIDC AuthnOIDCLayerConfig `yaml:"oidc"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AuthnOIDCLayerConfig struct {
|
||||||
|
HTTPClient AuthnOIDCHTTPClientConfig `yaml:"httpClient"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AuthnOIDCHTTPClientConfig struct {
|
||||||
|
TransportConfig
|
||||||
|
Timeout *InterpolatedDuration `yaml:"timeout"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import "time"
|
import (
|
||||||
|
"crypto/tls"
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
type ProxyServerConfig struct {
|
type ProxyServerConfig struct {
|
||||||
HTTP HTTPConfig `yaml:"http"`
|
HTTP HTTPConfig `yaml:"http"`
|
||||||
|
@ -25,6 +29,33 @@ type TransportConfig struct {
|
||||||
WriteBufferSize InterpolatedInt `yaml:"writeBufferSize"`
|
WriteBufferSize InterpolatedInt `yaml:"writeBufferSize"`
|
||||||
ReadBufferSize InterpolatedInt `yaml:"readBufferSize"`
|
ReadBufferSize InterpolatedInt `yaml:"readBufferSize"`
|
||||||
MaxResponseHeaderBytes InterpolatedInt `yaml:"maxResponseHeaderBytes"`
|
MaxResponseHeaderBytes InterpolatedInt `yaml:"maxResponseHeaderBytes"`
|
||||||
|
InsecureSkipVerify InterpolatedBool `yaml:"insecureSkipVerify"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c TransportConfig) AsTransport() *http.Transport {
|
||||||
|
httpTransport := http.DefaultTransport.(*http.Transport).Clone()
|
||||||
|
|
||||||
|
httpTransport.Proxy = http.ProxyFromEnvironment
|
||||||
|
httpTransport.ForceAttemptHTTP2 = bool(c.ForceAttemptHTTP2)
|
||||||
|
httpTransport.MaxIdleConns = int(c.MaxIdleConns)
|
||||||
|
httpTransport.MaxIdleConnsPerHost = int(c.MaxIdleConnsPerHost)
|
||||||
|
httpTransport.MaxConnsPerHost = int(c.MaxConnsPerHost)
|
||||||
|
httpTransport.IdleConnTimeout = time.Duration(*c.IdleConnTimeout)
|
||||||
|
httpTransport.TLSHandshakeTimeout = time.Duration(*c.TLSHandshakeTimeout)
|
||||||
|
httpTransport.ExpectContinueTimeout = time.Duration(*c.ExpectContinueTimeout)
|
||||||
|
httpTransport.DisableKeepAlives = bool(c.DisableKeepAlives)
|
||||||
|
httpTransport.DisableCompression = bool(c.DisableCompression)
|
||||||
|
httpTransport.ResponseHeaderTimeout = time.Duration(*c.ResponseHeaderTimeout)
|
||||||
|
httpTransport.WriteBufferSize = int(c.WriteBufferSize)
|
||||||
|
httpTransport.ReadBufferSize = int(c.ReadBufferSize)
|
||||||
|
httpTransport.MaxResponseHeaderBytes = int64(c.MaxResponseHeaderBytes)
|
||||||
|
|
||||||
|
if httpTransport.TLSClientConfig == nil {
|
||||||
|
httpTransport.TLSClientConfig = &tls.Config{}
|
||||||
|
}
|
||||||
|
httpTransport.TLSClientConfig.InsecureSkipVerify = bool(c.InsecureSkipVerify)
|
||||||
|
|
||||||
|
return httpTransport
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDefaultProxyServerConfig() ProxyServerConfig {
|
func NewDefaultProxyServerConfig() ProxyServerConfig {
|
||||||
|
@ -69,5 +100,6 @@ func NewDefaultTransportConfig() TransportConfig {
|
||||||
ReadBufferSize: 4096,
|
ReadBufferSize: 4096,
|
||||||
WriteBufferSize: 4096,
|
WriteBufferSize: 4096,
|
||||||
MaxResponseHeaderBytes: 0,
|
MaxResponseHeaderBytes: 0,
|
||||||
|
InsecureSkipVerify: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
package oidc
|
package oidc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/tls"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"text/template"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"forge.cadoles.com/Cadoles/go-proxy/wildcard"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director"
|
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/authn"
|
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/authn"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
||||||
|
@ -18,6 +23,8 @@ import (
|
||||||
|
|
||||||
type Authenticator struct {
|
type Authenticator struct {
|
||||||
store sessions.Store
|
store sessions.Store
|
||||||
|
httpTransport *http.Transport
|
||||||
|
httpClientTimeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Authenticator) PreAuthentication(w http.ResponseWriter, r *http.Request, layer *store.Layer) error {
|
func (a *Authenticator) PreAuthentication(w http.ResponseWriter, r *http.Request, layer *store.Layer) error {
|
||||||
|
@ -28,7 +35,9 @@ func (a *Authenticator) PreAuthentication(w http.ResponseWriter, r *http.Request
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
options, err := fromStoreOptions(layer.Options)
|
baseURL := originalURL.Scheme + "://" + originalURL.Host
|
||||||
|
|
||||||
|
options, err := fromStoreOptions(layer.Options, baseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -38,16 +47,30 @@ func (a *Authenticator) PreAuthentication(w http.ResponseWriter, r *http.Request
|
||||||
logger.Error(ctx, "could not retrieve session", logger.E(errors.WithStack(err)))
|
logger.Error(ctx, "could not retrieve session", logger.E(errors.WithStack(err)))
|
||||||
}
|
}
|
||||||
|
|
||||||
redirectURL := a.getRedirectURL(layer.Proxy, layer.Name, originalURL, options)
|
loginCallbackURL, err := a.getLoginCallbackURL(layer.Proxy, layer.Name, options)
|
||||||
logoutURL := a.getLogoutURL(layer.Proxy, layer.Name, originalURL, options)
|
|
||||||
|
|
||||||
client, err := a.getClient(options, redirectURL.String())
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch r.URL.Path {
|
client, err := a.getClient(options, loginCallbackURL.String())
|
||||||
case redirectURL.Path:
|
if err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
loginCallbackURLPattern, err := a.templatize(options.OIDC.MatchLoginCallbackURL, layer.Proxy, layer.Name)
|
||||||
|
if err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logoutURLPattern, err := a.templatize(options.OIDC.MatchLogoutURL, layer.Proxy, layer.Name)
|
||||||
|
if err != nil {
|
||||||
|
return errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Debug(ctx, "checking url", logger.F("loginCallbackURLPattern", loginCallbackURLPattern), logger.F("logoutURLPattern", logoutURLPattern))
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case wildcard.Match(originalURL.String(), loginCallbackURLPattern):
|
||||||
if err := client.HandleCallback(w, r, sess); err != nil {
|
if err := client.HandleCallback(w, r, sess); err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -57,7 +80,7 @@ func (a *Authenticator) PreAuthentication(w http.ResponseWriter, r *http.Request
|
||||||
metricLabelProxy: string(layer.Proxy),
|
metricLabelProxy: string(layer.Proxy),
|
||||||
}).Add(1)
|
}).Add(1)
|
||||||
|
|
||||||
case logoutURL.Path:
|
case wildcard.Match(originalURL.String(), logoutURLPattern):
|
||||||
postLogoutRedirectURL := options.OIDC.PostLogoutRedirectURL
|
postLogoutRedirectURL := options.OIDC.PostLogoutRedirectURL
|
||||||
if options.OIDC.PostLogoutRedirectURL == "" {
|
if options.OIDC.PostLogoutRedirectURL == "" {
|
||||||
postLogoutRedirectURL = originalURL.Scheme + "://" + originalURL.Host
|
postLogoutRedirectURL = originalURL.Scheme + "://" + originalURL.Host
|
||||||
|
@ -85,7 +108,9 @@ func (a *Authenticator) Authenticate(w http.ResponseWriter, r *http.Request, lay
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
options, err := fromStoreOptions(layer.Options)
|
baseURL := originalURL.Scheme + "://" + originalURL.Host
|
||||||
|
|
||||||
|
options, err := fromStoreOptions(layer.Options, baseURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -117,9 +142,12 @@ func (a *Authenticator) Authenticate(w http.ResponseWriter, r *http.Request, lay
|
||||||
sess.Options.SameSite = http.SameSiteDefaultMode
|
sess.Options.SameSite = http.SameSiteDefaultMode
|
||||||
}
|
}
|
||||||
|
|
||||||
redirectURL := a.getRedirectURL(layer.Proxy, layer.Name, originalURL, options)
|
loginCallbackURL, err := a.getLoginCallbackURL(layer.Proxy, layer.Name, options)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
client, err := a.getClient(options, redirectURL.String())
|
client, err := a.getClient(options, loginCallbackURL.String())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -138,7 +166,7 @@ func (a *Authenticator) Authenticate(w http.ResponseWriter, r *http.Request, lay
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
user, err := a.toUser(idToken, layer.Proxy, layer.Name, originalURL, options, sess)
|
user, err := a.toUser(idToken, layer.Proxy, layer.Name, options, sess)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -196,7 +224,7 @@ func (c claims) AsAttrs() map[string]any {
|
||||||
return attrs
|
return attrs
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Authenticator) toUser(idToken *oidc.IDToken, proxyName store.ProxyName, layerName store.LayerName, originalURL *url.URL, options *LayerOptions, sess *sessions.Session) (*authn.User, error) {
|
func (a *Authenticator) toUser(idToken *oidc.IDToken, proxyName store.ProxyName, layerName store.LayerName, options *LayerOptions, sess *sessions.Session) (*authn.User, error) {
|
||||||
var claims claims
|
var claims claims
|
||||||
|
|
||||||
if err := idToken.Claims(&claims); err != nil {
|
if err := idToken.Claims(&claims); err != nil {
|
||||||
|
@ -209,7 +237,11 @@ func (a *Authenticator) toUser(idToken *oidc.IDToken, proxyName store.ProxyName,
|
||||||
|
|
||||||
attrs := claims.AsAttrs()
|
attrs := claims.AsAttrs()
|
||||||
|
|
||||||
logoutURL := a.getLogoutURL(proxyName, layerName, originalURL, options)
|
logoutURL, err := a.getLogoutURL(proxyName, layerName, options)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
attrs["logout_url"] = logoutURL.String()
|
attrs["logout_url"] = logoutURL.String()
|
||||||
|
|
||||||
if accessToken, exists := sess.Values[sessionKeyAccessToken]; exists && accessToken != nil {
|
if accessToken, exists := sess.Values[sessionKeyAccessToken]; exists && accessToken != nil {
|
||||||
|
@ -229,25 +261,80 @@ func (a *Authenticator) toUser(idToken *oidc.IDToken, proxyName store.ProxyName,
|
||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Authenticator) getRedirectURL(proxyName store.ProxyName, layerName store.LayerName, u *url.URL, options *LayerOptions) *url.URL {
|
func (a *Authenticator) getLoginCallbackURL(proxyName store.ProxyName, layerName store.LayerName, options *LayerOptions) (*url.URL, error) {
|
||||||
return &url.URL{
|
url, err := a.generateURL(options.OIDC.LoginCallbackURL, proxyName, layerName)
|
||||||
Scheme: u.Scheme,
|
if err != nil {
|
||||||
Host: u.Host,
|
return nil, errors.WithStack(err)
|
||||||
Path: fmt.Sprintf(options.OIDC.LoginCallbackPath, fmt.Sprintf("%s/%s", proxyName, layerName)),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return url, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Authenticator) getLogoutURL(proxyName store.ProxyName, layerName store.LayerName, u *url.URL, options *LayerOptions) *url.URL {
|
func (a *Authenticator) getLogoutURL(proxyName store.ProxyName, layerName store.LayerName, options *LayerOptions) (*url.URL, error) {
|
||||||
return &url.URL{
|
url, err := a.generateURL(options.OIDC.LogoutURL, proxyName, layerName)
|
||||||
Scheme: u.Scheme,
|
if err != nil {
|
||||||
Host: u.Host,
|
return nil, errors.WithStack(err)
|
||||||
Path: fmt.Sprintf(options.OIDC.LogoutPath, fmt.Sprintf("%s/%s", proxyName, layerName)),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return url, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Authenticator) generateURL(rawURLTemplate string, proxyName store.ProxyName, layerName store.LayerName) (*url.URL, error) {
|
||||||
|
rawURL, err := a.templatize(rawURLTemplate, proxyName, layerName)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
url, err := url.Parse(rawURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return url, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *Authenticator) templatize(rawTemplate string, proxyName store.ProxyName, layerName store.LayerName) (string, error) {
|
||||||
|
tmpl, err := template.New("").Parse(rawTemplate)
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var raw bytes.Buffer
|
||||||
|
|
||||||
|
err = tmpl.Execute(&raw, struct {
|
||||||
|
ProxyName store.ProxyName
|
||||||
|
LayerName store.LayerName
|
||||||
|
}{
|
||||||
|
ProxyName: proxyName,
|
||||||
|
LayerName: layerName,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return "", errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return raw.String(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *Authenticator) getClient(options *LayerOptions, redirectURL string) (*Client, error) {
|
func (a *Authenticator) getClient(options *LayerOptions, redirectURL string) (*Client, error) {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
|
transport := a.httpTransport.Clone()
|
||||||
|
|
||||||
|
if options.OIDC.TLSInsecureSkipVerify {
|
||||||
|
if transport.TLSClientConfig == nil {
|
||||||
|
transport.TLSClientConfig = &tls.Config{}
|
||||||
|
}
|
||||||
|
|
||||||
|
transport.TLSClientConfig.InsecureSkipVerify = true
|
||||||
|
}
|
||||||
|
|
||||||
|
httpClient := &http.Client{
|
||||||
|
Timeout: a.httpClientTimeout,
|
||||||
|
Transport: transport,
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx = oidc.ClientContext(ctx, httpClient)
|
||||||
|
|
||||||
if options.OIDC.SkipIssuerVerification {
|
if options.OIDC.SkipIssuerVerification {
|
||||||
ctx = oidc.InsecureIssuerURLContext(ctx, options.OIDC.IssuerURL)
|
ctx = oidc.InsecureIssuerURLContext(ctx, options.OIDC.IssuerURL)
|
||||||
}
|
}
|
||||||
|
@ -263,6 +350,7 @@ func (a *Authenticator) getClient(options *LayerOptions, redirectURL string) (*C
|
||||||
WithRedirectURL(redirectURL),
|
WithRedirectURL(redirectURL),
|
||||||
WithScopes(options.OIDC.Scopes...),
|
WithScopes(options.OIDC.Scopes...),
|
||||||
WithAuthParams(options.OIDC.AuthParams),
|
WithAuthParams(options.OIDC.AuthParams),
|
||||||
|
WithHTTPClient(httpClient),
|
||||||
)
|
)
|
||||||
|
|
||||||
return client, nil
|
return client, nil
|
||||||
|
|
|
@ -30,6 +30,7 @@ var (
|
||||||
)
|
)
|
||||||
|
|
||||||
type Client struct {
|
type Client struct {
|
||||||
|
httpClient *http.Client
|
||||||
oauth2 *oauth2.Config
|
oauth2 *oauth2.Config
|
||||||
provider *oidc.Provider
|
provider *oidc.Provider
|
||||||
verifier *oidc.IDTokenVerifier
|
verifier *oidc.IDTokenVerifier
|
||||||
|
@ -210,6 +211,7 @@ func (c *Client) sessionEndURL(idTokenHint, state, postLogoutRedirectURL string)
|
||||||
|
|
||||||
func (c *Client) validate(r *http.Request, sess *sessions.Session) (*oauth2.Token, *oidc.IDToken, string, error) {
|
func (c *Client) validate(r *http.Request, sess *sessions.Session) (*oauth2.Token, *oidc.IDToken, string, error) {
|
||||||
ctx := r.Context()
|
ctx := r.Context()
|
||||||
|
ctx = oidc.ClientContext(ctx, c.httpClient)
|
||||||
|
|
||||||
rawStoredState := sess.Values[sessionKeyLoginState]
|
rawStoredState := sess.Values[sessionKeyLoginState]
|
||||||
receivedState := r.URL.Query().Get("state")
|
receivedState := r.URL.Query().Get("state")
|
||||||
|
@ -287,5 +289,6 @@ func NewClient(funcs ...ClientOptionFunc) *Client {
|
||||||
provider: opts.Provider,
|
provider: opts.Provider,
|
||||||
verifier: verifier,
|
verifier: verifier,
|
||||||
authParams: opts.AuthParams,
|
authParams: opts.AuthParams,
|
||||||
|
httpClient: opts.HTTPClient,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package oidc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
"github.com/coreos/go-oidc/v3/oidc"
|
"github.com/coreos/go-oidc/v3/oidc"
|
||||||
)
|
)
|
||||||
|
@ -14,6 +15,7 @@ type ClientOptions struct {
|
||||||
Scopes []string
|
Scopes []string
|
||||||
AuthParams map[string]string
|
AuthParams map[string]string
|
||||||
SkipIssuerCheck bool
|
SkipIssuerCheck bool
|
||||||
|
HTTPClient *http.Client
|
||||||
}
|
}
|
||||||
|
|
||||||
type ClientOptionFunc func(*ClientOptions)
|
type ClientOptionFunc func(*ClientOptions)
|
||||||
|
@ -63,9 +65,16 @@ func WithProvider(provider *oidc.Provider) ClientOptionFunc {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithHTTPClient(client *http.Client) ClientOptionFunc {
|
||||||
|
return func(opt *ClientOptions) {
|
||||||
|
opt.HTTPClient = client
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func NewClientOptions(funcs ...ClientOptionFunc) *ClientOptions {
|
func NewClientOptions(funcs ...ClientOptionFunc) *ClientOptions {
|
||||||
opt := &ClientOptions{
|
opt := &ClientOptions{
|
||||||
Scopes: []string{oidc.ScopeOpenID, "profile"},
|
Scopes: []string{oidc.ScopeOpenID, "profile"},
|
||||||
|
HTTPClient: http.DefaultClient,
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, f := range funcs {
|
for _, f := range funcs {
|
||||||
|
|
|
@ -42,22 +42,39 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"loginCallbackPath": {
|
"loginCallbackURL": {
|
||||||
"title": "Chemin associé à l'URL de callback OpenID Connect",
|
"title": "Chemin associé à l'URL de callback OpenID Connect",
|
||||||
"default": "/.bouncer/authn/oidc/%s/callback",
|
"default": "<scheme>://<host>/.bouncer/authn/oidc/{{ .ProxyName }}/{{ .LayerName }}/callback",
|
||||||
"description": "Le marqueur '%s' peut être utilisé pour injecter l'espace de nom '<proxy>/<layer>'.",
|
"description": "Les marqueurs '{{ .ProxyName }}' et '{{ .LayerName }}' peuvent être utilisés pour injecter le nom du proxy ainsi que celui du layer.",
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"logoutPath": {
|
"matchLoginCallbackURL": {
|
||||||
|
"title": "Patron de correspondance de l'URL interne de callback OpenID Connect",
|
||||||
|
"default": "*/.bouncer/authn/oidc/{{ .ProxyName }}/{{ .LayerName }}/callback",
|
||||||
|
"description": "Les marqueurs '{{ .ProxyName }}' et '{{ .LayerName }}' peuvent être utilisés pour injecter le nom du proxy ainsi que celui du layer.",
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"logoutURL": {
|
||||||
"title": "Chemin associé à l'URL de déconnexion",
|
"title": "Chemin associé à l'URL de déconnexion",
|
||||||
"default": "/.bouncer/authn/oidc/%s/logout",
|
"default": "<scheme>://<host>/.bouncer/authn/oidc/{{ .ProxyName }}/{{ .LayerName }}/logout",
|
||||||
"description": "Le marqueur '%s' peut être utilisé pour injecter l'espace de nom '<proxy>/<layer>'.",
|
"description": "Les marqueurs '{{ .ProxyName }}' et '{{ .LayerName }}' peuvent être utilisés pour injecter le nom du proxy ainsi que celui du layer.",
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"matchLogoutURL": {
|
||||||
|
"title": "Patron de correspondance l'URL interne de déconnexion",
|
||||||
|
"default": "*/.bouncer/authn/oidc/{{ .ProxyName }}/{{ .LayerName }}/logout",
|
||||||
|
"description": "Les marqueurs '{{ .ProxyName }}' et '{{ .LayerName }}' peuvent être utilisés pour injecter le nom du proxy ainsi que celui du layer.",
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"skipIssuerVerification": {
|
"skipIssuerVerification": {
|
||||||
"title": "Activer/désactiver la vérification de concordance de l'identifiant du fournisseur d'identité",
|
"title": "Activer/désactiver la vérification de concordance de l'identifiant du fournisseur d'identité",
|
||||||
"default": false,
|
"default": false,
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"tlsInsecureSkipVerify": {
|
||||||
|
"title": "Activer/désactiver la vérification du certificat TLS distant",
|
||||||
|
"default": false,
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
|
|
@ -8,6 +8,11 @@ import (
|
||||||
|
|
||||||
const LayerType store.LayerType = "authn-oidc"
|
const LayerType store.LayerType = "authn-oidc"
|
||||||
|
|
||||||
func NewLayer(store sessions.Store) *authn.Layer {
|
func NewLayer(store sessions.Store, funcs ...OptionFunc) *authn.Layer {
|
||||||
return authn.NewLayer(LayerType, &Authenticator{store: store})
|
opts := NewOptions(funcs...)
|
||||||
|
return authn.NewLayer(LayerType, &Authenticator{
|
||||||
|
httpTransport: opts.HTTPTransport,
|
||||||
|
httpClientTimeout: opts.HTTPClientTimeout,
|
||||||
|
store: store,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,11 +19,14 @@ type LayerOptions struct {
|
||||||
type OIDCOptions struct {
|
type OIDCOptions struct {
|
||||||
ClientID string `mapstructure:"clientId"`
|
ClientID string `mapstructure:"clientId"`
|
||||||
ClientSecret string `mapstructure:"clientSecret"`
|
ClientSecret string `mapstructure:"clientSecret"`
|
||||||
LoginCallbackPath string `mapstructure:"loginCallbackPath"`
|
LoginCallbackURL string `mapstructure:"loginCallbackURL"`
|
||||||
LogoutPath string `mapstructure:"logoutPath"`
|
MatchLoginCallbackURL string `mapstructure:"matchLoginCallbackURL"`
|
||||||
|
LogoutURL string `mapstructure:"logoutURL"`
|
||||||
|
MatchLogoutURL string `mapstructure:"matchLogoutURL"`
|
||||||
IssuerURL string `mapstructure:"issuerURL"`
|
IssuerURL string `mapstructure:"issuerURL"`
|
||||||
SkipIssuerVerification bool `mapstructure:"skipIssuerVerification"`
|
SkipIssuerVerification bool `mapstructure:"skipIssuerVerification"`
|
||||||
PostLogoutRedirectURL string `mapstructure:"postLogoutRedirectURL"`
|
PostLogoutRedirectURL string `mapstructure:"postLogoutRedirectURL"`
|
||||||
|
TLSInsecureSkipVerify bool `mapstructure:"tlsInsecureSkipVerify"`
|
||||||
Scopes []string `mapstructure:"scopes"`
|
Scopes []string `mapstructure:"scopes"`
|
||||||
AuthParams map[string]string `mapstructure:"authParams"`
|
AuthParams map[string]string `mapstructure:"authParams"`
|
||||||
}
|
}
|
||||||
|
@ -38,12 +41,17 @@ type CookieOptions struct {
|
||||||
MaxAge time.Duration `mapstructure:"maxAge"`
|
MaxAge time.Duration `mapstructure:"maxAge"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func fromStoreOptions(storeOptions store.LayerOptions) (*LayerOptions, error) {
|
func fromStoreOptions(storeOptions store.LayerOptions, baseURL string) (*LayerOptions, error) {
|
||||||
|
loginCallbackPath := "/.bouncer/authn/oidc/{{ .ProxyName }}/{{ .LayerName }}/callback"
|
||||||
|
logoutPath := "/.bouncer/authn/oidc/{{ .ProxyName }}/{{ .LayerName }}/logout"
|
||||||
|
|
||||||
layerOptions := LayerOptions{
|
layerOptions := LayerOptions{
|
||||||
LayerOptions: authn.DefaultLayerOptions(),
|
LayerOptions: authn.DefaultLayerOptions(),
|
||||||
OIDC: OIDCOptions{
|
OIDC: OIDCOptions{
|
||||||
LoginCallbackPath: "/.bouncer/authn/oidc/%s/callback",
|
LoginCallbackURL: baseURL + loginCallbackPath,
|
||||||
LogoutPath: "/.bouncer/authn/oidc/%s/logout",
|
MatchLoginCallbackURL: "*" + loginCallbackPath,
|
||||||
|
LogoutURL: baseURL + logoutPath,
|
||||||
|
MatchLogoutURL: "*" + logoutPath,
|
||||||
Scopes: []string{"openid"},
|
Scopes: []string{"openid"},
|
||||||
},
|
},
|
||||||
Cookie: CookieOptions{
|
Cookie: CookieOptions{
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
package oidc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Options struct {
|
||||||
|
HTTPTransport *http.Transport
|
||||||
|
HTTPClientTimeout time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
type OptionFunc func(opts *Options)
|
||||||
|
|
||||||
|
func WithHTTPTransport(transport *http.Transport) OptionFunc {
|
||||||
|
return func(opts *Options) {
|
||||||
|
opts.HTTPTransport = transport
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func WithHTTPClientTimeout(timeout time.Duration) OptionFunc {
|
||||||
|
return func(opts *Options) {
|
||||||
|
opts.HTTPClientTimeout = timeout
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewOptions(funcs ...OptionFunc) *Options {
|
||||||
|
opts := &Options{
|
||||||
|
HTTPTransport: http.DefaultTransport.(*http.Transport),
|
||||||
|
HTTPClientTimeout: 30 * time.Second,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, fn := range funcs {
|
||||||
|
fn(opts)
|
||||||
|
}
|
||||||
|
|
||||||
|
return opts
|
||||||
|
}
|
|
@ -159,26 +159,10 @@ func (s *Server) createReverseProxy(ctx context.Context, target *url.URL) *httpu
|
||||||
DualStack: bool(dialConfig.DualStack),
|
DualStack: bool(dialConfig.DualStack),
|
||||||
}
|
}
|
||||||
|
|
||||||
transportConfig := s.serverConfig.Transport
|
httpTransport := s.serverConfig.Transport.AsTransport()
|
||||||
|
httpTransport.DialContext = dialer.DialContext
|
||||||
reverseProxy.Transport = &http.Transport{
|
|
||||||
Proxy: http.ProxyFromEnvironment,
|
|
||||||
DialContext: dialer.DialContext,
|
|
||||||
ForceAttemptHTTP2: bool(transportConfig.ForceAttemptHTTP2),
|
|
||||||
MaxIdleConns: int(transportConfig.MaxIdleConns),
|
|
||||||
MaxIdleConnsPerHost: int(transportConfig.MaxIdleConnsPerHost),
|
|
||||||
MaxConnsPerHost: int(transportConfig.MaxConnsPerHost),
|
|
||||||
IdleConnTimeout: time.Duration(*transportConfig.IdleConnTimeout),
|
|
||||||
TLSHandshakeTimeout: time.Duration(*transportConfig.TLSHandshakeTimeout),
|
|
||||||
ExpectContinueTimeout: time.Duration(*transportConfig.ExpectContinueTimeout),
|
|
||||||
DisableKeepAlives: bool(transportConfig.DisableKeepAlives),
|
|
||||||
DisableCompression: bool(transportConfig.DisableCompression),
|
|
||||||
ResponseHeaderTimeout: time.Duration(*transportConfig.ResponseHeaderTimeout),
|
|
||||||
WriteBufferSize: int(transportConfig.WriteBufferSize),
|
|
||||||
ReadBufferSize: int(transportConfig.ReadBufferSize),
|
|
||||||
MaxResponseHeaderBytes: int64(transportConfig.MaxResponseHeaderBytes),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
reverseProxy.Transport = httpTransport
|
||||||
reverseProxy.ErrorHandler = s.errorHandler
|
reverseProxy.ErrorHandler = s.errorHandler
|
||||||
|
|
||||||
return reverseProxy
|
return reverseProxy
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
package setup
|
package setup
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/config"
|
"forge.cadoles.com/cadoles/bouncer/internal/config"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director"
|
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/authn"
|
"forge.cadoles.com/cadoles/bouncer/internal/proxy/director/layer/authn"
|
||||||
|
@ -25,5 +27,11 @@ func setupAuthnOIDCLayer(conf *config.Config) (director.Layer, error) {
|
||||||
adapter := redis.NewStoreAdapter(rdb)
|
adapter := redis.NewStoreAdapter(rdb)
|
||||||
store := session.NewStore(adapter)
|
store := session.NewStore(adapter)
|
||||||
|
|
||||||
return oidc.NewLayer(store), nil
|
transport := conf.Layers.Authn.OIDC.HTTPClient.AsTransport()
|
||||||
|
|
||||||
|
return oidc.NewLayer(
|
||||||
|
store,
|
||||||
|
oidc.WithHTTPTransport(transport),
|
||||||
|
oidc.WithHTTPClientTimeout(time.Duration(*conf.Layers.Authn.OIDC.HTTPClient.Timeout)),
|
||||||
|
), nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue