Merge pull request #5971 from MrPetovan/bug/5970-use-temppath-passwordexposed

Use system.temppath for PasswordExposedChecker cache

diff --git a/config/settings.ini.php b/config/settings.ini.php
index 353b1fa1f444a25d83ac31f95a09b0aa150ee310..02482c8af8931fc81a112bbd13273d3b6e43c366 100644 (file)
--- a/config/settings.ini.php
+++ b/config/settings.ini.php
@@ -92,6 +92,10 @@ optimize_max_tablesize = -1
 ; Set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt.
 rino_encrypt = 2
 
+; temppath (String)
+; Custom temporary file directory
+temppath =
+
 ; theme (String)
 ; System theme name.
 theme = vier

diff --git a/src/Model/User.php b/src/Model/User.php
index 17c9831ca92530b5d8c9bdd1673094dbf518d6a8..63aaa1e3de2c59312e1033bbd2ad6d5807e44210 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -5,7 +5,7 @@
  */
 namespace Friendica\Model;
 
-use DivineOmega\PasswordExposed\PasswordStatus;
+use DivineOmega\PasswordExposed;
 use Exception;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -20,7 +20,6 @@ use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use LightOpenID;
-use function password_exposed;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -280,7 +279,14 @@ class User
         */
        public static function isPasswordExposed($password)
        {
-               return password_exposed($password) === PasswordStatus::EXPOSED;
+               $cache = new \DivineOmega\DOFileCachePSR6\CacheItemPool();
+               $cache->changeConfig([
+                       'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
+               ]);
+
+               $PasswordExposedCHecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
+
+               return $PasswordExposedCHecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
        }
 
        /**