diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-21 13:42:47 +0400 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-01-21 23:52:16 +0400 |
commit | 4351609df936ae7335c9586748b7b6ec3eb0bca6 (patch) | |
tree | a11e1d550b51cf80f262dd782dde94b4e8a76c46 /lib | |
parent | c430fe6612b2e1935c3395f0b8105781654399ef (diff) |
adding password protection check to getShareByToken()
Diffstat (limited to 'lib')
-rw-r--r-- | lib/public/share.php | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index eb1dd8d1c95..4573fe8d8d3 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -347,11 +347,11 @@ class Share { } /** - * Get the item shared by a token - * @param string token - * @return Item + * Based on the given token the share information will be returned - password protected shares will be verified + * @param string $token + * @return array | bool false will be returned in case the token is unknown or unauthorized */ - public static function getShareByToken($token) { + public static function getShareByToken($token, $checkPasswordProtection = true) { $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1); $result = $query->execute(array($token)); if (\OC_DB::isError($result)) { @@ -361,6 +361,12 @@ class Share { if (is_array($row) and self::expireItem($row)) { return false; } + + // password protected shares need to me authenticated + if ($checkPasswordProtection && !\OCP\Share::checkPasswordProtectedShare($row)) { + return false; + } + return $row; } @@ -1888,6 +1894,28 @@ class Share { } } + /** + * In case a password protected link is not yet authenticated this function will return false + * + * @param array $linkItem + * @return bool + */ + public static function checkPasswordProtectedShare(array $linkItem) { + if (!isset($linkItem['share_with'])) { + return true; + } + + if ($linkItem['share_type'] != \OCP\Share::SHARE_TYPE_LINK) { + return true; + } + + if ( \OC::$session->exists('public_link_authenticated') + && \OC::$session->get('public_link_authenticated') === $linkItem['id'] ) { + return true; + } + + return false; + } } /** |