internal/config/layers.go

@@ -21,9 +21,6 @@ func NewDefaultLayersConfig() LayersConfig {
 					Timeout:         NewInterpolatedDuration(10 * time.Second),
 				},
 			},
-			Sessions: AuthnLayerSessionConfig{
-				TTL: NewInterpolatedDuration(time.Hour),
-			},
 		},
 	}
 }
@@ -34,14 +31,9 @@ type QueueLayerConfig struct {
 }
 
 type AuthnLayerConfig struct {
-	Debug       InterpolatedBool        `yaml:"debug"`
-	TemplateDir InterpolatedString      `yaml:"templateDir"`
-	OIDC        AuthnOIDCLayerConfig    `yaml:"oidc"`
-	Sessions    AuthnLayerSessionConfig `yaml:"sessions"`
-}
-
-type AuthnLayerSessionConfig struct {
-	TTL *InterpolatedDuration `yaml:"ttl"`
+	Debug       InterpolatedBool     `yaml:"debug"`
+	TemplateDir InterpolatedString   `yaml:"templateDir"`
+	OIDC        AuthnOIDCLayerConfig `yaml:"oidc"`
 }
 
 type AuthnOIDCLayerConfig struct {

internal/session/options.go

@@ -10,7 +10,6 @@ import (
 type Options struct {
 	Session   sessions.Options
 	KeyPrefix string
-	TTL       time.Duration
 }
 
 type OptionFunc func(opts *Options)
@@ -26,7 +25,6 @@ func NewOptions(funcs ...OptionFunc) *Options {
 			SameSite: http.SameSiteDefaultMode,
 		},
 		KeyPrefix: "session:",
-		TTL:       time.Hour,
 	}
 
 	for _, fn := range funcs {
@@ -47,9 +45,3 @@ func WithKeyPrefix(prefix string) OptionFunc {
 		opts.KeyPrefix = prefix
 	}
 }
-
-func WithTTL(ttl time.Duration) OptionFunc {
-	return func(opts *Options) {
-		opts.TTL = ttl
-	}
-}

internal/session/store.go

@@ -31,7 +31,6 @@ type Store struct {
 	keyPrefix  string
 	keyGen     KeyGenFunc
 	serializer SessionSerializer
-	ttl        time.Duration
 }
 
 type KeyGenFunc func() (string, error)
@@ -44,7 +43,6 @@ func NewStore(adapter StoreAdapter, funcs ...OptionFunc) *Store {
 		keyPrefix:  opts.KeyPrefix,
 		keyGen:     generateRandomKey,
 		serializer: GobSerializer{},
-		ttl:        opts.TTL,
 	}
 
 	return rs
@@ -64,21 +62,20 @@ func (s *Store) New(r *http.Request, name string) (*sessions.Session, error) {
 	if err != nil {
 		return session, nil
 	}
-
 	session.ID = c.Value
 
 	err = s.load(r.Context(), session)
 	if err == nil {
 		session.IsNew = false
 	} else if !errors.Is(err, ErrNotFound) {
-		return session, errors.WithStack(err)
+		return nil, errors.WithStack(err)
 	}
 
 	return session, nil
 }
 
 func (s *Store) Save(r *http.Request, w http.ResponseWriter, session *sessions.Session) error {
-	if session.Options.MaxAge < 0 {
+	if session.Options.MaxAge <= 0 {
 		if err := s.delete(r.Context(), session); err != nil {
 			return errors.WithStack(err)
 		}
@@ -123,12 +120,7 @@ func (s *Store) save(ctx context.Context, session *sessions.Session) error {
 		return errors.WithStack(err)
 	}
 
-	ttl := time.Duration(session.Options.MaxAge) * time.Second
-	if s.ttl < ttl || ttl == 0 {
-		ttl = s.ttl
-	}
-
-	if err := s.adapter.Set(ctx, s.keyPrefix+session.ID, b, ttl); err != nil {
+	if err := s.adapter.Set(ctx, s.keyPrefix+session.ID, b, time.Duration(session.Options.MaxAge)*time.Second); err != nil {
 		return errors.WithStack(err)
 	}
 

misc/packaging/common/config.yml

@@ -218,11 +218,6 @@ layers:
   authn:
     # Répertoire contenant les templates
     templateDir: "/etc/bouncer/layers/authn/templates"
-    # Configuration des sessions
-    sessions:
-      # Temps de persistence sans actualisation des sessions dans le store
-      # (prévalent sur le MaxAge de la session)
-      ttl: "1h"
 
 # Configuration d'une série de proxy/layers
 # à créer par défaut par le serveur d'administration