(asp.net) session_name() gets correct value from web config

peachpiecompiler · Jan 6, 2021 · 7416187 · 7416187
1 parent db0c81c
commit 7416187
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/src/Peachpie.RequestHandler/Session/AspNetSessionHandler.cs b/src/Peachpie.RequestHandler/Session/AspNetSessionHandler.cs
@@ -11,6 +11,9 @@ sealed class AspNetSessionHandler : PhpSessionHandler
     {
         public static readonly PhpSessionHandler Default = new AspNetSessionHandler();
 
+        /// <summary>
+        /// The session item with serialized PHP $_SESSION.
+        /// </summary>
         const string PhpNetSessionVars = "Peachpie.SessionVars";
 
         /// <summary>
@@ -58,7 +61,7 @@ string EnsureSessionId(HttpContext httpContext)
         /// <summary>
         /// Gets the session name.
         /// </summary>
-        public override string GetSessionName(IHttpPhpContext webctx) => GetHttpContext(webctx).Session.SessionID;
+        public override string GetSessionName(IHttpPhpContext webctx) => AspNetSessionHelpers.GetConfigCookieName() ?? AspNetSessionCookieName;
 
         /// <summary>
         /// Sets the session name.
@@ -72,10 +75,7 @@ public override void Abandon(IHttpPhpContext webctx)
             GetHttpContext(webctx).Session.Abandon();
         }
 
-        public override string GetSessionId(IHttpPhpContext webctx)
-        {
-            return GetHttpContext(webctx).Session.SessionID;
-        }
+        public override string GetSessionId(IHttpPhpContext webctx) => GetHttpContext(webctx).Session.SessionID;
 
         public override PhpArray Load(IHttpPhpContext webctx)
         {

diff --git a/src/Peachpie.RequestHandler/Session/AspNetSessionHelpers.cs b/src/Peachpie.RequestHandler/Session/AspNetSessionHelpers.cs
@@ -40,5 +40,28 @@ public static void SetContainer(this HttpSessionState state, IHttpSessionState c
                 s_HttpSessionState_container.SetValue(state, container ?? throw new ArgumentNullException(nameof(container)));
             }
         }
+
+        /// <summary>
+        /// private static SessionStateSection s_config
+        /// </summary>
+        static FieldInfo s_SessionIDManager_config = typeof(SessionIDManager).GetField("s_config", BindingFlags.Static | BindingFlags.NonPublic);
+
+        /// <summary>
+        /// Gets the configured session cookie name, or <c>null</c> if the value cannot be determined.
+        /// </summary>
+        /// <returns></returns>
+        public static string GetConfigCookieName()
+        {
+            if (s_SessionIDManager_config != null)
+            {
+                var section = s_SessionIDManager_config.GetValue(null) as System.Web.Configuration.SessionStateSection;
+                if (section != null)
+                {
+                    return section.CookieName;
+                }
+            }
+
+            return null;
+        }
     }
 }