Add exposed password check to manual password change

diff --git a/mod/settings.php b/mod/settings.php
index b66cad7f9839d7c48eeb7dff27825456b617ccfd..b39ee0b51f7a9c9c8385a3f15fa4c61f8d8e5f4b 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -390,6 +390,11 @@ function settings_post(App $a)
                        $err = true;
         }
 
+               if (User::checkPasswordExposed($newpass)) {
+                       notice(L10n::t('The new password has been exposed in a public data dump, please choose another.') . EOL);
+                       $err = true;
+               }
+
         //  check if the old password was supplied correctly before changing it to the new value
         if (!User::authenticate(intval(local_user()), $_POST['opassword'])) {
             notice(L10n::t('Wrong password.') . EOL);

diff --git a/src/Model/User.php b/src/Model/User.php
index 702e815e601aa268ee0f2dee8feba8ced4c64428..331fdccb7f3b032c4cce9b03868f79f5fc3c8241 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -5,6 +5,7 @@
  */
 namespace Friendica\Model;
 
+use DivineOmega\PasswordExposed\PasswordStatus;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -22,6 +23,7 @@ use Friendica\Util\Network;
 use dba;
 use Exception;
 use LightOpenID;
+use function password_exposed;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -101,7 +103,7 @@ class User
         * @param string $password
         * @return int|boolean
         * @deprecated since version 3.6
-        * @see Friendica\Model\User::getIdFromPasswordAuthentication()
+        * @see User::getIdFromPasswordAuthentication()
         */
        public static function authenticate($user_info, $password)
        {
@@ -216,6 +218,17 @@ class User
                return autoname(6) . mt_rand(100, 9999);
        }
 
+       /**
+        * Checks if the provided plaintext password has been exposed or not
+        *
+        * @param string $password
+        * @return bool
+        */
+       public static function checkPasswordExposed($password)
+       {
+               return password_exposed($password) === PasswordStatus::EXPOSED;
+       }
+
        /**
         * Legacy hashing function, kept for password migration purposes
         *