fix 2056

MAIF · Dec 16, 2024 · e1f25dd · e1f25dd
1 parent a7328c9
commit e1f25dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/otoroshi/app/auth/session.scala b/otoroshi/app/auth/session.scala
@@ -48,9 +48,10 @@ class PrivateAppsSessionManager(env: Env) {
 
   def printStatus(): Unit = {
     if (enabled) {
-      env.logger.info("Private apps. session is enabled !")
-    } else {
-      env.logger.info("Private apps. session is disabled")
+      logger.info(s"Private apps. session is enabled !")
+      if (logger.isDebugEnabled) {
+        logger.debug(s"session config: ${sessionConfig}")
+      }
     }
   }
 

diff --git a/otoroshi/app/env/Env.scala b/otoroshi/app/env/Env.scala
@@ -1168,7 +1168,6 @@ class Env(
     configuration.getOptionalWithFileSupport[Int]("otoroshi.next.experimental.http2-client-proxy.port").getOrElse(8555)
 
   lazy val privateAppsSessionManager: PrivateAppsSessionManager = new PrivateAppsSessionManager(this)
-  privateAppsSessionManager.printStatus()
 
   lazy val defaultConfig = GlobalConfig(
     initWithNewEngine = true,
@@ -1341,6 +1340,8 @@ class Env(
 
     DynamicSSLEngineProvider.setCurrentEnv(this)
 
+    privateAppsSessionManager.printStatus()
+
     clusterAgent.warnAboutHttpLeaderUrls()
     if (clusterConfig.mode == ClusterMode.Leader) {
       logger.info(s"Running Otoroshi Leader agent !")

diff --git a/otoroshi/conf/application.conf b/otoroshi/conf/application.conf
@@ -203,7 +203,8 @@ app {
       maxAge = ${?OTOROSHI_PRIVATEAPPS_SESSION_MAX_AGE}          # the cookie for otoroshi privateapps max age
       domain = ${app.privateapps.subdomain}"."${otoroshi.domain} # the cookie for otoroshi privateapps domain
       domain = ${?OTOROSHI_PRIVATEAPPS_SESSION_DOMAIN}           # the cookie for otoroshi privateapps domain
-      cookieName = "otoroshi-sso-session"                        # the cookie for otoroshi privateapps name
+      #cookieName = "otoroshi-sso-session"                       # the cookie for otoroshi privateapps name
+      cookieName = ${play.http.session.cookieName}"-sso"         # the cookie for otoroshi privateapps name
       cookieName = ${?OTOROSHI_PRIVATEAPPS_SESSION_NAME}         # the cookie for otoroshi privateapps name
       sameSite = "lax"
       sameSite = ${?OTOROSHI_PRIVATEAPPS_SESSION_SAMESITE}