ftimme
2013-06-08 fe9a23f542bc56c1c0b6dc30257418e38ff7bd3a
- Fixed FS#2936 - Please check and limit username input length.
4 files modified
14 ■■■■ changed files
interface/web/sites/form/shell_user.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/de_shell_user.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_shell_user.lng 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/shell_user_edit.php 8 ●●●● patch | view | raw | blame | history
interface/web/sites/form/shell_user.tform.php
@@ -91,7 +91,7 @@
            'validators'    => array (     0 => array (    'type'    => 'UNIQUE',
                                                        'errmsg'=> 'username_error_unique'),
                                        1 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[\w\.\-]{0,64}$/',
                                                        'regex' => '/^[\w\.\-]{0,32}$/',
                                                        'errmsg'=> 'username_error_regex'),
                                    ),
            'default'    => '',
interface/web/sites/lib/lang/de_shell_user.lng
@@ -26,4 +26,6 @@
$wb['repeat_password_txt'] = 'Passwort wiederholen';
$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
$wb['username_must_not_exceed_32_chars_txt'] = 'Der Benutzername darf 32 Zeichen nicht überschreiten.';
$wb['username_not_allowed_txt'] = 'Der Benutzername ist nicht erlaubt.';
?>
interface/web/sites/lib/lang/en_shell_user.lng
@@ -26,4 +26,6 @@
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
$wb['username_not_allowed_txt'] = 'The username is not allowed.';
?>
interface/web/sites/shell_user_edit.php
@@ -121,7 +121,7 @@
        $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
        foreach($blacklist as $line) {
            if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
                $app->tform->errorMessage .= 'The username is not allowed.';
                $app->tform->errorMessage .= $app->tform->lng('username_not_allowed_txt');
            }
        }
        unset($blacklist);
@@ -138,6 +138,8 @@
            $this->dataRecord['username_prefix'] = $shelluser_prefix;
            /* restrict the names */
            $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
            if(strlen($this->dataRecord['username']) > 32) $app->tform->errorMessage .= $app->tform->lng("username_must_not_exceed_32_chars_txt");
        }
        parent::onBeforeInsert();
    }
@@ -166,7 +168,7 @@
        $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
        foreach($blacklist as $line) {
            if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
                $app->tform->errorMessage .= 'The username is not allowed.';
                $app->tform->errorMessage .= $app->tform->lng('username_not_allowed_txt');
            }
        }
        unset($blacklist);
@@ -188,6 +190,8 @@
            
            /* restrict the names */
            $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
            if(strlen($this->dataRecord['username']) > 32) $app->tform->errorMessage .= $app->tform->lng("username_must_not_exceed_32_chars_txt");
        }
    }