diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-10-02 09:57:33 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-10-02 12:03:53 +0200 |
commit | 3d2acb5003a4953d3f422b34f670d87c4afb11c9 (patch) | |
tree | 89ec8d0821639581110f0b73db75a89defbdbb8a /apps/files_sharing/lib/exceptions | |
parent | dc38e674a5d547e7fd53d66fb0ac0dbb5490ea77 (diff) | |
download | nextcloud-server-3d2acb5003a4953d3f422b34f670d87c4afb11c9.tar.gz nextcloud-server-3d2acb5003a4953d3f422b34f670d87c4afb11c9.zip |
sharingcheckmiddleware now handles externalshares as well
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired
By default both are required for all functions in the
externalSharesController.
A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.
Unit tests added and updated
Diffstat (limited to 'apps/files_sharing/lib/exceptions')
-rw-r--r-- | apps/files_sharing/lib/exceptions/brokenpath.php | 32 | ||||
-rw-r--r-- | apps/files_sharing/lib/exceptions/s2sexception.php | 26 |
2 files changed, 58 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/exceptions/brokenpath.php b/apps/files_sharing/lib/exceptions/brokenpath.php new file mode 100644 index 00000000000..71fe93f8e92 --- /dev/null +++ b/apps/files_sharing/lib/exceptions/brokenpath.php @@ -0,0 +1,32 @@ +<?php +/** + * @author Björn Schießle <schiessle@owncloud.com> + * @author Morris Jobke <hey@morrisjobke.de> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\Files_Sharing\Exceptions; + +/** + * Expected path with a different root + * Possible Error Codes: + * 10 - Path not relative to data/ and point to the users file directory + + */ +class BrokenPath extends \Exception { +} diff --git a/apps/files_sharing/lib/exceptions/s2sexception.php b/apps/files_sharing/lib/exceptions/s2sexception.php new file mode 100644 index 00000000000..7f5557f8cd3 --- /dev/null +++ b/apps/files_sharing/lib/exceptions/s2sexception.php @@ -0,0 +1,26 @@ +<?php +/** + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\Files_Sharing\Exceptions; + +/** + * S2S sharing not allowed + */ +class S2SException extends \Exception { +} |