Merge pull request #12410 from owncloud/no_session_for_public_share_key

don't store private public-share-key in session

1 files changed, 1 insertions, 8 deletions

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 076df3c46f6..7518292131c 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -203,7 +203,6 @@ class ShareController extends Controller {
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired
-	 * @UseSession
 	 *
 	 * @param string $token
 	 * @param string $files
@@ -213,12 +212,6 @@ class ShareController extends Controller {
 	public function downloadShare($token, $files = null, $path = '') {
 		\OC_User::setIncognitoMode(true);
 
-		// FIXME: Use DI once there is a suitable class
-		if (!\OCP\App::isEnabled('files_encryption')) {
-			// encryption app requires the session to store the keys in
-			\OC::$server->getSession()->close();
-		}
-
 		$linkItem = OCP\Share::getShareByToken($token, false);
 
 		// Share is password protected - check whether the user is permitted to access the share
@@ -244,7 +237,7 @@ class ShareController extends Controller {
 			}
 
 			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-			// after dispatching the request which results in a "Cannot modify header information" notice. 
+			// after dispatching the request which results in a "Cannot modify header information" notice.
 			OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
 			exit();
 		} else {