WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected encryption-problem with smbpasswords

This commit is contained in:
katagia 2003-06-21 19:45:06 +00:00
parent dddfd22211
commit 19ba486459
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lam/lib/account.inc
View File

@ -309,14 +309,20 @@ function checkunix($values, $type) { // This function checks all unix account pa
} }
function checksamba($values, $type) { // This function checks all samba account paramters function checksamba($values, $type) { // This function checks all samba account paramters
if ($values->unix_password != '') { $return = new account();
$iv = base64_decode($_COOKIE["IV"]); $iv = base64_decode($_COOKIE["IV"]);
$key = base64_decode($_COOKIE["Key"]); $key = base64_decode($_COOKIE["Key"]);
if ($values->smb_password != '') {
$values->smb_password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($values->smb_password), MCRYPT_MODE_ECB, $iv); $values->smb_password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($values->smb_password), MCRYPT_MODE_ECB, $iv);
$values->smb_password = str_replace(chr(00), '', $values->smb_password); $values->smb_password = str_replace(chr(00), '', $values->smb_password);
} }
$return = new account(); if ($values->smb_useunixpwd) {
if ($values->smb_useunixpwd) $return->smb_password = $values->unix_password; if ($values->unix_password != '') {
$values->unix_password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($values->unix_password), MCRYPT_MODE_ECB, $iv);
$values->unix_password = str_replace(chr(00), '', $values->unix_password);
}
$values->smb_password = $values->unix_password;
}
switch ($type) { switch ($type) {
case 'user' : case 'user' :
$return->smb_scriptPath = str_replace('$user', $values->general_username, $values->smb_scriptPath); $return->smb_scriptPath = str_replace('$user', $values->general_username, $values->smb_scriptPath);
@ -354,6 +360,12 @@ function checksamba($values, $type) { // This function checks all samba account
if ($values->smb_useunixpwd) $return->smb_useunixpwd = 1; else $return->smb_useunixpwd = 0; if ($values->smb_useunixpwd) $return->smb_useunixpwd = 1; else $return->smb_useunixpwd = 0;
if ($values->smb_pwdcanchange) $return->smb_pwdcanchange = 1; else $return->smb_pwdcanchange = 0; if ($values->smb_pwdcanchange) $return->smb_pwdcanchange = 1; else $return->smb_pwdcanchange = 0;
if ($values->smb_pwdmustchange) $return->smb_pwdmustchange = 1; else $return->smb_pwdmustchange = 0; if ($values->smb_pwdmustchange) $return->smb_pwdmustchange = 1; else $return->smb_pwdmustchange = 0;
if ($values->smb_password) {
// Encrypt password
$return->smb_password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $values->smb_password,
MCRYPT_MODE_ECB, $iv));
}
else $return->smb_password = "";
// Return values and errors // Return values and errors
if (!$errors) return array($return, ''); if (!$errors) return array($return, '');
else return array($return, $errors); else return array($return, $errors);

6
lam/templates/account.php
View File

@ -123,10 +123,13 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch
break; break;
case 'samba': case 'samba':
// Write all general values into $_SESSION['account'] // Write all general values into $_SESSION['account']
if ($_POST['f_smb_password']) if ($_POST['f_smb_password']) {
// Encrypt password // Encrypt password
$iv = base64_decode($_COOKIE["IV"]);
$key = base64_decode($_COOKIE["Key"]);
$_SESSION['account']->smb_password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, base64_decode($_COOKIE['Key']), $_POST['f_smb_password'], $_SESSION['account']->smb_password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, base64_decode($_COOKIE['Key']), $_POST['f_smb_password'],
MCRYPT_MODE_ECB, base64_decode($_COOKIE['IV']))); MCRYPT_MODE_ECB, base64_decode($_COOKIE['IV'])));
}
else $_SESSION['account']->smb_password = ""; else $_SESSION['account']->smb_password = "";
if ($_POST['f_smb_password_no']) $_SESSION['account']->smb_password_no = true; if ($_POST['f_smb_password_no']) $_SESSION['account']->smb_password_no = true;
else $_SESSION['account']->smb_password_no = false; else $_SESSION['account']->smb_password_no = false;
@ -654,6 +657,7 @@ switch ($select_local) { // Select which part of page will be loaded
// Samba Settings // Samba Settings
echo '<tr><td><input name="select" type="hidden" value="samba">'; echo _('Samba Properties'); echo '</td></tr>'."\n"; echo '<tr><td><input name="select" type="hidden" value="samba">'; echo _('Samba Properties'); echo '</td></tr>'."\n";
// decrypt password // decrypt password
// decrypt password
if ($_SESSION['account']->smb_password != '') { if ($_SESSION['account']->smb_password != '') {
$iv = base64_decode($_COOKIE["IV"]); $iv = base64_decode($_COOKIE["IV"]);
$key = base64_decode($_COOKIE["Key"]); $key = base64_decode($_COOKIE["Key"]);