wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18355 from nextcloud/backport/17935/stable17

Browse source 
[stable17] adding share type circles
This commit is contained in:
Roeland Jago Douma 2019-12-12 10:49:12 +01:00 committed by GitHub
commit 387d216214
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/dav/lib/Connector/PublicAuth.php
View file

@ -34,6 +34,7 @@ use OCP\IRequest;
use OCP\ISession; use OCP\ISession;
use OCP\Share\Exceptions\ShareNotFound; use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager; use OCP\Share\IManager;
use OCP\Share\IShare;
use Sabre\DAV\Auth\Backend\AbstractBasic; use Sabre\DAV\Auth\Backend\AbstractBasic;
/** /**
@ -97,7 +98,10 @@ class PublicAuth extends AbstractBasic {
// check if the share is password protected // check if the share is password protected
if ($share->getPassword() !== null) { if ($share->getPassword() !== null) {
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
if ($share->getShareType() === IShare::TYPE_LINK
|| $share->getShareType() === IShare::TYPE_EMAIL
|| $share->getShareType() === IShare::TYPE_CIRCLE) {
if ($this->shareManager->checkPassword($share, $password)) { if ($this->shareManager->checkPassword($share, $password)) {
return true; return true;
} else if ($this->session->exists('public_link_authenticated') } else if ($this->session->exists('public_link_authenticated')
@ -112,7 +116,7 @@ class PublicAuth extends AbstractBasic {
} }
return false; return false;
} }
} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) { } else if ($share->getShareType() === IShare::TYPE_REMOTE) {
return true; return true;
} else { } else {
return false; return false;

5
lib/private/Share20/Manager.php
View file

@ -1329,8 +1329,9 @@ class Manager implements IManager {
* @return bool * @return bool
*/ */
public function checkPassword(\OCP\Share\IShare $share, $password) { public function checkPassword(\OCP\Share\IShare $share, $password) {
$passwordProtected = $share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK $passwordProtected = $share->getShareType() !== IShare::TYPE_LINK
|| $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL; || $share->getShareType() !== IShare::TYPE_EMAIL
|| $share->getShareType() !== IShare::TYPE_CIRCLE;
if (!$passwordProtected) { if (!$passwordProtected) {
//TODO maybe exception? //TODO maybe exception?
return false; return false;