Repository: pallets/werkzeug (python)

Issue:
support scrypt, deprecate basic hash methods
Scrypt provides much stronger security than PBKDF2. It also has the advantage of not needing to update parameters as often. It is in the standard library. @alex and @reaperhulk recommended `n=2**15, r=8, p=1` for parameters.

Additionally, insecure/basic methods need to be deprecated. Currently, the `plain` method is allowed, which just returns the password as-is. Additionally, plain hashes are supported, rather than always requiring a KDF, and any hash provided by `hashlib` is supported. Deprecate everything except `scrypt` and `pbkdf2`.

If projects notice they are using these old methods, they'll need to implement a migration strategy to upgrade their hashes.

Pull request description:
support scrypt
fixes #2654 

Patch:
diff --git a/CHANGES.rst b/CHANGES.rst
index e07faf3d..66aa64e7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -123,6 +123,8 @@ Unreleased
 -   The ``FormDataParser`` ``parse_functions`` attribute and ``get_parse_func`` method,
     and the invalid ``application/x-url-encoded`` content type, are deprecated.
     :pr:`2653`
+-   ``generate_password_hash`` supports scrypt. Plain hash methods are deprecated, only
+    scrypt and pbkdf2 are supported. :issue:`2654`
 
 
 Version 2.2.3
diff --git a/src/werkzeug/security.py b/src/werkzeug/security.py
index 48cb57d1..10f57cd5 100644
--- a/src/werkzeug/security.py
+++ b/src/werkzeug/security.py
@@ -5,10 +5,7 @@ import hmac
 import os
 import posixpath
 import secrets
-import typing as t
-
-if t.TYPE_CHECKING:
-    pass
+import warnings
 
 SALT_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 DEFAULT_PBKDF2_ITERATIONS = 600000
