diff options
| -rw-r--r-- | lib/private/Share/Share.php | 29 | ||||
| -rw-r--r-- | tests/lib/Share/ShareTest.php | 29 |
2 files changed, 0 insertions, 58 deletions
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 424fe8a2382..86101707dbf 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -1327,35 +1327,6 @@ class Share extends Constants { } /** - * In case a password protected link is not yet authenticated this function will return false - * - * @param array $linkItem - * @return boolean - */ - public static function checkPasswordProtectedShare(array $linkItem) { - if (!isset($linkItem['share_with'])) { - return true; - } - if (!isset($linkItem['share_type'])) { - return true; - } - if (!isset($linkItem['id'])) { - return true; - } - - if ($linkItem['share_type'] != \OCP\Share::SHARE_TYPE_LINK) { - return true; - } - - if ( \OC::$server->getSession()->exists('public_link_authenticated') - && \OC::$server->getSession()->get('public_link_authenticated') === (string)$linkItem['id'] ) { - return true; - } - - return false; - } - - /** * construct select statement * @param int $format * @param boolean $fileDependent ist it a file/folder share or a generla share diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php index 4d3b48b7aa4..7db58d744d5 100644 --- a/tests/lib/Share/ShareTest.php +++ b/tests/lib/Share/ShareTest.php @@ -223,35 +223,6 @@ class ShareTest extends \Test\TestCase { } /** - * @dataProvider checkPasswordProtectedShareDataProvider - * @param $expected - * @param $item - */ - public function testCheckPasswordProtectedShare($expected, $item) { - \OC::$server->getSession()->set('public_link_authenticated', '100'); - $result = \OC\Share\Share::checkPasswordProtectedShare($item); - $this->assertEquals($expected, $result); - } - - function checkPasswordProtectedShareDataProvider() { - return array( - array(true, array()), - array(true, array('share_with' => null)), - array(true, array('share_with' => '')), - array(true, array('share_with' => '1234567890', 'share_type' => '1')), - array(true, array('share_with' => '1234567890', 'share_type' => 1)), - array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '100')), - array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '100')), - array(true, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 100)), - array(true, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 100)), - array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => '101')), - array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => '101')), - array(false, array('share_with' => '1234567890', 'share_type' => '3', 'id' => 101)), - array(false, array('share_with' => '1234567890', 'share_type' => 3, 'id' => 101)), - ); - } - - /** * @dataProvider urls * @param string $url * @param string $expectedResult |