[HttpFoundation] use atomic writes in MockFileSessionStorage

nicolas-grekas · nicolas-grekas · commit 733103064fe8 · 2021-01-13T15:22:48.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -103,7 +103,10 @@ public function save()
 
         try {
             if ($data) {
-                file_put_contents($this->getFilePath(), serialize($data));
+                $path = $this->getFilePath();
+                $tmp = $path.bin2hex(random_bytes(6));
+                file_put_contents($tmp, serialize($data));
+                rename($tmp, $path);
             } else {
                 $this->destroy();
             }
@@ -123,8 +126,11 @@ public function save()
      */
     private function destroy(): void
     {
-        if (is_file($this->getFilePath())) {
+        set_error_handler(static function () {});
+        try {
             unlink($this->getFilePath());
+        } finally {
+            restore_error_handler();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,10 @@ public function save()`
`103`	`103`
`104`	`104`	`try {`
`105`	`105`	`if ($data) {`
`106`		`- file_put_contents($this->getFilePath(), serialize($data));`
	`106`	`+ $path = $this->getFilePath();`
	`107`	`+ $tmp = $path.bin2hex(random_bytes(6));`
	`108`	`+ file_put_contents($tmp, serialize($data));`
	`109`	`+ rename($tmp, $path);`
`107`	`110`	`} else {`
`108`	`111`	`$this->destroy();`
`109`	`112`	`}`
`@@ -123,8 +126,11 @@ public function save()`
`123`	`126`	`*/`
`124`	`127`	`private function destroy(): void`
`125`	`128`	`{`
`126`		`- if (is_file($this->getFilePath())) {`
	`129`	`+ set_error_handler(static function () {});`
	`130`	`+ try {`
`127`	`131`	`unlink($this->getFilePath());`
	`132`	`+ } finally {`
	`133`	`+ restore_error_handler();`
`128`	`134`	`}`
`129`	`135`	`}`
`130`	`136`