From 17f6f486fc9f0e8ef871e695b58fb40d89e28661 Mon Sep 17 00:00:00 2001
From: Miraty <miraty@antopie.org>
Date: Sat, 25 Jun 2022 16:43:58 +0200
Subject: [PATCH] Allow any unicode letter and number in user's values

---
 fn/auth.php              | 8 ++++----
 fn/ht.php                | 2 +-
 public/auth/register.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fn/auth.php b/fn/auth.php
index 204bdfa..07c7418 100644
--- a/fn/auth.php
+++ b/fn/auth.php
@@ -1,7 +1,7 @@
 <?php
 
-define("USERNAME_REGEX", "^[a-z]{4,32}$");
-define("PASSWORD_REGEX", "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]{8,1024}|.{10,1024}$");
+define("USERNAME_REGEX", "^[\p{L}\p{N}_-]{1,64}$");
+define("PASSWORD_REGEX", "^(?=.*[\p{Ll}])(?=.*[\p{Lu}])(?=.*[\p{N}]).{8,1024}|.{10,1024}$");
 
 define("PLACEHOLDER_USERNAME", "lain");
 define("PLACEHOLDER_PASSWORD", "••••••••••••••••••••••••");
@@ -15,12 +15,12 @@ define("OPTIONS_PASSWORD", array(
 ));
 
 function checkPasswordFormat($password) {
-	if (preg_match("/" . PASSWORD_REGEX . "/", $password) !== 1)
+	if (preg_match("/" . PASSWORD_REGEX . "/u", $password) !== 1)
 		userError("Password malformed.");
 }
 
 function checkUsernameFormat($username) {
-	if (preg_match("/" . USERNAME_REGEX . "/", $username) !== 1)
+	if (preg_match("/" . USERNAME_REGEX . "/u", $username) !== 1)
 		userError("Username malformed.");
 }
 
diff --git a/fn/ht.php b/fn/ht.php
index c65c20d..b36b50c 100644
--- a/fn/ht.php
+++ b/fn/ht.php
@@ -10,7 +10,7 @@ function listFsDirs($username) {
 	$absoluteDirs = glob(CONF['ht']['ht_path'] . "/" . $username . "/*/", GLOB_ONLYDIR);
 	$dirs = [];
 	foreach ($absoluteDirs as $absoluteDir)
-		if (preg_match("/^[a-z0-9-]{1,32}$/", basename($absoluteDir)))
+		if (preg_match("/^[\p{L}\p{N}_-]+$/u", basename($absoluteDir)))
 			array_push($dirs, basename($absoluteDir));
 	return $dirs;
 }
diff --git a/public/auth/register.php b/public/auth/register.php
index c6466d1..3486ef9 100644
--- a/public/auth/register.php
+++ b/public/auth/register.php
@@ -8,7 +8,7 @@
 		<summary><label for="username">Identifiant</label></summary>
 		Uniquement composé de lettres minuscules.
 	</details>
-	<input id="username" minlength="4" maxlength="32" pattern="<?= USERNAME_REGEX ?>" required="" name="username" type="text" placeholder="<?= PLACEHOLDER_USERNAME ?>"><br>
+	<input id="username" maxlength="32" pattern="<?= USERNAME_REGEX ?>" required="" name="username" type="text" placeholder="<?= PLACEHOLDER_USERNAME ?>"><br>
 
 	<details>
 		<summary><label for="password">Clé de passe</label></summary>