Adds session cookie name option (#23)

* Fixes #22
kubetail-org · Feb 29, 2024 · dff87fa · dff87fa
1 parent 57026d5
commit dff87fa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 1 deletion.
diff --git a/backend/cmd/server/config.go b/backend/cmd/server/config.go
@@ -33,6 +33,7 @@ type Config struct {
 
 		// cookie options
 		Cookie struct {
+			Name     string
 			Path     string
 			Domain   string
 			MaxAge   int `mapstructure:"max-age"`
@@ -91,6 +92,7 @@ func DefaultConfig() Config {
 	cfg.Namespace = ""
 
 	cfg.Session.Secret = ""
+	cfg.Session.Cookie.Name = "session"
 	cfg.Session.Cookie.Path = "/"
 	cfg.Session.Cookie.Domain = ""
 	cfg.Session.Cookie.MaxAge = 36400 * 30

diff --git a/backend/cmd/server/main.go b/backend/cmd/server/main.go
@@ -168,6 +168,7 @@ func main() {
 			appCfg.Namespace = cfg.Namespace
 			appCfg.AccessLogEnabled = cfg.Logging.AccessLogEnabled
 			appCfg.Session.Secret = cfg.Session.Secret
+			appCfg.Session.Cookie.Name = cfg.Session.Cookie.Name
 			appCfg.Session.Cookie.Path = cfg.Session.Cookie.Path
 			appCfg.Session.Cookie.Domain = cfg.Session.Cookie.Domain
 			appCfg.Session.Cookie.MaxAge = cfg.Session.Cookie.MaxAge

diff --git a/backend/hack/server.yaml b/backend/hack/server.yaml
@@ -25,6 +25,7 @@ kube-config: ${HOME}/.kube/config
 session:
   secret: REPLACEME
   cookie:
+    name: mysession
     path: /
     max-age: 2592000
     secure: false

diff --git a/backend/internal/ginapp/config.go b/backend/internal/ginapp/config.go
@@ -39,6 +39,7 @@ type Config struct {
 
 		// cookie options
 		Cookie struct {
+			Name     string
 			Path     string
 			Domain   string
 			MaxAge   int
@@ -74,6 +75,7 @@ func DefaultConfig() Config {
 	cfg.AccessLogEnabled = true
 
 	cfg.Session.Secret = ""
+	cfg.Session.Cookie.Name = "session"
 	cfg.Session.Cookie.Path = "/"
 	cfg.Session.Cookie.Domain = ""
 	cfg.Session.Cookie.MaxAge = 36400 * 30

diff --git a/backend/internal/ginapp/ginapp.go b/backend/internal/ginapp/ginapp.go
@@ -95,7 +95,7 @@ func NewGinApp(config Config) (*GinApp, error) {
 			HttpOnly: config.Session.Cookie.HttpOnly,
 			SameSite: config.Session.Cookie.SameSite,
 		})
-		dynamicRoutes.Use(sessions.Sessions("session", sessionStore))
+		dynamicRoutes.Use(sessions.Sessions(config.Session.Cookie.Name, sessionStore))
 
 		// https://security.stackexchange.com/questions/147554/security-headers-for-a-web-api
 		// https://observatory.mozilla.org/faq/

diff --git a/backend/internal/ginapp/testutils_test.go b/backend/internal/ginapp/testutils_test.go
@@ -206,6 +206,7 @@ func NewTestConfig() *Config {
 	cfg := Config{}
 	cfg.AccessLogEnabled = false
 	cfg.Session.Secret = "TESTSESSIONSECRET"
+	cfg.Session.Cookie.Name = "session"
 	cfg.CSRF.Enabled = false
 	cfg.CSRF.Secret = "TESTCSRFSECRET"
 	return &cfg