From 241cf3e302217d20d3f25c031b88c3b24fb4f8a1 Mon Sep 17 00:00:00 2001
From: ghost <localhost>
Date: Mon, 19 Feb 2024 20:43:42 +0200
Subject: [PATCH] use publication key regex as user name rule

---
 .env                              |  3 ---
 config/services.yaml              |  1 -
 src/Controller/UserController.php | 10 +++++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.env b/.env
index 12fc34d..26334a3 100644
--- a/.env
+++ b/.env
@@ -74,9 +74,6 @@ APP_SESSION_ONLINE_TIMEOUT=900
 # Moderators IP with extra permissions, separated with |
 APP_MODERATOR_REMOTE_IP=
 
-# User name regex condition
-APP_ADD_USER_NAME_REGEX=/^[0-9A-z-]{2,16}$/ui
-
 # User name reserved (case insensitive) separated with |
 APP_ADD_USER_NAME_BLACKLIST=KevaChat|admin|moderator|test
 
diff --git a/config/services.yaml b/config/services.yaml
index d37cadf..4a82d67 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -26,7 +26,6 @@ parameters:
     app.kevacoin.mine.solo.url: '%env(APP_KEVACOIN_MINE_SOLO_URL)%'
     app.session.default.timeout: '%env(APP_SESSION_DEFAULT_TIMEOUT)%'
     app.session.online.timeout: '%env(APP_SESSION_ONLINE_TIMEOUT)%'
-    app.add.user.name.regex: '%env(APP_ADD_USER_NAME_REGEX)%'
     app.add.user.name.blacklist: '%env(APP_ADD_USER_NAME_BLACKLIST)%'
     app.add.user.remote.ip.delay: '%env(APP_ADD_USER_REMOTE_IP_DELAY)%'
     app.add.room.remote.ip.regex: '%env(APP_ADD_ROOM_REMOTE_IP_REGEX)%'
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 89cca9f..1132c58 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -91,7 +91,7 @@ class UserController extends AbstractController
                         }
 
                         // Validate username regex
-                        if (!preg_match($this->getParameter('app.add.user.name.regex'), $user['key']))
+                        if (!preg_match($this->getParameter('app.add.post.key.regex'), $user['key']))
                         {
                             continue;
                         }
@@ -470,7 +470,7 @@ class UserController extends AbstractController
         }
 
         // Validate username regex
-        if (!preg_match($this->getParameter('app.add.user.name.regex'), $username))
+        if (!preg_match($this->getParameter('app.add.post.key.regex'), $username))
         {
             return $this->redirectToRoute(
                 'user_add',
@@ -478,7 +478,7 @@ class UserController extends AbstractController
                     'username' => $request->get('username'),
                     'error'    => sprintf(
                         $translator->trans('Username does not match node requirements: %s!'),
-                        $this->getParameter('app.add.user.name.regex')
+                        $this->getParameter('app.add.post.key.regex')
                     )
                 ]
             );
@@ -798,7 +798,7 @@ class UserController extends AbstractController
         }
 
         // Validate username regex
-        if (!preg_match($this->getParameter('app.add.user.name.regex'), $username))
+        if (!preg_match($this->getParameter('app.add.post.key.regex'), $username))
         {
             return $this->redirectToRoute(
                 'user_login',
@@ -806,7 +806,7 @@ class UserController extends AbstractController
                     'username' => $request->get('username'),
                     'error'    => sprintf(
                         $translator->trans('Username does not match node requirements: %s!'),
-                        $this->getParameter('app.add.user.name.regex')
+                        $this->getParameter('app.add.post.key.regex')
                     )
                 ]
             );