Merge pull request #1123 from wagnert/1.1

Fixed concurrent session errors
appserver-io · May 23, 2019 · 325f532 · 325f532
2 parents 48146f4 + c709346
commit 325f532
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# Version 1.1.22
+
+## Bugfixes
+
+* Fixed concurrent session errors
+* Update to appserver-io/ldap version 2.0.1
+
+## Features
+
+* None
+
 # Version 1.1.21
 
 ## Bugfixes

diff --git a/UPGRADE-1.1.22.md b/UPGRADE-1.1.22.md
@@ -0,0 +1,3 @@
+# Upgrade from 1.1.21 to 1.1.22
+
+Updating from 1.1.21 to 1.1.22 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.22.
diff --git a/build.default.properties b/build.default.properties
@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.21
+release.version = 1.1.22
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

diff --git a/composer.lock b/composer.lock
diff --git a/src/AppserverIo/Appserver/ServletEngine/Session/FilesystemSessionHandler.php b/src/AppserverIo/Appserver/ServletEngine/Session/FilesystemSessionHandler.php
@@ -109,21 +109,57 @@ public function save(ServletSessionInterface $session)
         $marshalledSession = $this->marshall($session);
 
         // decode the session from the filesystem
-        $fh = fopen($sessionFilename, 'w+');
+        $fh = fopen($sessionFilename, 'c');
 
         // try to lock the session file
         if (flock($fh, LOCK_EX) === false) {
-            throw new SessionCanNotBeSavedException(sprintf('Can\'t get lock to save session data to file "%s"', $sessionFilename));
+            throw new SessionCanNotBeSavedException(
+                sprintf(
+                    'Can\'t get lock to save session data to file "%s"',
+                    $sessionFilename
+                )
+            );
+        }
+
+        // try to truncate the session file
+        if (ftruncate($fh, 0) === false) {
+            throw new SessionCanNotBeSavedException(
+                sprintf(
+                    'Can\'t truncate session file "%s"',
+                    $sessionFilename
+                )
+            );
         }
 
         // finally try to write the session data to the file
         if (fwrite($fh, $marshalledSession) === false) {
-            throw new SessionCanNotBeSavedException(sprintf('Session with ID "%s" can\'t be saved', $session->getId()));
+            throw new SessionCanNotBeSavedException(
+                sprintf(
+                    'Session with ID "%s" can\'t be saved to file "%s"',
+                    $session->getId(),
+                    $sessionFilename
+                )
+            );
         }
 
         // try to unlock the session file
         if (flock($fh, LOCK_UN) === false) {
-            throw new SessionCanNotBeSavedException(sprintf('Can\'t unlock session file "%s" after saving data', $sessionFilename));
+            throw new SessionCanNotBeSavedException(
+                sprintf(
+                    'Can\'t unlock session file "%s" after saving data',
+                    $sessionFilename
+                )
+            );
+        }
+
+        // try to close the session file
+        if (fclose($fh) === false) {
+            throw new SessionCanNotBeSavedException(
+                sprintf(
+                    'Can\'t close session file "%s" after saving data',
+                    $sessionFilename
+                )
+            );
         }
     }
 
@@ -151,7 +187,12 @@ protected function unpersist($pathname)
 
         // try to lock the session file
         if (flock($fh, LOCK_EX) === false) {
-            throw new SessionDataNotReadableException(sprintf('Can\'t get lock to load session data from file "%s"', $pathname));
+            throw new SessionDataNotReadableException(
+                sprintf(
+                    'Can\'t get lock to load session data from file "%s"',
+                    $pathname
+                )
+            );
         }
 
         // read the marshalled session data from the file
@@ -161,12 +202,22 @@ protected function unpersist($pathname)
 
         // try to unlock the session file
         if (flock($fh, LOCK_UN) === false) {
-            throw new SessionDataNotReadableException(sprintf('Can\'t unlock session file "%s" after reading data', $pathname));
+            throw new SessionDataNotReadableException(
+                sprintf(
+                    'Can\'t unlock session file "%s" after reading data',
+                    $pathname
+                )
+            );
         }
 
         // query whether or not the session has been unmarshalled successfully
         if ($marshalled === null) {
-            throw new SessionDataNotReadableException(sprintf('Can\'t load any session data from file %s', $pathname));
+            throw new SessionDataNotReadableException(
+                sprintf(
+                    'Can\'t load any session data from file %s',
+                    $pathname
+                )
+            );
         }
 
         // unmarshall and return the session data