Compare commits
6 Commits
v2025.3.7-
...
v2025.3.18
Author | SHA1 | Date | |
---|---|---|---|
cc5cdcea96 | |||
1af7248a6f | |||
8b132dddd4 | |||
6a4a144c97 | |||
ac7b7e8189 | |||
2df74bad4f |
1
internal/cache/cache.go
vendored
1
internal/cache/cache.go
vendored
@ -3,4 +3,5 @@ package cache
|
|||||||
type Cache[K comparable, V any] interface {
|
type Cache[K comparable, V any] interface {
|
||||||
Get(key K) (V, bool)
|
Get(key K) (V, bool)
|
||||||
Set(key K, value V)
|
Set(key K, value V)
|
||||||
|
Clear()
|
||||||
}
|
}
|
||||||
|
4
internal/cache/memory/cache.go
vendored
4
internal/cache/memory/cache.go
vendored
@ -25,6 +25,10 @@ func (c *Cache[K, V]) Set(key K, value V) {
|
|||||||
c.store.Store(key, value)
|
c.store.Store(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Cache[K, V]) Clear() {
|
||||||
|
c.store.Clear()
|
||||||
|
}
|
||||||
|
|
||||||
func NewCache[K comparable, V any]() *Cache[K, V] {
|
func NewCache[K comparable, V any]() *Cache[K, V] {
|
||||||
return &Cache[K, V]{
|
return &Cache[K, V]{
|
||||||
store: new(sync.Map),
|
store: new(sync.Map),
|
||||||
|
5
internal/cache/ttl/cache.go
vendored
5
internal/cache/ttl/cache.go
vendored
@ -28,6 +28,11 @@ func (c *Cache[K, V]) Set(key K, value V) {
|
|||||||
c.values.Set(key, value)
|
c.values.Set(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Cache[K, V]) Clear() {
|
||||||
|
c.timestamps.Clear()
|
||||||
|
c.values.Clear()
|
||||||
|
}
|
||||||
|
|
||||||
func NewCache[K comparable, V any](values cache.Cache[K, V], timestamps cache.Cache[K, time.Time], ttl time.Duration) *Cache[K, V] {
|
func NewCache[K comparable, V any](values cache.Cache[K, V], timestamps cache.Cache[K, time.Time], ttl time.Duration) *Cache[K, V] {
|
||||||
return &Cache[K, V]{
|
return &Cache[K, V]{
|
||||||
values: values,
|
values: values,
|
||||||
|
@ -32,6 +32,8 @@ func RunCommand() *cli.Command {
|
|||||||
logger.SetFormat(logger.Format(conf.Logger.Format))
|
logger.SetFormat(logger.Format(conf.Logger.Format))
|
||||||
logger.SetLevel(logger.Level(conf.Logger.Level))
|
logger.SetLevel(logger.Level(conf.Logger.Level))
|
||||||
|
|
||||||
|
logger.Debug(ctx.Context, "using config", logger.F("config", conf))
|
||||||
|
|
||||||
projectVersion := ctx.String("projectVersion")
|
projectVersion := ctx.String("projectVersion")
|
||||||
|
|
||||||
if conf.Proxy.Sentry.DSN != "" {
|
if conf.Proxy.Sentry.DSN != "" {
|
||||||
|
@ -29,6 +29,8 @@ func RunCommand() *cli.Command {
|
|||||||
logger.SetFormat(logger.Format(conf.Logger.Format))
|
logger.SetFormat(logger.Format(conf.Logger.Format))
|
||||||
logger.SetLevel(logger.Level(conf.Logger.Level))
|
logger.SetLevel(logger.Level(conf.Logger.Level))
|
||||||
|
|
||||||
|
logger.Debug(ctx.Context, "using config", logger.F("config", conf))
|
||||||
|
|
||||||
projectVersion := ctx.String("projectVersion")
|
projectVersion := ctx.String("projectVersion")
|
||||||
|
|
||||||
if conf.Proxy.Sentry.DSN != "" {
|
if conf.Proxy.Sentry.DSN != "" {
|
||||||
@ -49,7 +51,7 @@ func RunCommand() *cli.Command {
|
|||||||
proxy.WithServerConfig(conf.Proxy),
|
proxy.WithServerConfig(conf.Proxy),
|
||||||
proxy.WithRedisConfig(conf.Redis),
|
proxy.WithRedisConfig(conf.Redis),
|
||||||
proxy.WithDirectorLayers(layers...),
|
proxy.WithDirectorLayers(layers...),
|
||||||
proxy.WithDirectorCacheTTL(time.Duration(conf.Proxy.Cache.TTL)),
|
proxy.WithDirectorCacheTTL(time.Duration(*conf.Proxy.Cache.TTL)),
|
||||||
)
|
)
|
||||||
|
|
||||||
addrs, srvErrs := srv.Start(ctx.Context)
|
addrs, srvErrs := srv.Start(ctx.Context)
|
||||||
|
@ -19,7 +19,7 @@ func (is *InterpolatedString) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
str, err := envsubst.EvalEnv(str)
|
str, err := envsubst.Eval(str, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -38,7 +38,7 @@ func (ii *InterpolatedInt) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
||||||
}
|
}
|
||||||
|
|
||||||
str, err := envsubst.EvalEnv(str)
|
str, err := envsubst.Eval(str, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -62,7 +62,7 @@ func (ifl *InterpolatedFloat) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
||||||
}
|
}
|
||||||
|
|
||||||
str, err := envsubst.EvalEnv(str)
|
str, err := envsubst.Eval(str, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -86,7 +86,7 @@ func (ib *InterpolatedBool) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
||||||
}
|
}
|
||||||
|
|
||||||
str, err := envsubst.EvalEnv(str)
|
str, err := envsubst.Eval(str, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -101,9 +101,10 @@ func (ib *InterpolatedBool) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var getEnv = os.Getenv
|
||||||
|
|
||||||
type InterpolatedMap struct {
|
type InterpolatedMap struct {
|
||||||
Data map[string]any
|
Data map[string]any
|
||||||
getEnv func(string) string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (im *InterpolatedMap) UnmarshalYAML(value *yaml.Node) error {
|
func (im *InterpolatedMap) UnmarshalYAML(value *yaml.Node) error {
|
||||||
@ -113,10 +114,6 @@ func (im *InterpolatedMap) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into map", value.Value, value.Line)
|
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into map", value.Value, value.Line)
|
||||||
}
|
}
|
||||||
|
|
||||||
if im.getEnv == nil {
|
|
||||||
im.getEnv = os.Getenv
|
|
||||||
}
|
|
||||||
|
|
||||||
interpolated, err := im.interpolateRecursive(data)
|
interpolated, err := im.interpolateRecursive(data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
@ -140,7 +137,7 @@ func (im InterpolatedMap) interpolateRecursive(data any) (any, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case string:
|
case string:
|
||||||
value, err := envsubst.Eval(typ, im.getEnv)
|
value, err := envsubst.Eval(typ, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -171,7 +168,7 @@ func (iss *InterpolatedStringSlice) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for index, value := range data {
|
for index, value := range data {
|
||||||
value, err := envsubst.EvalEnv(value)
|
value, err := envsubst.Eval(value, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
@ -193,7 +190,7 @@ func (id *InterpolatedDuration) UnmarshalYAML(value *yaml.Node) error {
|
|||||||
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
return errors.Wrapf(err, "could not decode value '%v' (line '%d') into string", value.Value, value.Line)
|
||||||
}
|
}
|
||||||
|
|
||||||
str, err := envsubst.EvalEnv(str)
|
str, err := envsubst.Eval(str, getEnv)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.WithStack(err)
|
return errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
@ -65,7 +66,7 @@ func TestInterpolatedMap(t *testing.T) {
|
|||||||
var interpolatedMap InterpolatedMap
|
var interpolatedMap InterpolatedMap
|
||||||
|
|
||||||
if tc.Env != nil {
|
if tc.Env != nil {
|
||||||
interpolatedMap.getEnv = func(key string) string {
|
getEnv = func(key string) string {
|
||||||
return tc.Env[key]
|
return tc.Env[key]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -80,3 +81,54 @@ func TestInterpolatedMap(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestInterpolatedDuration(t *testing.T) {
|
||||||
|
type testCase struct {
|
||||||
|
Path string
|
||||||
|
Env map[string]string
|
||||||
|
Assert func(t *testing.T, parsed *InterpolatedDuration)
|
||||||
|
}
|
||||||
|
|
||||||
|
testCases := []testCase{
|
||||||
|
{
|
||||||
|
Path: "testdata/environment/interpolated-duration.yml",
|
||||||
|
Env: map[string]string{
|
||||||
|
"MY_DURATION": "30s",
|
||||||
|
},
|
||||||
|
Assert: func(t *testing.T, parsed *InterpolatedDuration) {
|
||||||
|
if e, g := 30*time.Second, parsed; e != time.Duration(*g) {
|
||||||
|
t.Errorf("parsed: expected '%v', got '%v'", e, g)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for idx, tc := range testCases {
|
||||||
|
t.Run(fmt.Sprintf("Case #%d", idx), func(t *testing.T) {
|
||||||
|
data, err := os.ReadFile(tc.Path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("%+v", errors.WithStack(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
if tc.Env != nil {
|
||||||
|
getEnv = func(key string) string {
|
||||||
|
return tc.Env[key]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config := struct {
|
||||||
|
Duration *InterpolatedDuration `yaml:"duration"`
|
||||||
|
}{
|
||||||
|
Duration: NewInterpolatedDuration(-1),
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := yaml.Unmarshal(data, &config); err != nil {
|
||||||
|
t.Fatalf("%+v", errors.WithStack(err))
|
||||||
|
}
|
||||||
|
|
||||||
|
if tc.Assert != nil {
|
||||||
|
tc.Assert(t, config.Duration)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -20,6 +20,7 @@ func NewDefaultLayersConfig() LayersConfig {
|
|||||||
TransportConfig: NewDefaultTransportConfig(),
|
TransportConfig: NewDefaultTransportConfig(),
|
||||||
Timeout: NewInterpolatedDuration(10 * time.Second),
|
Timeout: NewInterpolatedDuration(10 * time.Second),
|
||||||
},
|
},
|
||||||
|
ProviderCacheTimeout: NewInterpolatedDuration(time.Hour),
|
||||||
},
|
},
|
||||||
Sessions: AuthnLayerSessionConfig{
|
Sessions: AuthnLayerSessionConfig{
|
||||||
TTL: NewInterpolatedDuration(time.Hour),
|
TTL: NewInterpolatedDuration(time.Hour),
|
||||||
@ -45,7 +46,8 @@ type AuthnLayerSessionConfig struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AuthnOIDCLayerConfig struct {
|
type AuthnOIDCLayerConfig struct {
|
||||||
HTTPClient AuthnOIDCHTTPClientConfig `yaml:"httpClient"`
|
HTTPClient AuthnOIDCHTTPClientConfig `yaml:"httpClient"`
|
||||||
|
ProviderCacheTimeout *InterpolatedDuration `yaml:"providerCacheTimeout"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type AuthnOIDCHTTPClientConfig struct {
|
type AuthnOIDCHTTPClientConfig struct {
|
||||||
|
@ -113,12 +113,12 @@ func NewDefaultDialConfig() DialConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type CacheConfig struct {
|
type CacheConfig struct {
|
||||||
TTL InterpolatedDuration `yaml:"ttl"`
|
TTL *InterpolatedDuration `yaml:"ttl"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDefaultCacheConfig() CacheConfig {
|
func NewDefaultCacheConfig() CacheConfig {
|
||||||
return CacheConfig{
|
return CacheConfig{
|
||||||
TTL: *NewInterpolatedDuration(time.Second * 30),
|
TTL: NewInterpolatedDuration(time.Second * 30),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
1
internal/config/testdata/environment/interpolated-duration.yml
vendored
Normal file
1
internal/config/testdata/environment/interpolated-duration.yml
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
duration: ${MY_DURATION}
|
@ -6,6 +6,7 @@ import (
|
|||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
||||||
|
"github.com/getsentry/sentry-go"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"gitlab.com/wpetit/goweb/logger"
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
)
|
)
|
||||||
@ -17,6 +18,7 @@ const (
|
|||||||
contextKeyLayers contextKey = "layers"
|
contextKeyLayers contextKey = "layers"
|
||||||
contextKeyOriginalURL contextKey = "originalURL"
|
contextKeyOriginalURL contextKey = "originalURL"
|
||||||
contextKeyHandleError contextKey = "handleError"
|
contextKeyHandleError contextKey = "handleError"
|
||||||
|
contextKeySentryScope contextKey = "sentryScope"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -82,3 +84,16 @@ func HandleError(ctx context.Context, w http.ResponseWriter, r *http.Request, st
|
|||||||
|
|
||||||
fn(w, r, status, err)
|
fn(w, r, status, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func withSentryScope(ctx context.Context, scope *sentry.Scope) context.Context {
|
||||||
|
return context.WithValue(ctx, contextKeySentryScope, scope)
|
||||||
|
}
|
||||||
|
|
||||||
|
func SentryScope(ctx context.Context) (*sentry.Scope, error) {
|
||||||
|
scope, err := ctxValue[*sentry.Scope](ctx, contextKeySentryScope)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return scope, nil
|
||||||
|
}
|
||||||
|
@ -9,6 +9,7 @@ import (
|
|||||||
"forge.cadoles.com/Cadoles/go-proxy/wildcard"
|
"forge.cadoles.com/Cadoles/go-proxy/wildcard"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/cache"
|
"forge.cadoles.com/cadoles/bouncer/internal/cache"
|
||||||
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
"forge.cadoles.com/cadoles/bouncer/internal/store"
|
||||||
|
"github.com/getsentry/sentry-go"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
"gitlab.com/wpetit/goweb/logger"
|
"gitlab.com/wpetit/goweb/logger"
|
||||||
@ -76,6 +77,13 @@ func (d *Director) rewriteRequest(r *http.Request) (*http.Request, error) {
|
|||||||
proxyCtx = withLayers(proxyCtx, layers)
|
proxyCtx = withLayers(proxyCtx, layers)
|
||||||
r = r.WithContext(proxyCtx)
|
r = r.WithContext(proxyCtx)
|
||||||
|
|
||||||
|
if sentryScope, _ := SentryScope(ctx); sentryScope != nil {
|
||||||
|
sentryScope.SetContext("bouncer", sentry.Context{
|
||||||
|
"proxy_name": p.Name,
|
||||||
|
"proxy_target": r.URL.String(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
return r, nil
|
return r, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -91,9 +99,12 @@ const proxiesCacheKey = "proxies"
|
|||||||
func (d *Director) getProxies(ctx context.Context) ([]*store.Proxy, error) {
|
func (d *Director) getProxies(ctx context.Context) ([]*store.Proxy, error) {
|
||||||
proxies, exists := d.proxyCache.Get(proxiesCacheKey)
|
proxies, exists := d.proxyCache.Get(proxiesCacheKey)
|
||||||
if exists {
|
if exists {
|
||||||
|
logger.Debug(ctx, "using cached proxies")
|
||||||
return proxies, nil
|
return proxies, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.Debug(ctx, "querying fresh proxies")
|
||||||
|
|
||||||
headers, err := d.proxyRepository.QueryProxy(ctx, store.WithProxyQueryEnabled(true))
|
headers, err := d.proxyRepository.QueryProxy(ctx, store.WithProxyQueryEnabled(true))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
@ -126,9 +137,12 @@ func (d *Director) getLayers(ctx context.Context, proxyName store.ProxyName) ([]
|
|||||||
|
|
||||||
layers, exists := d.layerCache.Get(cacheKey)
|
layers, exists := d.layerCache.Get(cacheKey)
|
||||||
if exists {
|
if exists {
|
||||||
|
logger.Debug(ctx, "using cached layers")
|
||||||
return layers, nil
|
return layers, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.Debug(ctx, "querying fresh layers")
|
||||||
|
|
||||||
headers, err := d.layerRepository.QueryLayers(ctx, proxyName, store.WithLayerQueryEnabled(true))
|
headers, err := d.layerRepository.QueryLayers(ctx, proxyName, store.WithLayerQueryEnabled(true))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
@ -216,40 +230,43 @@ func (d *Director) ResponseTransformer() proxy.ResponseTransformer {
|
|||||||
func (d *Director) Middleware() proxy.Middleware {
|
func (d *Director) Middleware() proxy.Middleware {
|
||||||
return func(next http.Handler) http.Handler {
|
return func(next http.Handler) http.Handler {
|
||||||
fn := func(w http.ResponseWriter, r *http.Request) {
|
fn := func(w http.ResponseWriter, r *http.Request) {
|
||||||
ctx := withHandleError(r.Context(), d.handleError)
|
sentry.ConfigureScope(func(scope *sentry.Scope) {
|
||||||
r = r.WithContext(ctx)
|
ctx := withHandleError(r.Context(), d.handleError)
|
||||||
|
ctx = withSentryScope(ctx, scope)
|
||||||
|
r = r.WithContext(ctx)
|
||||||
|
|
||||||
r, err := d.rewriteRequest(r)
|
r, err := d.rewriteRequest(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
HandleError(ctx, w, r, http.StatusInternalServerError, errors.Wrap(err, "could not rewrite request"))
|
HandleError(ctx, w, r, http.StatusInternalServerError, errors.Wrap(err, "could not rewrite request"))
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx = r.Context()
|
|
||||||
|
|
||||||
layers, err := ctxLayers(ctx)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, errContextKeyNotFound) {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
HandleError(ctx, w, r, http.StatusInternalServerError, errors.Wrap(err, "could not retrieve proxy and layers from context"))
|
ctx = r.Context()
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
httpMiddlewares := make([]proxy.Middleware, 0)
|
layers, err := ctxLayers(ctx)
|
||||||
for _, layer := range layers {
|
if err != nil {
|
||||||
middleware, ok := d.layerRegistry.GetMiddleware(layer.Type)
|
if errors.Is(err, errContextKeyNotFound) {
|
||||||
if !ok {
|
return
|
||||||
continue
|
}
|
||||||
|
|
||||||
|
HandleError(ctx, w, r, http.StatusInternalServerError, errors.Wrap(err, "could not retrieve proxy and layers from context"))
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
httpMiddlewares = append(httpMiddlewares, middleware.Middleware(layer))
|
httpMiddlewares := make([]proxy.Middleware, 0)
|
||||||
}
|
for _, layer := range layers {
|
||||||
|
middleware, ok := d.layerRegistry.GetMiddleware(layer.Type)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
handler := createMiddlewareChain(next, httpMiddlewares)
|
httpMiddlewares = append(httpMiddlewares, middleware.Middleware(layer))
|
||||||
|
}
|
||||||
|
|
||||||
handler.ServeHTTP(w, r)
|
handler := createMiddlewareChain(next, httpMiddlewares)
|
||||||
|
|
||||||
|
handler.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
return http.HandlerFunc(fn)
|
return http.HandlerFunc(fn)
|
||||||
|
@ -13,6 +13,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"forge.cadoles.com/Cadoles/go-proxy/wildcard"
|
"forge.cadoles.com/Cadoles/go-proxy/wildcard"
|
||||||
|
"forge.cadoles.com/cadoles/bouncer/internal/cache"
|
||||||
"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"
|
||||||
@ -27,6 +28,7 @@ type Authenticator struct {
|
|||||||
store sessions.Store
|
store sessions.Store
|
||||||
httpTransport *http.Transport
|
httpTransport *http.Transport
|
||||||
httpClientTimeout time.Duration
|
httpClientTimeout time.Duration
|
||||||
|
oidcProviderCache cache.Cache[string, *oidc.Provider]
|
||||||
}
|
}
|
||||||
|
|
||||||
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 {
|
||||||
@ -378,15 +380,23 @@ func (a *Authenticator) getClient(options *LayerOptions, redirectURL string) (*C
|
|||||||
Transport: transport,
|
Transport: transport,
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx = oidc.ClientContext(ctx, httpClient)
|
provider, exists := a.oidcProviderCache.Get(options.OIDC.IssuerURL)
|
||||||
|
if !exists {
|
||||||
|
var err error
|
||||||
|
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)
|
||||||
}
|
}
|
||||||
|
|
||||||
provider, err := oidc.NewProvider(ctx, options.OIDC.IssuerURL)
|
logger.Debug(ctx, "refreshing oidc provider", logger.F("issuerURL", options.OIDC.IssuerURL))
|
||||||
if err != nil {
|
|
||||||
return nil, errors.Wrap(err, "could not create oidc provider")
|
provider, err = oidc.NewProvider(ctx, options.OIDC.IssuerURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errors.Wrap(err, "could not create oidc provider")
|
||||||
|
}
|
||||||
|
|
||||||
|
a.oidcProviderCache.Set(options.OIDC.IssuerURL, provider)
|
||||||
}
|
}
|
||||||
|
|
||||||
client := NewClient(
|
client := NewClient(
|
||||||
|
@ -1,8 +1,13 @@
|
|||||||
package oidc
|
package oidc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"forge.cadoles.com/cadoles/bouncer/internal/cache/memory"
|
||||||
|
"forge.cadoles.com/cadoles/bouncer/internal/cache/ttl"
|
||||||
"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"
|
||||||
|
"github.com/coreos/go-oidc/v3/oidc"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -14,5 +19,10 @@ func NewLayer(store sessions.Store, funcs ...OptionFunc) *authn.Layer {
|
|||||||
httpTransport: opts.HTTPTransport,
|
httpTransport: opts.HTTPTransport,
|
||||||
httpClientTimeout: opts.HTTPClientTimeout,
|
httpClientTimeout: opts.HTTPClientTimeout,
|
||||||
store: store,
|
store: store,
|
||||||
|
oidcProviderCache: ttl.NewCache(
|
||||||
|
memory.NewCache[string, *oidc.Provider](),
|
||||||
|
memory.NewCache[string, time.Time](),
|
||||||
|
opts.OIDCProviderCacheTimeout,
|
||||||
|
),
|
||||||
}, opts.AuthnOptions...)
|
}, opts.AuthnOptions...)
|
||||||
}
|
}
|
||||||
|
@ -8,9 +8,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Options struct {
|
type Options struct {
|
||||||
HTTPTransport *http.Transport
|
HTTPTransport *http.Transport
|
||||||
HTTPClientTimeout time.Duration
|
HTTPClientTimeout time.Duration
|
||||||
AuthnOptions []authn.OptionFunc
|
AuthnOptions []authn.OptionFunc
|
||||||
|
OIDCProviderCacheTimeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
type OptionFunc func(opts *Options)
|
type OptionFunc func(opts *Options)
|
||||||
@ -33,11 +34,18 @@ func WithAuthnOptions(funcs ...authn.OptionFunc) OptionFunc {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func WithOIDCProviderCacheTimeout(timeout time.Duration) OptionFunc {
|
||||||
|
return func(opts *Options) {
|
||||||
|
opts.OIDCProviderCacheTimeout = timeout
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func NewOptions(funcs ...OptionFunc) *Options {
|
func NewOptions(funcs ...OptionFunc) *Options {
|
||||||
opts := &Options{
|
opts := &Options{
|
||||||
HTTPTransport: http.DefaultTransport.(*http.Transport),
|
HTTPTransport: http.DefaultTransport.(*http.Transport),
|
||||||
HTTPClientTimeout: 30 * time.Second,
|
HTTPClientTimeout: 30 * time.Second,
|
||||||
AuthnOptions: make([]authn.OptionFunc, 0),
|
AuthnOptions: make([]authn.OptionFunc, 0),
|
||||||
|
OIDCProviderCacheTimeout: time.Hour,
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, fn := range funcs {
|
for _, fn := range funcs {
|
||||||
|
@ -13,8 +13,11 @@ import (
|
|||||||
"net/http/httputil"
|
"net/http/httputil"
|
||||||
"net/http/pprof"
|
"net/http/pprof"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"forge.cadoles.com/Cadoles/go-proxy"
|
"forge.cadoles.com/Cadoles/go-proxy"
|
||||||
@ -94,24 +97,15 @@ func (s *Server) run(parentCtx context.Context, addrs chan net.Addr, errs chan e
|
|||||||
|
|
||||||
logger.Info(ctx, "http server listening")
|
logger.Info(ctx, "http server listening")
|
||||||
|
|
||||||
|
layerCache, proxyCache, cancel := s.createDirectorCaches(ctx)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
director := director.New(
|
director := director.New(
|
||||||
s.proxyRepository,
|
s.proxyRepository,
|
||||||
s.layerRepository,
|
s.layerRepository,
|
||||||
director.WithLayers(s.directorLayers...),
|
director.WithLayers(s.directorLayers...),
|
||||||
director.WithLayerCache(
|
director.WithLayerCache(layerCache),
|
||||||
ttl.NewCache(
|
director.WithProxyCache(proxyCache),
|
||||||
memory.NewCache[string, []*store.Layer](),
|
|
||||||
memory.NewCache[string, time.Time](),
|
|
||||||
s.directorCacheTTL,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
director.WithProxyCache(
|
|
||||||
ttl.NewCache(
|
|
||||||
memory.NewCache[string, []*store.Proxy](),
|
|
||||||
memory.NewCache[string, time.Time](),
|
|
||||||
s.directorCacheTTL,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
director.WithHandleErrorFunc(s.handleError),
|
director.WithHandleErrorFunc(s.handleError),
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -205,6 +199,44 @@ func (s *Server) run(parentCtx context.Context, addrs chan net.Addr, errs chan e
|
|||||||
logger.Info(ctx, "http server exiting")
|
logger.Info(ctx, "http server exiting")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Server) createDirectorCaches(ctx context.Context) (*ttl.Cache[string, []*store.Layer], *ttl.Cache[string, []*store.Proxy], func()) {
|
||||||
|
layerCache := ttl.NewCache(
|
||||||
|
memory.NewCache[string, []*store.Layer](),
|
||||||
|
memory.NewCache[string, time.Time](),
|
||||||
|
s.directorCacheTTL,
|
||||||
|
)
|
||||||
|
|
||||||
|
proxyCache := ttl.NewCache(
|
||||||
|
memory.NewCache[string, []*store.Proxy](),
|
||||||
|
memory.NewCache[string, time.Time](),
|
||||||
|
s.directorCacheTTL,
|
||||||
|
)
|
||||||
|
|
||||||
|
sig := make(chan os.Signal, 1)
|
||||||
|
|
||||||
|
signal.Notify(sig, syscall.SIGUSR2)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
for {
|
||||||
|
_, ok := <-sig
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.Info(ctx, "received sigusr2 signal, clearing proxies and layers cache")
|
||||||
|
|
||||||
|
layerCache.Clear()
|
||||||
|
proxyCache.Clear()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
cancel := func() {
|
||||||
|
close(sig)
|
||||||
|
}
|
||||||
|
|
||||||
|
return layerCache, proxyCache, cancel
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Server) createReverseProxy(ctx context.Context, target *url.URL) *httputil.ReverseProxy {
|
func (s *Server) createReverseProxy(ctx context.Context, target *url.URL) *httputil.ReverseProxy {
|
||||||
reverseProxy := httputil.NewSingleHostReverseProxy(target)
|
reverseProxy := httputil.NewSingleHostReverseProxy(target)
|
||||||
|
|
||||||
@ -233,9 +265,7 @@ func (s *Server) handleDefault(w http.ResponseWriter, r *http.Request) {
|
|||||||
func (s *Server) handleError(w http.ResponseWriter, r *http.Request, status int, err error) {
|
func (s *Server) handleError(w http.ResponseWriter, r *http.Request, status int, err error) {
|
||||||
err = errors.WithStack(err)
|
err = errors.WithStack(err)
|
||||||
|
|
||||||
if errors.Is(err, context.Canceled) {
|
if !errors.Is(err, context.Canceled) {
|
||||||
logger.Warn(r.Context(), err.Error(), logger.E(err))
|
|
||||||
} else {
|
|
||||||
logger.Error(r.Context(), err.Error(), logger.CapturedE(err))
|
logger.Error(r.Context(), err.Error(), logger.CapturedE(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,5 +37,6 @@ func setupAuthnOIDCLayer(conf *config.Config) (director.Layer, error) {
|
|||||||
authn.WithTemplateDir(string(conf.Layers.Authn.TemplateDir)),
|
authn.WithTemplateDir(string(conf.Layers.Authn.TemplateDir)),
|
||||||
authn.WithDebug(bool(conf.Layers.Authn.Debug)),
|
authn.WithDebug(bool(conf.Layers.Authn.Debug)),
|
||||||
),
|
),
|
||||||
|
oidc.WithOIDCProviderCacheTimeout(time.Duration(*conf.Layers.Authn.OIDC.ProviderCacheTimeout)),
|
||||||
), nil
|
), nil
|
||||||
}
|
}
|
||||||
|
@ -131,6 +131,12 @@ proxy:
|
|||||||
# Les proxys/layers sont mis en cache local pour une durée de 30s
|
# Les proxys/layers sont mis en cache local pour une durée de 30s
|
||||||
# par défaut. Si les modifications sont rares, vous pouvez augmenter
|
# par défaut. Si les modifications sont rares, vous pouvez augmenter
|
||||||
# cette valeur pour réduire la "pression" sur le serveur Redis.
|
# cette valeur pour réduire la "pression" sur le serveur Redis.
|
||||||
|
# Il est possible de forcer la réinitialisation du cache en envoyant
|
||||||
|
# le signal SIGUSR2 au processus Bouncer.
|
||||||
|
#
|
||||||
|
# Exemple
|
||||||
|
#
|
||||||
|
# kill -s USR2 $(pgrep bouncer)
|
||||||
ttl: 30s
|
ttl: 30s
|
||||||
|
|
||||||
# Configuration du transport HTTP(S)
|
# Configuration du transport HTTP(S)
|
||||||
|
Reference in New Issue
Block a user