maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

remove password-suggestion if a custom regex is defined; added password-complexity-settings for non-regex users to define what generated passwords should contain, thx to Marco Vogt; fixes #1216

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-11-10 10:07:32 +01:00
parent f5f7bc449a
commit 4cc3c01dcb
19 changed files with 152 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/formfields/admin/admin/formfield.admin_add.php
View File

@@ -38,6 +38,7 @@ return array(
'admin_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'def_language' => array(

1
lib/formfields/admin/admin/formfield.admin_edit.php
View File

@@ -47,6 +47,7 @@ return array(
'admin_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
),

1
lib/formfields/admin/customer/formfield.customer_add.php
View File

@@ -52,6 +52,7 @@ return array(
'new_customer_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'sendpassword' => array(

1
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@@ -58,6 +58,7 @@ return array(
'new_customer_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'def_language' => array(

1
lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
View File

@@ -37,6 +37,7 @@ return array(
'email_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
)
)

1
lib/formfields/customer/email/formfield.emails_addaccount.php
View File

@@ -37,6 +37,7 @@ return array(
'email_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'email_quota' => array(

1
lib/formfields/customer/extras/formfield.htpasswd_add.php
View File

@@ -43,6 +43,7 @@ return array(
'directory_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'directory_authname' => array(

1
lib/formfields/customer/extras/formfield.htpasswd_edit.php
View File

@@ -42,6 +42,7 @@ return array(
'directory_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'directory_authname' => array(

1
lib/formfields/customer/ftp/formfield.ftp_add.php
View File

@@ -53,6 +53,7 @@ return array(
'ftp_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'sendinfomail' => array(

1
lib/formfields/customer/ftp/formfield.ftp_edit.php
View File

@@ -49,6 +49,7 @@ return array(
'ftp_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
)
)

1
lib/formfields/customer/mysql/formfield.mysql_add.php
View File

@@ -41,6 +41,7 @@ return array(
'mysql_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
),
'sendinfomail' => array(

1
lib/formfields/customer/mysql/formfield.mysql_edit.php
View File

@@ -47,6 +47,7 @@ return array(
'mysql_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (Settings::Get('panel.password_regex') == ''),
'value' => generatePassword(),
)
)

28
lib/functions/froxlor/function.generatePassword.php
View File

@@ -19,8 +19,28 @@
* Generates a random password
*/
function generatePassword() {
return substr(
base64_encode(sha1(md5(uniqid(microtime(), 1))).md5(uniqid(microtime(), 1)).sha1(md5(uniqid(microtime(), 1)))),
rand(5, 50), (Settings::Get('panel.password_min_length') > 0 ? Settings::Get('panel.password_min_length') : 10)
);
$alpha_lower = 'abcdefghijklmnopqrstuvwxyz';
$alpha_upper = strtoupper($alpha_lower);
$numeric = '0123456789';
$special = Settings::Get('panel.password_special_char');
$length = Settings::Get('panel.password_min_length') > 3 ? Settings::Get('panel.password_min_length') : 10;
$pw = str_shuffle($alpha_lower);
$n = floor(($length)/4);
if (Settings::Get('panel.password_alpha_upper')) {
$pw .= substr(str_shuffle($alpha_upper), 0, $n);
}
if (Settings::Get('panel.password_numeric')) {
$pw .= substr(str_shuffle($numeric), 0, $n);
}
if (Settings::Get('panel.password_special_char_required')) {
$pw .= substr(str_shuffle($special), 0, $n);
}
$pw = substr($pw, -$length);
return str_shuffle($pw);
}

37
lib/functions/validate/function.validatePassword.php
View File

@@ -30,7 +30,7 @@ function validatePassword($password = null) {
if (Settings::Get('panel.password_min_length') > 0) {
$password = validate(
$password,
$password,
Settings::Get('panel.password_min_length'),
'/^.{'.(int)Settings::Get('panel.password_min_length').',}$/D',
'notrequiredpasswordlength'
@@ -39,11 +39,44 @@ function validatePassword($password = null) {
if (Settings::Get('panel.password_regex') != '') {
$password = validate(
$password,
$password,
Settings::Get('panel.password_regex'),
Settings::Get('panel.password_regex'),
'notrequiredpasswordcomplexity'
);
} else {
if (Settings::Get('panel.password_alpha_lower')) {
$password = validate(
$password,
'/.*[a-z]+.*/',
'/.*[a-z]+.*/',
'notrequiredpasswordcomplexity'
);
}
if (Settings::Get('panel.password_alpha_upper')) {
$password = validate(
$password,
'/.*[A-Z]+.*/',
'/.*[A-Z]+.*/',
'notrequiredpasswordcomplexity'
);
}
if (Settings::Get('panel.password_numeric')) {
$password = validate(
$password,
'/.*[0-9]+.*/',
'/.*[0-9]+.*/',
'notrequiredpasswordcomplexity'
);
}
if (Settings::Get('panel.password_special_char_required')) {
$password = validate(
$password,
'/.*[' . preg_quote(Settings::Get('panel.password_special_char')) . ']+.*/',
'/.*[' . preg_quote(Settings::Get('panel.password_special_char')) . ']+.*/',
'notrequiredpasswordcomplexity'
);
}
}
return $password;