mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct

This commit is contained in:
Michael Gapczynski 2012-08-13 17:07:56 -04:00
parent 863d3a43b2
commit 98c7d40fcd
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/files_external/lib/dropbox.php
View File

@ -30,9 +30,13 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
private static $tempFiles = array(); private static $tempFiles = array();
public function __construct($params) { public function __construct($params) {
if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['app_key']) && isset($params['app_secret']) && isset($params['token']) && isset($params['token_secret'])) {
$oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']); $oauth = new Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
$oauth->setToken($params['token'], $params['token_secret']); $oauth->setToken($params['token'], $params['token_secret']);
$this->dropbox = new Dropbox_API($oauth, 'dropbox'); $this->dropbox = new Dropbox_API($oauth, 'dropbox');
} else {
throw new Exception('Creating OC_Filestorage_Dropbox storage failed');
}
} }
private function getMetaData($path, $list = false) { private function getMetaData($path, $list = false) {
@ -43,6 +47,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
try { try {
$response = $this->dropbox->getMetaData($path); $response = $this->dropbox->getMetaData($path);
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
if ($response && isset($response['contents'])) { if ($response && isset($response['contents'])) {
@ -63,6 +68,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$this->metaData[$path] = $response; $this->metaData[$path] = $response;
return $response; return $response;
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
} }
@ -74,6 +80,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$this->dropbox->createFolder($path); $this->dropbox->createFolder($path);
return true; return true;
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
} }
@ -141,6 +148,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$this->dropbox->delete($path); $this->dropbox->delete($path);
return true; return true;
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
} }
@ -150,6 +158,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$this->dropbox->move($path1, $path2); $this->dropbox->move($path1, $path2);
return true; return true;
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
} }
@ -159,6 +168,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$this->dropbox->copy($path1, $path2); $this->dropbox->copy($path1, $path2);
return true; return true;
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
} }
@ -173,6 +183,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
file_put_contents($tmpFile, $data); file_put_contents($tmpFile, $data);
return fopen($tmpFile, 'r'); return fopen($tmpFile, 'r');
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
case 'w': case 'w':
@ -211,7 +222,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle); $this->dropbox->putFile(self::$tempFiles[$tmpFile], $handle);
unlink($tmpFile); unlink($tmpFile);
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
} }
} }
} }
@ -230,6 +241,7 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
$info = $this->dropbox->getAccountInfo(); $info = $this->dropbox->getAccountInfo();
return $info['quota_info']['quota'] - $info['quota_info']['normal']; return $info['quota_info']['quota'] - $info['quota_info']['normal'];
} catch (Exception $exception) { } catch (Exception $exception) {
OCP\Util::writeLog('files_external', $exception->getMessage(), OCP\Util::ERROR);
return false; return false;
} }
} }

12
apps/files_external/lib/google.php
View File

@ -31,13 +31,17 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
private static $tempFiles = array(); private static $tempFiles = array();
public function __construct($arguments) { public function __construct($params) {
$consumer_key = isset($arguments['consumer_key']) ? $arguments['consumer_key'] : 'anonymous'; if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['token']) && isset($params['token_secret'])) {
$consumer_secret = isset($arguments['consumer_secret']) ? $arguments['consumer_secret'] : 'anonymous'; $consumer_key = isset($params['consumer_key']) ? $params['consumer_key'] : 'anonymous';
$consumer_secret = isset($params['consumer_secret']) ? $params['consumer_secret'] : 'anonymous';
$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret); $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
$this->oauth_token = new OAuthToken($arguments['token'], $arguments['token_secret']); $this->oauth_token = new OAuthToken($params['token'], $params['token_secret']);
$this->sig_method = new OAuthSignatureMethod_HMAC_SHA1(); $this->sig_method = new OAuthSignatureMethod_HMAC_SHA1();
$this->entries = array(); $this->entries = array();
} else {
throw new Exception('Creating OC_Filestorage_Google storage failed');
}
} }
private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true, $returnHTTPCode = false) { private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true, $returnHTTPCode = false) {