Support userpassword hashes in lowercase

leenooks · leenooks · commit fc420adfdb58 · 2025-09-14T13:49:53.000+10:00
diff --git a/app/Classes/LDAP/Attribute/Password.php b/app/Classes/LDAP/Attribute/Password.php
@@ -52,9 +52,13 @@ protected static function helpers(): Collection
 	public static function hash(string $password): ?Attribute\Password\Base
 	{
 		$m = [];
-		preg_match('/^{([A-Z0-9]+)}(.*)$/',$password,$m);
+		preg_match('/^{([a-zA-Z0-9]+)}(.*)$/',$password,$m);
 
-		$hash = \Arr::get($m,1,'*clear*');
+		$hash = strtoupper($x=\Arr::get($m,1,'*clear*'));
+
+		// If our hash in the password is not in upper case, then convert it, as we use uppercase hashes to find the right class
+		if ($hash !== $x)
+			$password = preg_replace('/^{'.$x.'}/','{'.$hash.'}',$password);
 
 		if (($potential=static::helpers()->filter(fn($hasher)=>str_starts_with($hasher::key,$hash)))->count() > 1) {
 			foreach ($potential as $item) {
diff --git a/app/Classes/LDAP/Attribute/Password/Crypt.php b/app/Classes/LDAP/Attribute/Password/Crypt.php
@@ -11,7 +11,7 @@ final class Crypt extends Base
 
 	public static function subid(string $password): bool
 	{
-		return preg_match('/^[\da-zA-Z]{2}/',self::password($password));
+		return preg_match('/^[\w]{2}/',self::password($password));
 	}
 
 	public function compare(string $source,string $compare): bool
diff --git a/config/ldap.php b/config/ldap.php
@@ -165,7 +165,7 @@
 			],
 			sprintf('userpassword.%s%s.*',\App\Ldap\Entry::TAG_NOTAG,\App\Ldap\Entry::TAG_HELPER) => [
 				'nullable',
-				'min:4'
+				'min:3'
 			],
 			sprintf('userpassword.%s.*',\App\Ldap\Entry::TAG_NOTAG) => [
 				'nullable',

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ final class Crypt extends Base`
`11`	`11`
`12`	`12`	`public static function subid(string $password): bool`
`13`	`13`	`{`
`14`		`- return preg_match('/^[\da-zA-Z]{2}/',self::password($password));`
	`14`	`+ return preg_match('/^[\w]{2}/',self::password($password));`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public function compare(string $source,string $compare): bool`