bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-10-31 22:12:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1049: Fixed crypt() calling

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2020-02-26 19:52:33 +01:00
parent c0b1df9bb1
commit e169c09c4c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webui/model/user/auth.php
View File

@@ -577,7 +577,7 @@ class ModelUserAuth extends Model {
if($username == "" || $password == ""){ return 0; }
$query = $this->db->query("UPDATE " . TABLE_USER . " SET password=? WHERE uid=(SELECT uid FROM " . TABLE_EMAIL . " WHERE email=?)",
array(crypt($password, '$6$' . generate_random_string()), $username));
[encrypt_password($password), $username]);
$rc = $this->db->countAffected();

14
webui/model/user/user.php
View File

@@ -65,7 +65,7 @@ class ModelUserUser extends Model {
foreach ($query->rows as $q) {
array_push($data, $q['email']);
}
}
$emails = $this->get_email_addresses_from_groups($data);
@@ -350,12 +350,10 @@ class ModelUserUser extends Model {
return $user['username'];
}
$encrypted_password = crypt($user['password'], '$6$' . generate_random_string());
$samaccountname = '';
if(isset($user['samaccountname'])) { $samaccountname = $user['samaccountname']; }
$query = $this->db->query("INSERT INTO " . TABLE_USER . " (uid, username, realname, password, domain, dn, isadmin, samaccountname) VALUES(?,?,?,?,?,?,?,?)", array((int)$user['uid'], $user['username'], $user['realname'], $encrypted_password, $user['domain'], @$user['dn'], (int)$user['isadmin'], $samaccountname));
$query = $this->db->query("INSERT INTO " . TABLE_USER . " (uid, username, realname, password, domain, dn, isadmin, samaccountname) VALUES(?,?,?,?,?,?,?,?)", array((int)$user['uid'], $user['username'], $user['realname'], encrypt_password($user['password']), $user['domain'], @$user['dn'], (int)$user['isadmin'], $samaccountname));
if($query->error == 1 || $this->db->countAffected() == 0){ return $user['username']; }
@@ -420,9 +418,9 @@ class ModelUserUser extends Model {
/* update password field if we have to */
if(strlen($user['password']) >= MIN_PASSWORD_LENGTH) {
$query = $this->db->query("UPDATE " . TABLE_USER . " SET password=? WHERE uid=?", array(crypt($user['password']), (int)$user['uid']));
$query = $this->db->query("UPDATE " . TABLE_USER . " SET password=? WHERE uid=?", array(encrypt_password($user['password']), (int)$user['uid']));
if($this->db->countAffected() != 1) { return 0; }
}
@@ -468,7 +466,7 @@ class ModelUserUser extends Model {
$all_domains = $this->get_email_domains();
$submitted_domains = explode("\n", $domains);
foreach($submitted_domains as $d) {
$d = trim($d);
@@ -571,5 +569,3 @@ class ModelUserUser extends Model {
}
?>

5
webui/system/misc.php
View File

@@ -575,3 +575,8 @@ function htmlentities_on_array($arr = []) {
return $arr;
}
function encrypt_password($password = '') {
return crypt($password, '$6$rounds=5000$' . generate_random_string() . '$');
}