YakumoLabs/user_external
4
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Double verify the SMB response

Browse Source 
In case anonymous auth is allowed this can otherwise lead to unexpected actions.
This commit is contained in:
Lukas Reschke
2016-09-09 10:58:01 +02:00
parent 43559a7804
commit 4492caa0e4
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/smb.php
View File

@@ -32,18 +32,14 @@ class OC_User_SMB extends \OCA\user_external\Base{
} }
/** /**
* Check if the password is correct without logging in the user * @param string $uid
* * @param string $password
* @param string $uid The username * @return bool
* @param string $password The password
*
* @return true/false
*/ */
public function checkPassword($uid, $password) { private function tryAuthentication($uid, $password) {
$uidEscaped=escapeshellarg($uid); $uidEscaped = escapeshellarg($uid);
$password=escapeshellarg($password); $password = escapeshellarg($password);
$result=array(); $command = self::SMBCLIENT.' '.escapeshellarg('//' . $this->host . '/dummy').' -U'.$uidEscaped.'%'.$password;
$command=self::SMBCLIENT.' '.escapeshellarg('//' . $this->host . '/dummy').' -U'.$uidEscaped.'%'.$password;
$lastline = exec($command, $output, $retval); $lastline = exec($command, $output, $retval);
if ($retval === 127) { if ($retval === 127) {
OCP\Util::writeLog( OCP\Util::writeLog(
@@ -66,8 +62,33 @@ class OC_User_SMB extends \OCA\user_external\Base{
return false; return false;
} else { } else {
login: login:
$this->storeUser($uid);
return $uid; return $uid;
} }
} }
/**
* Check if the password is correct without logging in the user
*
* @param string $uid The username
* @param string $password The password
*
* @return true/false
*/
public function checkPassword($uid, $password) {
// Check with an invalid password, if the user authenticates then fail
$attemptWithInvalidPassword = $this->tryAuthentication($uid, base64_encode($password));
if(is_string($attemptWithInvalidPassword)) {
return false;
}
// Check with valid password
$attemptWithValidPassword = $this->tryAuthentication($uid, $password);
if(is_string($attemptWithValidPassword)) {
$this->storeUser($uid);
return $uid;
}
return false;
}
} }