GH-224 Move banned domain checker to a common function

mdziekon · Jun 9, 2022 · a962a4c · a962a4c
1 parent 24bf057
commit a962a4c
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 19 deletions.
diff --git a/common/_includes.php b/common/_includes.php
@@ -4,4 +4,6 @@
 
 include($includePath . './exceptions.php');
 
+include($includePath . './modules/uni/utils/isEmailDomainBanned.util.php');
+
 ?>
diff --git a/common/modules/index.php b/common/modules/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/common/modules/uni/index.php b/common/modules/uni/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/common/modules/uni/utils/index.php b/common/modules/uni/utils/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/common/modules/uni/utils/isEmailDomainBanned.util.php b/common/modules/uni/utils/isEmailDomainBanned.util.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace UniEngine\Engine\Common\Modules\Uni\Utils;
+
+function isEmailDomainBanned($emailAddress) {
+    global $_GameConfig;
+
+    $bannedDomains = $_GameConfig['BannedMailDomains'];
+    $bannedDomains = str_replace('.', '\.', $bannedDomains);
+
+    if (empty($bannedDomains)) {
+        return false;
+    }
+
+    return preg_match('#('.$bannedDomains.')+#si', $emailAddress) === 1;
+}
+
+?>
diff --git a/modules/registration/validators/validateInputs.validators.php b/modules/registration/validators/validateInputs.validators.php
@@ -2,6 +2,8 @@
 
 namespace UniEngine\Engine\Modules\Registration\Validators;
 
+use UniEngine\Engine\Common\Modules\Uni;
+
 function _validateUsername($normalizedInput) {
     $validator = function ($input, $resultHelpers) {
         $value = $input['username'];
@@ -54,12 +56,8 @@ function _validatePassword($normalizedInput) {
 
 function _validateEmail($normalizedInput) {
     $validator = function ($input, $resultHelpers) {
-        global $_GameConfig;
-
         $value = $input['email'];
 
-        $bannedDomains = str_replace('.', '\.', $_GameConfig['BannedMailDomains']);
-
         if (empty($value['escaped'])) {
             return $resultHelpers['createFailure']([
                 'code' => 'EMAIL_EMPTY',
@@ -75,7 +73,7 @@ function _validateEmail($normalizedInput) {
                 'code' => 'EMAIL_INVALID',
             ]);
         }
-        if (!empty($bannedDomains) && preg_match('#('.$bannedDomains.')+#si', $value['escaped'])) {
+        if (Uni\Utils\isEmailDomainBanned($value['escaped'])) {
             return $resultHelpers['createFailure']([
                 'code' => 'EMAIL_ON_BANNED_DOMAIN',
             ]);

diff --git a/modules/settings/utils/validators/validateEmailChange.validator.php b/modules/settings/utils/validators/validateEmailChange.validator.php
@@ -2,19 +2,7 @@
 
 namespace UniEngine\Engine\Modules\Settings\Utils\Validators;
 
-// TODO: Deduplicate, registration does the same thing
-function _isOnDomainBanlist($emailAddress) {
-    global $_GameConfig;
-
-    $bannedDomains = $_GameConfig['BannedMailDomains'];
-    $bannedDomains = str_replace('.', '\.', $bannedDomains);
-
-    if (empty($bannedDomains)) {
-        return false;
-    }
-
-    return preg_match('#('.$bannedDomains.')+#si', $emailAddress) === 1;
-}
+use UniEngine\Engine\Common\Modules\Uni;
 
 /**
  * @param array $params
@@ -55,7 +43,7 @@ function validateEmailChange($params) {
                 'code' => 'NEW_EMAIL_CONFIRMATION_INVALID',
             ]);
         }
-        if (_isOnDomainBanlist($newEmailAddress)) {
+        if (Uni\Utils\isEmailDomainBanned($newEmailAddress)) {
             return $resultHelpers['createFailure']([
                 'code' => 'BANNED_DOMAIN_USED',
             ]);