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

Merge pull request #23300 from owncloud/smb-not-available 

handle connection errors as storage not available in smb
This commit is contained in:
Thomas Müller 2016-03-16 16:50:35 +01:00
parent 2f5b929ee9 d498282e12
commit 596bc3bab2
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
apps/files_external/lib/smb.php
View File

@ -30,6 +30,7 @@
namespace OC\Files\Storage; namespace OC\Files\Storage;
use Icewind\SMB\Exception\ConnectException;
use Icewind\SMB\Exception\Exception; use Icewind\SMB\Exception\Exception;
use Icewind\SMB\Exception\ForbiddenException; use Icewind\SMB\Exception\ForbiddenException;
use Icewind\SMB\Exception\NotFoundException; use Icewind\SMB\Exception\NotFoundException;
@ -39,6 +40,7 @@ use Icewind\Streams\CallbackWrapper;
use Icewind\Streams\IteratorDirectory; use Icewind\Streams\IteratorDirectory;
use OC\Cache\CappedMemoryCache; use OC\Cache\CappedMemoryCache;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OCP\Files\StorageNotAvailableException;
class SMB extends Common { class SMB extends Common {
/** /**
@ -104,26 +106,36 @@ class SMB extends Common {
/** /**
* @param string $path * @param string $path
* @return \Icewind\SMB\IFileInfo * @return \Icewind\SMB\IFileInfo
* @throws StorageNotAvailableException
*/ */
protected function getFileInfo($path) { protected function getFileInfo($path) {
$path = $this->buildPath($path); try {
if (!isset($this->statCache[$path])) { $path = $this->buildPath($path);
$this->statCache[$path] = $this->share->stat($path); if (!isset($this->statCache[$path])) {
$this->statCache[$path] = $this->share->stat($path);
}
return $this->statCache[$path];
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
return $this->statCache[$path];
} }
/** /**
* @param string $path * @param string $path
* @return \Icewind\SMB\IFileInfo[] * @return \Icewind\SMB\IFileInfo[]
* @throws StorageNotAvailableException
*/ */
protected function getFolderContents($path) { protected function getFolderContents($path) {
$path = $this->buildPath($path); try {
$files = $this->share->dir($path); $path = $this->buildPath($path);
foreach ($files as $file) { $files = $this->share->dir($path);
$this->statCache[$path . '/' . $file->getName()] = $file; foreach ($files as $file) {
$this->statCache[$path . '/' . $file->getName()] = $file;
}
return $files;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
return $files;
} }
/** /**
@ -163,6 +175,8 @@ class SMB extends Common {
return false; return false;
} catch (ForbiddenException $e) { } catch (ForbiddenException $e) {
return false; return false;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
} }
@ -245,6 +259,8 @@ class SMB extends Common {
return false; return false;
} catch (ForbiddenException $e) { } catch (ForbiddenException $e) {
return false; return false;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
} }
@ -265,16 +281,22 @@ class SMB extends Common {
return false; return false;
} catch (ForbiddenException $e) { } catch (ForbiddenException $e) {
return false; return false;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
} }
public function touch($path, $time = null) { public function touch($path, $time = null) {
if (!$this->file_exists($path)) { try {
$fh = $this->share->write($this->buildPath($path)); if (!$this->file_exists($path)) {
fclose($fh); $fh = $this->share->write($this->buildPath($path));
return true; fclose($fh);
return true;
}
return false;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
return false;
} }
public function opendir($path) { public function opendir($path) {
@ -307,6 +329,8 @@ class SMB extends Common {
try { try {
$this->share->mkdir($path); $this->share->mkdir($path);
return true; return true;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} catch (Exception $e) { } catch (Exception $e) {
return false; return false;
} }
@ -320,6 +344,8 @@ class SMB extends Common {
return false; return false;
} catch (ForbiddenException $e) { } catch (ForbiddenException $e) {
return false; return false;
} catch (ConnectException $e) {
throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e);
} }
} }