@@ -32,61 +32,61 @@ |
||
32 | 32 | * This property contains multiple "share-type" elements, each containing a share type. |
33 | 33 | */ |
34 | 34 | class ShareTypeList implements Element { |
35 | - const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
35 | + const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
36 | 36 | |
37 | - /** |
|
38 | - * Share types |
|
39 | - * |
|
40 | - * @var int[] |
|
41 | - */ |
|
42 | - private $shareTypes; |
|
37 | + /** |
|
38 | + * Share types |
|
39 | + * |
|
40 | + * @var int[] |
|
41 | + */ |
|
42 | + private $shareTypes; |
|
43 | 43 | |
44 | - /** |
|
45 | - * @param int[] $shareTypes |
|
46 | - */ |
|
47 | - public function __construct($shareTypes) { |
|
48 | - $this->shareTypes = $shareTypes; |
|
49 | - } |
|
44 | + /** |
|
45 | + * @param int[] $shareTypes |
|
46 | + */ |
|
47 | + public function __construct($shareTypes) { |
|
48 | + $this->shareTypes = $shareTypes; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * Returns the share types |
|
53 | - * |
|
54 | - * @return int[] |
|
55 | - */ |
|
56 | - public function getShareTypes() { |
|
57 | - return $this->shareTypes; |
|
58 | - } |
|
51 | + /** |
|
52 | + * Returns the share types |
|
53 | + * |
|
54 | + * @return int[] |
|
55 | + */ |
|
56 | + public function getShareTypes() { |
|
57 | + return $this->shareTypes; |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * The deserialize method is called during xml parsing. |
|
62 | - * |
|
63 | - * @param Reader $reader |
|
64 | - * @return mixed |
|
65 | - */ |
|
66 | - static function xmlDeserialize(Reader $reader) { |
|
67 | - $shareTypes = []; |
|
60 | + /** |
|
61 | + * The deserialize method is called during xml parsing. |
|
62 | + * |
|
63 | + * @param Reader $reader |
|
64 | + * @return mixed |
|
65 | + */ |
|
66 | + static function xmlDeserialize(Reader $reader) { |
|
67 | + $shareTypes = []; |
|
68 | 68 | |
69 | - $tree = $reader->parseInnerTree(); |
|
70 | - if ($tree === null) { |
|
71 | - return null; |
|
72 | - } |
|
73 | - foreach ($tree as $elem) { |
|
74 | - if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') { |
|
75 | - $shareTypes[] = (int)$elem['value']; |
|
76 | - } |
|
77 | - } |
|
78 | - return new self($shareTypes); |
|
79 | - } |
|
69 | + $tree = $reader->parseInnerTree(); |
|
70 | + if ($tree === null) { |
|
71 | + return null; |
|
72 | + } |
|
73 | + foreach ($tree as $elem) { |
|
74 | + if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}share-type') { |
|
75 | + $shareTypes[] = (int)$elem['value']; |
|
76 | + } |
|
77 | + } |
|
78 | + return new self($shareTypes); |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * The xmlSerialize metod is called during xml writing. |
|
83 | - * |
|
84 | - * @param Writer $writer |
|
85 | - * @return void |
|
86 | - */ |
|
87 | - function xmlSerialize(Writer $writer) { |
|
88 | - foreach ($this->shareTypes as $shareType) { |
|
89 | - $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType); |
|
90 | - } |
|
91 | - } |
|
81 | + /** |
|
82 | + * The xmlSerialize metod is called during xml writing. |
|
83 | + * |
|
84 | + * @param Writer $writer |
|
85 | + * @return void |
|
86 | + */ |
|
87 | + function xmlSerialize(Writer $writer) { |
|
88 | + foreach ($this->shareTypes as $shareType) { |
|
89 | + $writer->writeElement('{' . self::NS_OWNCLOUD . '}share-type', $shareType); |
|
90 | + } |
|
91 | + } |
|
92 | 92 | } |
@@ -34,53 +34,53 @@ |
||
34 | 34 | use Sabre\HTTP\RequestInterface; |
35 | 35 | |
36 | 36 | class LockPlugin extends ServerPlugin { |
37 | - /** |
|
38 | - * Reference to main server object |
|
39 | - * |
|
40 | - * @var \Sabre\DAV\Server |
|
41 | - */ |
|
42 | - private $server; |
|
37 | + /** |
|
38 | + * Reference to main server object |
|
39 | + * |
|
40 | + * @var \Sabre\DAV\Server |
|
41 | + */ |
|
42 | + private $server; |
|
43 | 43 | |
44 | - /** |
|
45 | - * {@inheritdoc} |
|
46 | - */ |
|
47 | - public function initialize(\Sabre\DAV\Server $server) { |
|
48 | - $this->server = $server; |
|
49 | - $this->server->on('beforeMethod', [$this, 'getLock'], 50); |
|
50 | - $this->server->on('afterMethod', [$this, 'releaseLock'], 50); |
|
51 | - } |
|
44 | + /** |
|
45 | + * {@inheritdoc} |
|
46 | + */ |
|
47 | + public function initialize(\Sabre\DAV\Server $server) { |
|
48 | + $this->server = $server; |
|
49 | + $this->server->on('beforeMethod', [$this, 'getLock'], 50); |
|
50 | + $this->server->on('afterMethod', [$this, 'releaseLock'], 50); |
|
51 | + } |
|
52 | 52 | |
53 | - public function getLock(RequestInterface $request) { |
|
54 | - // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree |
|
55 | - // so instead we limit ourselves to the PUT method manually |
|
56 | - if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) { |
|
57 | - return; |
|
58 | - } |
|
59 | - try { |
|
60 | - $node = $this->server->tree->getNodeForPath($request->getPath()); |
|
61 | - } catch (NotFound $e) { |
|
62 | - return; |
|
63 | - } |
|
64 | - if ($node instanceof Node) { |
|
65 | - try { |
|
66 | - $node->acquireLock(ILockingProvider::LOCK_SHARED); |
|
67 | - } catch (LockedException $e) { |
|
68 | - throw new FileLocked($e->getMessage(), $e->getCode(), $e); |
|
69 | - } |
|
70 | - } |
|
71 | - } |
|
53 | + public function getLock(RequestInterface $request) { |
|
54 | + // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree |
|
55 | + // so instead we limit ourselves to the PUT method manually |
|
56 | + if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) { |
|
57 | + return; |
|
58 | + } |
|
59 | + try { |
|
60 | + $node = $this->server->tree->getNodeForPath($request->getPath()); |
|
61 | + } catch (NotFound $e) { |
|
62 | + return; |
|
63 | + } |
|
64 | + if ($node instanceof Node) { |
|
65 | + try { |
|
66 | + $node->acquireLock(ILockingProvider::LOCK_SHARED); |
|
67 | + } catch (LockedException $e) { |
|
68 | + throw new FileLocked($e->getMessage(), $e->getCode(), $e); |
|
69 | + } |
|
70 | + } |
|
71 | + } |
|
72 | 72 | |
73 | - public function releaseLock(RequestInterface $request) { |
|
74 | - if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) { |
|
75 | - return; |
|
76 | - } |
|
77 | - try { |
|
78 | - $node = $this->server->tree->getNodeForPath($request->getPath()); |
|
79 | - } catch (NotFound $e) { |
|
80 | - return; |
|
81 | - } |
|
82 | - if ($node instanceof Node) { |
|
83 | - $node->releaseLock(ILockingProvider::LOCK_SHARED); |
|
84 | - } |
|
85 | - } |
|
73 | + public function releaseLock(RequestInterface $request) { |
|
74 | + if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) { |
|
75 | + return; |
|
76 | + } |
|
77 | + try { |
|
78 | + $node = $this->server->tree->getNodeForPath($request->getPath()); |
|
79 | + } catch (NotFound $e) { |
|
80 | + return; |
|
81 | + } |
|
82 | + if ($node instanceof Node) { |
|
83 | + $node->releaseLock(ILockingProvider::LOCK_SHARED); |
|
84 | + } |
|
85 | + } |
|
86 | 86 | } |
@@ -24,42 +24,42 @@ |
||
24 | 24 | |
25 | 25 | class Forbidden extends \Sabre\DAV\Exception\Forbidden { |
26 | 26 | |
27 | - const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
27 | + const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
28 | 28 | |
29 | - /** |
|
30 | - * @var bool |
|
31 | - */ |
|
32 | - private $retry; |
|
29 | + /** |
|
30 | + * @var bool |
|
31 | + */ |
|
32 | + private $retry; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @param string $message |
|
36 | - * @param bool $retry |
|
37 | - * @param \Exception $previous |
|
38 | - */ |
|
39 | - public function __construct($message, $retry = false, \Exception $previous = null) { |
|
40 | - parent::__construct($message, 0, $previous); |
|
41 | - $this->retry = $retry; |
|
42 | - } |
|
34 | + /** |
|
35 | + * @param string $message |
|
36 | + * @param bool $retry |
|
37 | + * @param \Exception $previous |
|
38 | + */ |
|
39 | + public function __construct($message, $retry = false, \Exception $previous = null) { |
|
40 | + parent::__construct($message, 0, $previous); |
|
41 | + $this->retry = $retry; |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * This method allows the exception to include additional information |
|
46 | - * into the WebDAV error response |
|
47 | - * |
|
48 | - * @param \Sabre\DAV\Server $server |
|
49 | - * @param \DOMElement $errorNode |
|
50 | - * @return void |
|
51 | - */ |
|
52 | - public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) { |
|
44 | + /** |
|
45 | + * This method allows the exception to include additional information |
|
46 | + * into the WebDAV error response |
|
47 | + * |
|
48 | + * @param \Sabre\DAV\Server $server |
|
49 | + * @param \DOMElement $errorNode |
|
50 | + * @return void |
|
51 | + */ |
|
52 | + public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) { |
|
53 | 53 | |
54 | - // set ownCloud namespace |
|
55 | - $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD); |
|
54 | + // set ownCloud namespace |
|
55 | + $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD); |
|
56 | 56 | |
57 | - // adding the retry node |
|
58 | - $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true)); |
|
59 | - $errorNode->appendChild($error); |
|
57 | + // adding the retry node |
|
58 | + $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true)); |
|
59 | + $errorNode->appendChild($error); |
|
60 | 60 | |
61 | - // adding the message node |
|
62 | - $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage()); |
|
63 | - $errorNode->appendChild($error); |
|
64 | - } |
|
61 | + // adding the message node |
|
62 | + $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage()); |
|
63 | + $errorNode->appendChild($error); |
|
64 | + } |
|
65 | 65 | } |
@@ -26,53 +26,53 @@ |
||
26 | 26 | |
27 | 27 | class InvalidPath extends Exception { |
28 | 28 | |
29 | - const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
29 | + const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
30 | 30 | |
31 | - /** |
|
32 | - * @var bool |
|
33 | - */ |
|
34 | - private $retry; |
|
31 | + /** |
|
32 | + * @var bool |
|
33 | + */ |
|
34 | + private $retry; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param string $message |
|
38 | - * @param bool $retry |
|
39 | - */ |
|
40 | - public function __construct($message, $retry = false) { |
|
41 | - parent::__construct($message); |
|
42 | - $this->retry = $retry; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param string $message |
|
38 | + * @param bool $retry |
|
39 | + */ |
|
40 | + public function __construct($message, $retry = false) { |
|
41 | + parent::__construct($message); |
|
42 | + $this->retry = $retry; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * Returns the HTTP status code for this exception |
|
47 | - * |
|
48 | - * @return int |
|
49 | - */ |
|
50 | - public function getHTTPCode() { |
|
45 | + /** |
|
46 | + * Returns the HTTP status code for this exception |
|
47 | + * |
|
48 | + * @return int |
|
49 | + */ |
|
50 | + public function getHTTPCode() { |
|
51 | 51 | |
52 | - return 400; |
|
52 | + return 400; |
|
53 | 53 | |
54 | - } |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * This method allows the exception to include additional information |
|
58 | - * into the WebDAV error response |
|
59 | - * |
|
60 | - * @param \Sabre\DAV\Server $server |
|
61 | - * @param \DOMElement $errorNode |
|
62 | - * @return void |
|
63 | - */ |
|
64 | - public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) { |
|
56 | + /** |
|
57 | + * This method allows the exception to include additional information |
|
58 | + * into the WebDAV error response |
|
59 | + * |
|
60 | + * @param \Sabre\DAV\Server $server |
|
61 | + * @param \DOMElement $errorNode |
|
62 | + * @return void |
|
63 | + */ |
|
64 | + public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) { |
|
65 | 65 | |
66 | - // set ownCloud namespace |
|
67 | - $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD); |
|
66 | + // set ownCloud namespace |
|
67 | + $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD); |
|
68 | 68 | |
69 | - // adding the retry node |
|
70 | - $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true)); |
|
71 | - $errorNode->appendChild($error); |
|
69 | + // adding the retry node |
|
70 | + $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true)); |
|
71 | + $errorNode->appendChild($error); |
|
72 | 72 | |
73 | - // adding the message node |
|
74 | - $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage()); |
|
75 | - $errorNode->appendChild($error); |
|
76 | - } |
|
73 | + // adding the message node |
|
74 | + $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage()); |
|
75 | + $errorNode->appendChild($error); |
|
76 | + } |
|
77 | 77 | |
78 | 78 | } |
@@ -29,27 +29,27 @@ |
||
29 | 29 | |
30 | 30 | class PasswordLoginForbidden extends NotAuthenticated { |
31 | 31 | |
32 | - const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
33 | - |
|
34 | - public function getHTTPCode() { |
|
35 | - return 401; |
|
36 | - } |
|
37 | - |
|
38 | - /** |
|
39 | - * This method allows the exception to include additional information |
|
40 | - * into the WebDAV error response |
|
41 | - * |
|
42 | - * @param Server $server |
|
43 | - * @param DOMElement $errorNode |
|
44 | - * @return void |
|
45 | - */ |
|
46 | - public function serialize(Server $server, DOMElement $errorNode) { |
|
47 | - |
|
48 | - // set ownCloud namespace |
|
49 | - $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD); |
|
50 | - |
|
51 | - $error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'password login forbidden'); |
|
52 | - $errorNode->appendChild($error); |
|
53 | - } |
|
32 | + const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
33 | + |
|
34 | + public function getHTTPCode() { |
|
35 | + return 401; |
|
36 | + } |
|
37 | + |
|
38 | + /** |
|
39 | + * This method allows the exception to include additional information |
|
40 | + * into the WebDAV error response |
|
41 | + * |
|
42 | + * @param Server $server |
|
43 | + * @param DOMElement $errorNode |
|
44 | + * @return void |
|
45 | + */ |
|
46 | + public function serialize(Server $server, DOMElement $errorNode) { |
|
47 | + |
|
48 | + // set ownCloud namespace |
|
49 | + $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD); |
|
50 | + |
|
51 | + $error = $errorNode->ownerDocument->createElementNS('o:', 'o:hint', 'password login forbidden'); |
|
52 | + $errorNode->appendChild($error); |
|
53 | + } |
|
54 | 54 | |
55 | 55 | } |
@@ -30,20 +30,20 @@ |
||
30 | 30 | |
31 | 31 | class FileLocked extends \Sabre\DAV\Exception { |
32 | 32 | |
33 | - public function __construct($message = "", $code = 0, Exception $previous = null) { |
|
34 | - if($previous instanceof \OCP\Files\LockNotAcquiredException) { |
|
35 | - $message = sprintf('Target file %s is locked by another process.', $previous->path); |
|
36 | - } |
|
37 | - parent::__construct($message, $code, $previous); |
|
38 | - } |
|
33 | + public function __construct($message = "", $code = 0, Exception $previous = null) { |
|
34 | + if($previous instanceof \OCP\Files\LockNotAcquiredException) { |
|
35 | + $message = sprintf('Target file %s is locked by another process.', $previous->path); |
|
36 | + } |
|
37 | + parent::__construct($message, $code, $previous); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Returns the HTTP status code for this exception |
|
42 | - * |
|
43 | - * @return int |
|
44 | - */ |
|
45 | - public function getHTTPCode() { |
|
40 | + /** |
|
41 | + * Returns the HTTP status code for this exception |
|
42 | + * |
|
43 | + * @return int |
|
44 | + */ |
|
45 | + public function getHTTPCode() { |
|
46 | 46 | |
47 | - return 423; |
|
48 | - } |
|
47 | + return 423; |
|
48 | + } |
|
49 | 49 | } |
@@ -31,15 +31,15 @@ |
||
31 | 31 | */ |
32 | 32 | class UnsupportedMediaType extends \Sabre\DAV\Exception { |
33 | 33 | |
34 | - /** |
|
35 | - * Returns the HTTP status code for this exception |
|
36 | - * |
|
37 | - * @return int |
|
38 | - */ |
|
39 | - public function getHTTPCode() { |
|
34 | + /** |
|
35 | + * Returns the HTTP status code for this exception |
|
36 | + * |
|
37 | + * @return int |
|
38 | + */ |
|
39 | + public function getHTTPCode() { |
|
40 | 40 | |
41 | - return 415; |
|
41 | + return 415; |
|
42 | 42 | |
43 | - } |
|
43 | + } |
|
44 | 44 | |
45 | 45 | } |
@@ -31,15 +31,15 @@ |
||
31 | 31 | */ |
32 | 32 | class EntityTooLarge extends \Sabre\DAV\Exception { |
33 | 33 | |
34 | - /** |
|
35 | - * Returns the HTTP status code for this exception |
|
36 | - * |
|
37 | - * @return int |
|
38 | - */ |
|
39 | - public function getHTTPCode() { |
|
34 | + /** |
|
35 | + * Returns the HTTP status code for this exception |
|
36 | + * |
|
37 | + * @return int |
|
38 | + */ |
|
39 | + public function getHTTPCode() { |
|
40 | 40 | |
41 | - return 413; |
|
41 | + return 413; |
|
42 | 42 | |
43 | - } |
|
43 | + } |
|
44 | 44 | |
45 | 45 | } |
@@ -42,158 +42,158 @@ |
||
42 | 42 | use Sabre\DAV\Auth\Backend\BackendInterface; |
43 | 43 | |
44 | 44 | class ServerFactory { |
45 | - /** @var IConfig */ |
|
46 | - private $config; |
|
47 | - /** @var ILogger */ |
|
48 | - private $logger; |
|
49 | - /** @var IDBConnection */ |
|
50 | - private $databaseConnection; |
|
51 | - /** @var IUserSession */ |
|
52 | - private $userSession; |
|
53 | - /** @var IMountManager */ |
|
54 | - private $mountManager; |
|
55 | - /** @var ITagManager */ |
|
56 | - private $tagManager; |
|
57 | - /** @var IRequest */ |
|
58 | - private $request; |
|
59 | - /** @var IPreview */ |
|
60 | - private $previewManager; |
|
45 | + /** @var IConfig */ |
|
46 | + private $config; |
|
47 | + /** @var ILogger */ |
|
48 | + private $logger; |
|
49 | + /** @var IDBConnection */ |
|
50 | + private $databaseConnection; |
|
51 | + /** @var IUserSession */ |
|
52 | + private $userSession; |
|
53 | + /** @var IMountManager */ |
|
54 | + private $mountManager; |
|
55 | + /** @var ITagManager */ |
|
56 | + private $tagManager; |
|
57 | + /** @var IRequest */ |
|
58 | + private $request; |
|
59 | + /** @var IPreview */ |
|
60 | + private $previewManager; |
|
61 | 61 | |
62 | - /** |
|
63 | - * @param IConfig $config |
|
64 | - * @param ILogger $logger |
|
65 | - * @param IDBConnection $databaseConnection |
|
66 | - * @param IUserSession $userSession |
|
67 | - * @param IMountManager $mountManager |
|
68 | - * @param ITagManager $tagManager |
|
69 | - * @param IRequest $request |
|
70 | - * @param IPreview $previewManager |
|
71 | - */ |
|
72 | - public function __construct( |
|
73 | - IConfig $config, |
|
74 | - ILogger $logger, |
|
75 | - IDBConnection $databaseConnection, |
|
76 | - IUserSession $userSession, |
|
77 | - IMountManager $mountManager, |
|
78 | - ITagManager $tagManager, |
|
79 | - IRequest $request, |
|
80 | - IPreview $previewManager |
|
81 | - ) { |
|
82 | - $this->config = $config; |
|
83 | - $this->logger = $logger; |
|
84 | - $this->databaseConnection = $databaseConnection; |
|
85 | - $this->userSession = $userSession; |
|
86 | - $this->mountManager = $mountManager; |
|
87 | - $this->tagManager = $tagManager; |
|
88 | - $this->request = $request; |
|
89 | - $this->previewManager = $previewManager; |
|
90 | - } |
|
62 | + /** |
|
63 | + * @param IConfig $config |
|
64 | + * @param ILogger $logger |
|
65 | + * @param IDBConnection $databaseConnection |
|
66 | + * @param IUserSession $userSession |
|
67 | + * @param IMountManager $mountManager |
|
68 | + * @param ITagManager $tagManager |
|
69 | + * @param IRequest $request |
|
70 | + * @param IPreview $previewManager |
|
71 | + */ |
|
72 | + public function __construct( |
|
73 | + IConfig $config, |
|
74 | + ILogger $logger, |
|
75 | + IDBConnection $databaseConnection, |
|
76 | + IUserSession $userSession, |
|
77 | + IMountManager $mountManager, |
|
78 | + ITagManager $tagManager, |
|
79 | + IRequest $request, |
|
80 | + IPreview $previewManager |
|
81 | + ) { |
|
82 | + $this->config = $config; |
|
83 | + $this->logger = $logger; |
|
84 | + $this->databaseConnection = $databaseConnection; |
|
85 | + $this->userSession = $userSession; |
|
86 | + $this->mountManager = $mountManager; |
|
87 | + $this->tagManager = $tagManager; |
|
88 | + $this->request = $request; |
|
89 | + $this->previewManager = $previewManager; |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * @param string $baseUri |
|
94 | - * @param string $requestUri |
|
95 | - * @param BackendInterface $authBackend |
|
96 | - * @param callable $viewCallBack callback that should return the view for the dav endpoint |
|
97 | - * @return Server |
|
98 | - */ |
|
99 | - public function createServer($baseUri, |
|
100 | - $requestUri, |
|
101 | - BackendInterface $authBackend, |
|
102 | - callable $viewCallBack) { |
|
103 | - // Fire up server |
|
104 | - $objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree(); |
|
105 | - $server = new \OCA\DAV\Connector\Sabre\Server($objectTree); |
|
106 | - // Set URL explicitly due to reverse-proxy situations |
|
107 | - $server->httpRequest->setUrl($requestUri); |
|
108 | - $server->setBaseUri($baseUri); |
|
92 | + /** |
|
93 | + * @param string $baseUri |
|
94 | + * @param string $requestUri |
|
95 | + * @param BackendInterface $authBackend |
|
96 | + * @param callable $viewCallBack callback that should return the view for the dav endpoint |
|
97 | + * @return Server |
|
98 | + */ |
|
99 | + public function createServer($baseUri, |
|
100 | + $requestUri, |
|
101 | + BackendInterface $authBackend, |
|
102 | + callable $viewCallBack) { |
|
103 | + // Fire up server |
|
104 | + $objectTree = new \OCA\DAV\Connector\Sabre\ObjectTree(); |
|
105 | + $server = new \OCA\DAV\Connector\Sabre\Server($objectTree); |
|
106 | + // Set URL explicitly due to reverse-proxy situations |
|
107 | + $server->httpRequest->setUrl($requestUri); |
|
108 | + $server->setBaseUri($baseUri); |
|
109 | 109 | |
110 | - // Load plugins |
|
111 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config)); |
|
112 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config)); |
|
113 | - $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend)); |
|
114 | - // FIXME: The following line is a workaround for legacy components relying on being able to send a GET to / |
|
115 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin()); |
|
116 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger)); |
|
117 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin()); |
|
118 | - // Some WebDAV clients do require Class 2 WebDAV support (locking), since |
|
119 | - // we do not provide locking we emulate it using a fake locking plugin. |
|
120 | - if($this->request->isUserAgent([ |
|
121 | - '/WebDAVFS/', |
|
122 | - '/Microsoft Office OneNote 2013/', |
|
123 | - '/Microsoft-WebDAV-MiniRedir/', |
|
124 | - ])) { |
|
125 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin()); |
|
126 | - } |
|
110 | + // Load plugins |
|
111 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\MaintenancePlugin($this->config)); |
|
112 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\BlockLegacyClientPlugin($this->config)); |
|
113 | + $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend)); |
|
114 | + // FIXME: The following line is a workaround for legacy components relying on being able to send a GET to / |
|
115 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\DummyGetResponsePlugin()); |
|
116 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger)); |
|
117 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\LockPlugin()); |
|
118 | + // Some WebDAV clients do require Class 2 WebDAV support (locking), since |
|
119 | + // we do not provide locking we emulate it using a fake locking plugin. |
|
120 | + if($this->request->isUserAgent([ |
|
121 | + '/WebDAVFS/', |
|
122 | + '/Microsoft Office OneNote 2013/', |
|
123 | + '/Microsoft-WebDAV-MiniRedir/', |
|
124 | + ])) { |
|
125 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\FakeLockerPlugin()); |
|
126 | + } |
|
127 | 127 | |
128 | - if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) { |
|
129 | - $server->addPlugin(new BrowserErrorPagePlugin()); |
|
130 | - } |
|
128 | + if (BrowserErrorPagePlugin::isBrowserRequest($this->request)) { |
|
129 | + $server->addPlugin(new BrowserErrorPagePlugin()); |
|
130 | + } |
|
131 | 131 | |
132 | - // wait with registering these until auth is handled and the filesystem is setup |
|
133 | - $server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) { |
|
134 | - // ensure the skeleton is copied |
|
135 | - $userFolder = \OC::$server->getUserFolder(); |
|
132 | + // wait with registering these until auth is handled and the filesystem is setup |
|
133 | + $server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) { |
|
134 | + // ensure the skeleton is copied |
|
135 | + $userFolder = \OC::$server->getUserFolder(); |
|
136 | 136 | |
137 | - /** @var \OC\Files\View $view */ |
|
138 | - $view = $viewCallBack($server); |
|
139 | - if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) { |
|
140 | - $rootInfo = $userFolder; |
|
141 | - } else { |
|
142 | - $rootInfo = $view->getFileInfo(''); |
|
143 | - } |
|
137 | + /** @var \OC\Files\View $view */ |
|
138 | + $view = $viewCallBack($server); |
|
139 | + if ($userFolder instanceof Folder && $userFolder->getPath() === $view->getRoot()) { |
|
140 | + $rootInfo = $userFolder; |
|
141 | + } else { |
|
142 | + $rootInfo = $view->getFileInfo(''); |
|
143 | + } |
|
144 | 144 | |
145 | - // Create ownCloud Dir |
|
146 | - if ($rootInfo->getType() === 'dir') { |
|
147 | - $root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree); |
|
148 | - } else { |
|
149 | - $root = new \OCA\DAV\Connector\Sabre\File($view, $rootInfo); |
|
150 | - } |
|
151 | - $objectTree->init($root, $view, $this->mountManager); |
|
145 | + // Create ownCloud Dir |
|
146 | + if ($rootInfo->getType() === 'dir') { |
|
147 | + $root = new \OCA\DAV\Connector\Sabre\Directory($view, $rootInfo, $objectTree); |
|
148 | + } else { |
|
149 | + $root = new \OCA\DAV\Connector\Sabre\File($view, $rootInfo); |
|
150 | + } |
|
151 | + $objectTree->init($root, $view, $this->mountManager); |
|
152 | 152 | |
153 | - $server->addPlugin( |
|
154 | - new \OCA\DAV\Connector\Sabre\FilesPlugin( |
|
155 | - $objectTree, |
|
156 | - $this->config, |
|
157 | - $this->request, |
|
158 | - $this->previewManager, |
|
159 | - false, |
|
160 | - !$this->config->getSystemValue('debug', false) |
|
161 | - ) |
|
162 | - ); |
|
163 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view)); |
|
153 | + $server->addPlugin( |
|
154 | + new \OCA\DAV\Connector\Sabre\FilesPlugin( |
|
155 | + $objectTree, |
|
156 | + $this->config, |
|
157 | + $this->request, |
|
158 | + $this->previewManager, |
|
159 | + false, |
|
160 | + !$this->config->getSystemValue('debug', false) |
|
161 | + ) |
|
162 | + ); |
|
163 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\QuotaPlugin($view)); |
|
164 | 164 | |
165 | - if($this->userSession->isLoggedIn()) { |
|
166 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager)); |
|
167 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin( |
|
168 | - $objectTree, |
|
169 | - $this->userSession, |
|
170 | - $userFolder, |
|
171 | - \OC::$server->getShareManager() |
|
172 | - )); |
|
173 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin(\OC::$server->getCommentsManager(), $this->userSession)); |
|
174 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\FilesReportPlugin( |
|
175 | - $objectTree, |
|
176 | - $view, |
|
177 | - \OC::$server->getSystemTagManager(), |
|
178 | - \OC::$server->getSystemTagObjectMapper(), |
|
179 | - \OC::$server->getTagManager(), |
|
180 | - $this->userSession, |
|
181 | - \OC::$server->getGroupManager(), |
|
182 | - $userFolder |
|
183 | - )); |
|
184 | - // custom properties plugin must be the last one |
|
185 | - $server->addPlugin( |
|
186 | - new \Sabre\DAV\PropertyStorage\Plugin( |
|
187 | - new \OCA\DAV\Connector\Sabre\CustomPropertiesBackend( |
|
188 | - $objectTree, |
|
189 | - $this->databaseConnection, |
|
190 | - $this->userSession->getUser() |
|
191 | - ) |
|
192 | - ) |
|
193 | - ); |
|
194 | - } |
|
195 | - $server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin()); |
|
196 | - }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request |
|
197 | - return $server; |
|
198 | - } |
|
165 | + if($this->userSession->isLoggedIn()) { |
|
166 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\TagsPlugin($objectTree, $this->tagManager)); |
|
167 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\SharesPlugin( |
|
168 | + $objectTree, |
|
169 | + $this->userSession, |
|
170 | + $userFolder, |
|
171 | + \OC::$server->getShareManager() |
|
172 | + )); |
|
173 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\CommentPropertiesPlugin(\OC::$server->getCommentsManager(), $this->userSession)); |
|
174 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\FilesReportPlugin( |
|
175 | + $objectTree, |
|
176 | + $view, |
|
177 | + \OC::$server->getSystemTagManager(), |
|
178 | + \OC::$server->getSystemTagObjectMapper(), |
|
179 | + \OC::$server->getTagManager(), |
|
180 | + $this->userSession, |
|
181 | + \OC::$server->getGroupManager(), |
|
182 | + $userFolder |
|
183 | + )); |
|
184 | + // custom properties plugin must be the last one |
|
185 | + $server->addPlugin( |
|
186 | + new \Sabre\DAV\PropertyStorage\Plugin( |
|
187 | + new \OCA\DAV\Connector\Sabre\CustomPropertiesBackend( |
|
188 | + $objectTree, |
|
189 | + $this->databaseConnection, |
|
190 | + $this->userSession->getUser() |
|
191 | + ) |
|
192 | + ) |
|
193 | + ); |
|
194 | + } |
|
195 | + $server->addPlugin(new \OCA\DAV\Connector\Sabre\CopyEtagHeaderPlugin()); |
|
196 | + }, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request |
|
197 | + return $server; |
|
198 | + } |
|
199 | 199 | } |