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

Merge pull request #4689 from nextcloud/fix-password-protected-mail-shares

Browse source 
check password for mail shares as well
This commit is contained in:
Björn Schießle 2017-05-04 12:19:36 +02:00 committed by GitHub
commit 4965f02bf4
2 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ class PublicAuth extends AbstractBasic {
// check if the share is password protected
if ($share->getPassword() !== null) {
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
if ($this->shareManager->checkPassword($share, $password)) {
return true;
} else if ($this->session->exists('public_link_authenticated')

52
apps/dav/tests/unit/Connector/PublicAuthTest.php
View file

@ -33,7 +33,7 @@ use OCP\Share\IManager;
* Class PublicAuthTest
*
* @group DB
*
*
* @package OCA\DAV\Tests\unit\Connector
*/
class PublicAuthTest extends \Test\TestCase {
@ -163,6 +163,28 @@ class PublicAuthTest extends \Test\TestCase {
$this->assertTrue($result);
}
public function testSharePasswordMailValidPassword() {
$share = $this->getMockBuilder('OCP\Share\IShare')
->disableOriginalConstructor()
->getMock();
$share->method('getPassword')->willReturn('password');
$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_EMAIL);
$this->shareManager->expects($this->once())
->method('getShareByToken')
->willReturn($share);
$this->shareManager->expects($this->once())
->method('checkPassword')->with(
$this->equalTo($share),
$this->equalTo('password')
)->willReturn(true);
$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
$this->assertTrue($result);
}
public function testSharePasswordLinkValidSession() {
$share = $this->getMockBuilder('OCP\Share\IShare')
->disableOriginalConstructor()
@ -214,4 +236,32 @@ class PublicAuthTest extends \Test\TestCase {
$this->assertFalse($result);
}
public function testSharePasswordMailInvalidSession() {
$share = $this->getMockBuilder('OCP\Share\IShare')
->disableOriginalConstructor()
->getMock();
$share->method('getPassword')->willReturn('password');
$share->method('getShareType')->willReturn(\OCP\Share::SHARE_TYPE_EMAIL);
$share->method('getId')->willReturn('42');
$this->shareManager->expects($this->once())
->method('getShareByToken')
->willReturn($share);
$this->shareManager->method('checkPassword')
->with(
$this->equalTo($share),
$this->equalTo('password')
)->willReturn(false);
$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
$this->session->method('get')->with('public_link_authenticated')->willReturn('43');
$result = $this->invokePrivate($this->auth, 'validateUserPass', ['username', 'password']);
$this->assertFalse($result);
}
}