Add cachedir-setting and use it for Symfony cache (#1932)

tvdijen · thijskh · web-flow · commit 6a3f169c24bd · 2024-02-02T21:49:32.000+01:00
* Add cachedir-setting and use it for Symfony cache

* s/Symfony/SimpleSAMLphp

Co-authored-by: Thijs Kinkhorst &lt;thijs@kinkhorst.com&gt;

* Remove tempdir

---------

Co-authored-by: Thijs Kinkhorst &lt;thijs@kinkhorst.com&gt;
diff --git a/config/config.php.dist b/config/config.php.dist
@@ -58,17 +58,17 @@ $config = [
     /*
      * The following settings are *filesystem paths* which define where
      * SimpleSAMLphp can find or write the following things:
+     * - 'cachedir': Where SimpleSAMLphp can write its cache. 
      * - 'loggingdir': Where to write logs. MUST be set to NULL when using a logging
      *                 handler other than `file`.
      * - 'datadir': Storage of general data.
-     * - 'tempdir': Saving temporary files. SimpleSAMLphp will attempt to create
      *   this directory if it doesn't exist.
      * When specified as a relative path, this is relative to the SimpleSAMLphp
      * root directory.
      */
+    'cachedir' => '/var/cache/simplesamlphp',
     //'loggingdir' => '/var/log/',
     //'datadir' => '/var/data/',
-    'tempdir' => '/tmp/simplesaml',
 
     /*
      * Certificate and key material can be loaded from different possible
diff --git a/src/SimpleSAML/Kernel.php b/src/SimpleSAML/Kernel.php
@@ -51,8 +51,7 @@ public function __construct(string $module)
     public function getCacheDir(): string
     {
         $configuration = Configuration::getInstance();
-        $cachePath = $configuration->getString('tempdir') . DIRECTORY_SEPARATOR
-            . 'cache' . DIRECTORY_SEPARATOR . $this->module;
+        $cachePath = $configuration->getString('cachedir') . DIRECTORY_SEPARATOR . $this->module;
 
         $sysUtils = new System();
         if ($sysUtils->isAbsolutePath($cachePath)) {

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ public function __construct(string $module)`
`51`	`51`	`public function getCacheDir(): string`
`52`	`52`	`{`
`53`	`53`	`$configuration = Configuration::getInstance();`
`54`		`- $cachePath = $configuration->getString('tempdir') . DIRECTORY_SEPARATOR`
`55`		`- . 'cache' . DIRECTORY_SEPARATOR . $this->module;`
	`54`	`+ $cachePath = $configuration->getString('cachedir') . DIRECTORY_SEPARATOR . $this->module;`
`56`	`55`
`57`	`56`	`$sysUtils = new System();`
`58`	`57`	`if ($sysUtils->isAbsolutePath($cachePath)) {`