Commit 308a43a1 authored by Robin McCorkell's avatar Robin McCorkell
Browse files

Merge pull request #15076 from owncloud/fix-smb-oc-admin

Support constructing an SMB_OC without saved session credentials
parents 5fdc1716 1f3fdf17
...@@ -38,13 +38,20 @@ class SMB_OC extends SMB { ...@@ -38,13 +38,20 @@ class SMB_OC extends SMB {
* @throws \Exception * @throws \Exception
*/ */
public function __construct($params) { public function __construct($params) {
if (isset($params['host']) && \OC::$server->getSession()->exists('smb-credentials')) { if (isset($params['host'])) {
$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 = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true); // dummy credentials, unused, to satisfy constructor
$user = \OC::$server->getSession()->get('loginname'); $user = 'foo';
$password = $params_auth['password']; $password = 'bar';
if (\OC::$server->getSession()->exists('smb-credentials')) {
$params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true);
$user = \OC::$server->getSession()->get('loginname');
$password = $params_auth['password'];
} else {
// assume we are testing from the admin section
}
$root = isset($params['root']) ? $params['root'] : '/'; $root = isset($params['root']) ? $params['root'] : '/';
$share = ''; $share = '';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment