Only store user credentials when SMB_OC storage is enabled
Conflicts: apps/files_external/lib/smb_oc.php
This commit is contained in:
parent
8db4dd7585
commit
805be635fa
|
@ -13,12 +13,16 @@ require_once __DIR__ . '/../3rdparty/smb4php/smb.php';
|
||||||
class SMB_OC extends \OC\Files\Storage\SMB {
|
class SMB_OC extends \OC\Files\Storage\SMB {
|
||||||
private $username_as_share;
|
private $username_as_share;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array $params
|
||||||
|
* @throws \Exception
|
||||||
|
*/
|
||||||
public function __construct($params) {
|
public function __construct($params) {
|
||||||
if (isset($params['host']) && \OC::$server->getSession()->exists('smb-credentials')) {
|
if (isset($params['host']) && \OC::$server->getSession()->exists('smb-credentials')) {
|
||||||
$host=$params['host'];
|
$host=$params['host'];
|
||||||
$this->username_as_share = ($params['username_as_share'] === 'true');
|
$this->username_as_share = ($params['username_as_share'] === 'true');
|
||||||
|
|
||||||
$params_auth = \OC::$server->getSession()->get('smb-credentials');
|
$params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true);
|
||||||
$user = \OC::$server->getSession()->get('loginname');
|
$user = \OC::$server->getSession()->get('loginname');
|
||||||
$password = $params_auth['password'];
|
$password = $params_auth['password'];
|
||||||
|
|
||||||
|
@ -44,14 +48,35 @@ class SMB_OC extends \OC\Files\Storage\SMB {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function login( $params ) {
|
|
||||||
\OC::$server->getSession()->set('smb-credentials', $params);
|
/**
|
||||||
|
* Intercepts the user credentials on login and stores them
|
||||||
|
* encrypted inside the session if SMB_OC storage is enabled.
|
||||||
|
* @param array $params
|
||||||
|
*/
|
||||||
|
public static function login($params) {
|
||||||
|
$mountpoints = \OC_Mount_Config::getAbsoluteMountPoints($params['uid']);
|
||||||
|
$mountpointClasses = array();
|
||||||
|
foreach($mountpoints as $mountpoint) {
|
||||||
|
$mountpointClasses[$mountpoint['class']] = true;
|
||||||
|
}
|
||||||
|
if(isset($mountpointClasses['\OC\Files\Storage\SMB_OC'])) {
|
||||||
|
\OC::$server->getSession()->set('smb-credentials', \OC::$server->getCrypto()->encrypt(json_encode($params)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
public function isSharable($path) {
|
public function isSharable($path) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param bool $isPersonal
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
public function test($isPersonal = true) {
|
public function test($isPersonal = true) {
|
||||||
if ($isPersonal) {
|
if ($isPersonal) {
|
||||||
if ($this->stat('')) {
|
if ($this->stat('')) {
|
||||||
|
|
Loading…
Reference in New Issue