Merge pull request #396 from xcp-ng/gln/passlib-integration-kuyq

Use passlib in place of legacycrypt

Author: glehmann

data.py-dist

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import os
 
-import legacycrypt as crypt  # type: ignore[import-untyped]
+from lib.common import hash_password
 
 from typing import TYPE_CHECKING, Any
 
@@ -17,11 +17,6 @@ if TYPE_CHECKING:
 HOST_DEFAULT_USER = "root"
 HOST_DEFAULT_PASSWORD = ""
 
-def hash_password(password):
-    """Hash password for /etc/password."""
-    salt = crypt.mksalt(crypt.METHOD_SHA512)  # type: ignore
-    return crypt.crypt(password, salt)
-
 HOST_DEFAULT_PASSWORD_HASH = hash_password(HOST_DEFAULT_PASSWORD)
 
 # Public keys for a private keys available to the test runner

lib/common.py

@@ -20,6 +20,7 @@
 from uuid import UUID
 
 import requests
+from passlib.hash import sha512_crypt
 from pydantic import TypeAdapter
 
 from typing import (
@@ -419,3 +420,8 @@ def _param_clear(host: Host, xe_prefix: str, uuid: str, param_name: str) -> None
     """ Common implementation for param_clear. """
     args: dict[str, str | bool | dict[str, str]] = {'uuid': uuid, 'param-name': param_name}
     host.xe(f'{xe_prefix}-param-clear', args)
+
+def hash_password(password: str) -> str:
+    """Hash password for /etc/shadow."""
+    # XCP-ng uses sha512 with 5000 rounds by default
+    return sha512_crypt.using(rounds=5000).hash(password)

pyproject.toml

@@ -7,8 +7,10 @@ requires-python = ">=3.11"
 dependencies = [
     "cryptography>=3.3.1",
     "gitpython",
+    # TODO: keep legacycrypt to let the user transition to lib.common.hash_password in their data.py
     "legacycrypt",
     "packaging>=20.7",
+    "passlib",
     "pluggy>=1.1.0",
     "pydantic",
     "pytest>=8.0.0",
@@ -34,6 +36,7 @@ dev = [
     "zizmor",
     "prek>=0.4.5",
     "autopep8",
+    "types-passlib",
 ]
 
 [tool.pyright]

requirements/base.txt

@@ -3,6 +3,7 @@ cryptography>=3.3.1
 gitpython
 legacycrypt
 packaging>=20.7
+passlib
 pluggy>=1.1.0
 pydantic
 pytest>=8.0.0

requirements/dev.txt

@@ -15,4 +15,5 @@ types-pexpect
 zizmor
 prek>=0.4.5
 autopep8
+types-passlib
 -r base.txt