summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2019-11-14 00:55:22 -0100
committerBackportbot <backportbot-noreply@rullzer.com>2019-12-11 11:39:02 +0000
commit1420cd5a7e19a7c881c98d515b28d3a1e775e6b2 (patch)
tree68c090da0477e145c733afb8dd206946dead7fd4
parent624302d99a75af84fb7d5f71df89335dce57659f (diff)
downloadnextcloud-server-1420cd5a7e19a7c881c98d515b28d3a1e775e6b2.tar.gz
nextcloud-server-1420cd5a7e19a7c881c98d515b28d3a1e775e6b2.zip
adding share type circles
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r--apps/dav/lib/Connector/PublicAuth.php5
-rw-r--r--lib/private/Share20/Manager.php3
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
index 8d29704c970..6b8341f7047 100644
--- a/apps/dav/lib/Connector/PublicAuth.php
+++ b/apps/dav/lib/Connector/PublicAuth.php
@@ -97,7 +97,10 @@ class PublicAuth extends AbstractBasic {
// check if the share is password protected
if ($share->getPassword() !== null) {
- if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+
+ if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK
+ || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL
+ || $share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) {
if ($this->shareManager->checkPassword($share, $password)) {
return true;
} else if ($this->session->exists('public_link_authenticated')
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 33a6553172c..8128e4f0ba4 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1330,7 +1330,8 @@ class Manager implements IManager {
*/
public function checkPassword(\OCP\Share\IShare $share, $password) {
$passwordProtected = $share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK
- || $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL;
+ || $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL
+ || $share->getShareType() !== \OCP\Share::SHARE_TYPE_CIRCLE;
if (!$passwordProtected) {
//TODO maybe exception?
return false;