@@ -21,91 +18,124 @@ _os_alt_seps: list[str] = list(
 def gen_salt(length: int) -> str:
     """Generate a random string of SALT_CHARS with specified ``length``."""
     if length <= 0:
-        raise ValueError("Salt length must be positive")
+        raise ValueError("Salt length must be at least 1.")
 
     return "".join(secrets.choice(SALT_CHARS) for _ in range(length))
 
 
 def _hash_internal(method: str, salt: str, password: str) -> tuple[str, str]:
-    """Internal password hash helper.  Supports plaintext without salt,
-    unsalted and salted passwords.  In case salted passwords are used
-    hmac is used.
-    """
     if method == "plain":
+        warnings.warn(
+            "The 'plain' password method is deprecated and will be removed in"
+            " Werkzeug 2.4. Migrate to the 'scrypt' method.",
+            stacklevel=3,
+        )
         return password, method
 
+    method, *args = method.split(":")
     salt = salt.encode("utf-8")
     password = password.encode("utf-8")
 
-    if method.startswith("pbkdf2:"):
-        if not salt:
-            raise ValueError("Salt is required for PBKDF2")
-
-        args = method[7:].split(":")
-
-        if len(args) not in (1, 2):
-            raise ValueError("Invalid number of arguments for PBKDF2")
-
-        method = args.pop(0)
-        iterations = int(args[0] or 0) if args else DEFAULT_PBKDF2_ITERATIONS
+    if method == "scrypt":
+        if not args:
+            n = 2**15
+            r = 8
+            p = 1
+        else:
+            try:
+                n, r, p = map(int, args)
+            except ValueError:
+                raise ValueError("'scrypt' takes 3 arguments.") from None
+
+        maxmem = 132 * n * r * p  # ideally 128, but some extra seems needed
         return (
-            hashlib.pbkdf2_hmac(method, password, salt, iterations).hex(),
-            f"pbkdf2:{method}:{iterations}",
+            hashlib.scrypt(password, salt=salt, n=n, r=r, p=p, maxmem=maxmem).hex(),
+            f"scrypt:{n}:{r}:{p}",
         )
+    elif method == "pbkdf2":
+        len_args = len(args)
+
+        if len_args == 0:
+            hash_name = "sha256"
+            iterations = DEFAULT_PBKDF2_ITERATIONS
+        elif len_args == 1:
+            hash_name = args[0]
+            iterations = DEFAULT_PBKDF2_ITERATIONS
+        elif len_args == 2:
+            hash_name = args[0]
+            iterations = int(args[1])
+        else:
+            raise ValueError("'pbkdf2' takes 2 arguments.")
 
-    if salt:
+        return (
+            hashlib.pbkdf2_hmac(hash_name, password, salt, iterations).hex(),
+            f"pbkdf2:{hash_name}:{iterations}",
+        )
+    else:
+        warnings.warn(
+            f"The '{method}' password method is deprecated and will be removed in"
+            " Werkzeug 2.4. Migrate to the 'scrypt' method.",
+            stacklevel=3,
+        )
         return hmac.new(salt, password, method).hexdigest(), method
 
-    return hashlib.new(method, password).hexdigest(), method
-
 
 def generate_password_hash(
-    password: str, method: str = "pbkdf2:sha256", salt_length: int = 16
+    password: str, method: str = "pbkdf2", salt_length: int = 16
 ) -> str:
-    """Hash a password with the given method and salt with a string of
-    the given length. The format of the string returned includes the method
-    that was used so that :func:`check_password_hash` can check the hash.
+    """Securely hash a password for storage. A password can be compared to a stored hash
+    using :func:`check_password_hash`.
+
+    The following methods are supported:
 
-    The format for the hashed string looks like this::
+    -   ``scrypt``, more secure but not available on PyPy. The parameters are ``n``,
+        ``r``, and ``p``, the default is ``scrypt:32768:8:1``. See
+        :func:`hashlib.scrypt`.
+    -   ``pbkdf2``, the default. The parameters are ``hash_method`` and ``iterations``,
+        the default is ``pbkdf2:sha256:600000``. See :func:`hashlib.pbkdf2_hmac`.
 
-        method$salt$hash
+    Default parameters may be updated to reflect current guidelines, and methods may be
+    deprecated and removed if they are no longer considered secure. To migrate old
+    hashes, you may generate a new hash when checking an old hash, or you may contact
+    users with a link to reset their password.
 
-    This method can **not** generate unsalted passwords but it is possible
-    to set param method='plain' in order to enforce plaintext passwords.
-    If a salt is used, hmac is used internally to salt the password.
+    :param password: The plaintext password.
+    :param method: The key derivation function and parameters.
+    :param salt_length: The number of characters to generate for the salt.
 
-    If PBKDF2 is wanted it can be enabled by setting the method to
-    ``pbkdf2:method:iterations`` where iterations is optional::
+    .. versionchanged:: 2.3
+        Scrypt support was added.
 
-        pbkdf2:sha256:80000$salt$hash
-        pbkdf2:sha256$salt$hash
+    .. versionchanged:: 2.3
+        The default iterations for pbkdf2 was increased to 600,000.
 
-    :param password: the password to hash.
-    :param method: the hash method to use (one that hashlib supports). Can
-                   optionally be in the format ``pbkdf2:method:iterations``
-                   to enable PBKDF2.
-    :param salt_length: the length of the salt in letters.
+    .. versionchanged:: 2.3
+        All plain hashes are deprecated and will not be supported in Werkzeug 2.4.
     """
-    salt = gen_salt(salt_length) if method != "plain" else ""
+    salt = gen_salt(salt_length)
     h, actual_method = _hash_internal(method, salt, password)
     return f"{actual_method}${salt}${h}"
 
 
 def check_password_hash(pwhash: str, password: str) -> bool:
-    """Check a password against a given salted and hashed password value.
-    In order to support unsalted legacy passwords this method supports
-    plain text passwords, md5 and sha1 hashes (both salted and unsalted).
+    """Securely check that the given stored password hash, previously generated using
+    :func:`generate_password_hash`, matches the given password.
+
+    Methods may be deprecated and removed if they are no longer considered secure. To
+    migrate old hashes, you may generate a new hash when checking an old hash, or you
+    may contact users with a link to reset their password.
 
-    Returns `True` if the password matched, `False` otherwise.
+    :param pwhash: The hashed password.
+    :param password: The plaintext password.
 
-    :param pwhash: a hashed string like returned by
-                   :func:`generate_password_hash`.
-    :param password: the plaintext password to compare against the hash.
+    .. versionchanged:: 2.3
+        All plain hashes are deprecated and will not be supported in Werkzeug 2.4.
     """
-    if pwhash.count("$") < 2:
+    try:
+        method, salt, hashval = pwhash.split("$", 2)
+    except ValueError:
         return False
 
-    method, salt, hashval = pwhash.split("$", 2)
     return hmac.compare_digest(_hash_internal(method, salt, password)[0], hashval)
 
 


Test patch:
diff --git a/tests/test_security.py b/tests/test_security.py
index 609170cd..0ef1eb05 100644
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@ -1,5 +1,6 @@
 import os
 import posixpath
+import sys
 
 import pytest
 
@@ -8,25 +9,37 @@ from werkzeug.security import generate_password_hash
 from werkzeug.security import safe_join
 
 
-def test_password_hashing():
-    hash0 = generate_password_hash("default")
-    assert check_password_hash(hash0, "default")
-    assert hash0.startswith("pbkdf2:sha256:600000$")
+def test_default_password_method():
+    value = generate_password_hash("secret")
+    assert value.startswith("pbkdf2:")
 
-    hash1 = generate_password_hash("default", "sha1")
-    hash2 = generate_password_hash("default", method="sha1")
+
+@pytest.mark.xfail(
+    sys.implementation.name == "pypy", reason="scrypt unavailable on pypy"
+)
+def test_scrypt():
+    value = generate_password_hash("secret", method="scrypt")
+    assert check_password_hash(value, "secret")
+    assert value.startswith("scrypt:32768:8:1$")
+
+
+def test_pbkdf2():
+    value = generate_password_hash("secret", method="pbkdf2")
+    assert check_password_hash(value, "secret")
+    assert value.startswith("pbkdf2:sha256:600000$")
+
+
+def test_salted_hashes():
+    hash1 = generate_password_hash("secret")
+    hash2 = generate_password_hash("secret")
     assert hash1 != hash2
-    assert check_password_hash(hash1, "default")
-    assert check_password_hash(hash2, "default")
-    assert hash1.startswith("sha1$")
-    assert hash2.startswith("sha1$")
+    assert check_password_hash(hash1, "secret")
+    assert check_password_hash(hash2, "secret")
 
-    with pytest.raises(ValueError):
-        generate_password_hash("default", "sha1", salt_length=0)
 
-    fakehash = generate_password_hash("default", method="plain")
-    assert fakehash == "plain$$default"
-    assert check_password_hash(fakehash, "default")
+def test_require_salt():
+    with pytest.raises(ValueError):
+        generate_password_hash("secret", salt_length=0)
 
 
 def test_safe_join():