Merge pull request #174 from mdziekon/mdziekon/gh-150/registration-cl…

…eanup-3 Registration cleanup (part 3)
mdziekon · Mar 19, 2022 · 6cbf6d1 · 6cbf6d1
2 parents 161e766 + fcffe30
commit 6cbf6d1
Show file tree

Hide file tree

Showing 6 changed files with 402 additions and 151 deletions.
diff --git a/modules/registration/_includes.php b/modules/registration/_includes.php
@@ -8,11 +8,14 @@
 
     include($includePath . './components/RegistrationConfirmationMail/RegistrationConfirmationMail.component.php');
 
+    include($includePath . './input/normalization.input.php');
+
     include($includePath . './utils/cookies.utils.php');
     include($includePath . './utils/galaxy.utils.php');
     include($includePath . './utils/general.utils.php');
     include($includePath . './utils/queries.utils.php');
 
+    include($includePath . './validators/validateInputs.validators.php');
     include($includePath . './validators/validateTakenParams.validators.php');
     include($includePath . './validators/validateReCaptcha.validators.php');
 

diff --git a/modules/registration/input/index.php b/modules/registration/input/index.php
@@ -0,0 +1,5 @@
+<?php
+
+header("Location: ../index.php");
+
+?>
diff --git a/modules/registration/input/normalization.input.php b/modules/registration/input/normalization.input.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Registration\Input;
+
+/**
+ * @param $_GET|$_POST $input
+ * @param String $input['username']
+ * @param String $input['password']
+ * @param String $input['email']
+ * @param String $input['rules']
+ * @param String $input['galaxy']
+ * @param String $input['lang']
+ */
+function normalizeUserInput(&$input) {
+    $normalizedUsername = (
+        isset($input['username']) ?
+        trim($input['username']) :
+        null
+    );
+    $normalizedPassword = (
+        isset($input['password']) ?
+        trim($input['password']) :
+        null
+    );
+    $normalizedEmail = (
+        isset($input['email']) ?
+        trim($input['email']) :
+        null
+    );
+    $escapedEmail = getDBLink()->escape_string($normalizedEmail);
+    $normalizedHasAcceptedRules = (
+        isset($input['rules']) ?
+        ($input['rules'] == 'on') :
+        false
+    );
+    $normalizedGalaxyNo = (
+        isset($input['galaxy']) ?
+        intval($input['galaxy']) :
+        null
+    );
+    $normalizedLangCode = (
+        (
+            isset($input['lang']) &&
+            in_array($input['lang'], UNIENGINE_LANGS_AVAILABLE)
+        ) ?
+        $input['lang'] :
+        null
+    );
+    $normalizedCaptchaResponse = (
+        isset($input['captcha_response']) ?
+        $input['captcha_response'] :
+        null
+    );
+
+    return [
+        'username' => $normalizedUsername,
+        'password' => $normalizedPassword,
+        'email' => [
+            'original' => $normalizedEmail,
+            'escaped' => $escapedEmail
+        ],
+        'hasAcceptedRules' => $normalizedHasAcceptedRules,
+        'galaxyNo' => $normalizedGalaxyNo,
+        'langCode' => $normalizedLangCode,
+        'captchaResponse' => $normalizedCaptchaResponse,
+    ];
+}
+
+?>
diff --git a/modules/registration/utils/queries.utils.php b/modules/registration/utils/queries.utils.php
@@ -194,4 +194,25 @@ function incrementUsersCounterInGameConfig () {
     $_MemCache->GameConfig = $_GameConfig;
 }
 
+//  Arguments
+//      - $params (Object)
+//          - email (String)
+//
+function updateAllMailChanges ($params) {
+    // This confirmation type means that the process has been interrupted externally
+    $confirmType = "4";
+
+    $updateMailChangesQuery = (
+        "UPDATE {{table}} " .
+        "SET " .
+        "`ConfirmType` = {$confirmType} " .
+        "WHERE " .
+        "`NewMail` = '{$params['email']}' AND " .
+        "`ConfirmType` = 0 " .
+        ";"
+    );
+
+    doquery($updateMailChangesQuery, 'mailchange');
+}
+
 ?>
