Merge pull request #18357 from nextcloud/backport/17935/stable15

[stable15] adding share type circles
nextcloud · Dec 12, 2019 · daee1d9 · daee1d9
2 parents 1051056 + b10ab5a
commit daee1d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
@@ -97,7 +97,10 @@ protected function validateUserPass($username, $password) {
 
 		// 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
@@ -1329,7 +1329,8 @@ protected function checkExpireDate($share) {
 	 */
 	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;