diff --git a/modules/registration/validators/validateInputs.validators.php b/modules/registration/validators/validateInputs.validators.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Registration\Validators;
+
+function _createFuncWithResultHelpers($func) {
+    return function ($arguments) use ($func) {
+        $createSuccess = function ($payload) {
+            return [
+                'isSuccess' => true,
+                'payload' => $payload,
+            ];
+        };
+        $createFailure = function ($payload) {
+            return [
+                'isSuccess' => false,
+                'error' => $payload,
+            ];
+        };
+
+        return $func($arguments, [
+            'createSuccess' => $createSuccess,
+            'createFailure' => $createFailure,
+        ]);
+    };
+}
+
+function _validateUsername($normalizedInput) {
+    $validator = function ($input, $resultHelpers) {
+        $value = $input['username'];
+
+        $minLength = 4;
+        $maxLenght = 64;
+
+        if (strlen($value) < $minLength) {
+            return $resultHelpers['createFailure']([
+                'code' => 'USERNAME_TOO_SHORT',
+                'minLength' => $minLength,
+            ]);
+        }
+        if (strlen($value) > $maxLenght) {
+            return $resultHelpers['createFailure']([
+                'code' => 'USERNAME_TOO_LONG',
+                'maxLength' => $maxLenght,
+            ]);
+        }
+        if (!preg_match(REGEXP_USERNAME_ABSOLUTE, $value)) {
+            return $resultHelpers['createFailure']([
+                'code' => 'USERNAME_INVALID',
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($normalizedInput);
+}
+
+function _validatePassword($normalizedInput) {
+    $validator = function ($input, $resultHelpers) {
+        $value = $input['password'];
+
+        $minLength = 4;
+
+        if (strlen($value) < $minLength) {
+            return $resultHelpers['createFailure']([
+                'code' => 'PASSWORD_TOO_SHORT',
+                'minLength' => $minLength,
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($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',
+            ]);
+        }
+        if ($value['escaped'] != $value['original']) {
+            return $resultHelpers['createFailure']([
+                'code' => 'EMAIL_HAS_ILLEGAL_CHARACTERS',
+            ]);
+        }
+        if (!is_email($value['escaped'])) {
+            return $resultHelpers['createFailure']([
+                'code' => 'EMAIL_INVALID',
+            ]);
+        }
+        if (!empty($bannedDomains) && preg_match('#('.$bannedDomains.')+#si', $value['escaped'])) {
+            return $resultHelpers['createFailure']([
+                'code' => 'EMAIL_ON_BANNED_DOMAIN',
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($normalizedInput);
+}
+
+function _validateGalaxyNo($normalizedInput) {
+    $validator = function ($input, $resultHelpers) {
+        $value = $input['galaxyNo'];
+
+        $minGalaxyNo = 1;
+        $maxGalaxyNo = MAX_GALAXY_IN_WORLD;
+
+        if ($value < $minGalaxyNo) {
+            return $resultHelpers['createFailure']([
+                'code' => 'GALAXY_NO_TOO_LOW',
+                'minLength' => $minGalaxyNo,
+            ]);
+        }
+        if ($value > $maxGalaxyNo) {
+            return $resultHelpers['createFailure']([
+                'code' => 'GALAXY_NO_TOO_HIGH',
+                'maxLength' => $maxGalaxyNo,
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($normalizedInput);
+}
+
+function _validateLangCode($normalizedInput) {
+    $validator = function ($input, $resultHelpers) {
+        $value = $input['langCode'];
+
+        if (empty($value)) {
+            return $resultHelpers['createFailure']([
+                'code' => 'LANG_CODE_EMPTY',
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($normalizedInput);
+}
+
+function _validateHasAcceptedRules($normalizedInput) {
+    $validator = function ($input, $resultHelpers) {
+        $value = $input['hasAcceptedRules'];
+
+        if ($value !== true) {
+            return $resultHelpers['createFailure']([
+                'code' => 'RULES_NOT_ACCEPTED',
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($normalizedInput);
+}
+
+function _validateAntiBot($normalizedInput, $params) {
+    $validator = function ($input, $resultHelpers) use ($params) {
+        if (!REGISTER_RECAPTCHA_ENABLE) {
+            return $resultHelpers['createSuccess']([]);
+        }
+
+        $value = $input['captchaResponse'];
+
+        $reCaptchaValidationResult = validateReCaptcha([
+            'responseValue' => $value,
+            'currentSessionIp' => $params['userSessionIp']
+        ]);
+
+        if (!($reCaptchaValidationResult['isValid'])) {
+            return $resultHelpers['createFailure']([
+                'code' => 'RECAPTCHA_VALIDATION_FAILED',
+            ]);
+        }
+
+        return $resultHelpers['createSuccess']([]);
+    };
+
+    return _createFuncWithResultHelpers($validator)($normalizedInput);
+}
+
+//  Arguments
+//      - $normalizedInput (Object)
+//
+function validateInputs($normalizedInput, $params) {
+    return [
+        'username' => _validateUsername($normalizedInput),
+        'password' => _validatePassword($normalizedInput),
+        'email' => _validateEmail($normalizedInput),
+        'galaxyNo' => _validateGalaxyNo($normalizedInput),
+        'langCode' => _validateLangCode($normalizedInput),
+        'hasAcceptedRules' => _validateHasAcceptedRules($normalizedInput),
+        'antiBot' => _validateAntiBot($normalizedInput, $params),
+    ];
+}
+
+?>