From 9464c99dbc67ef7434b234072a2fe13d3d27e716 Mon Sep 17 00:00:00 2001
From: Morton Jonuschat <m.jonuschat@mojocode.de>
Date: Fri, 8 Jan 2016 22:23:05 +0100
Subject: [PATCH] [FOLLOWUP][TASK] Remove leftover unzipping core functionality
Remove unzipFile permission from BackendUserAuthenticationTest.
Resolves: #72611
Related: #72602
Releases: master
Change-Id: Ieb9d13f95404875ce68170ef721bc37619619ec0
Reviewed-on: https://review.typo3.org/45740
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../Utility/File/ExtendedFileUtility.php | 9 -----
...eaking-72602-RemovedUnzipFunctionality.rst | 4 +--
.../BackendUserAuthenticationTest.php | 34 -------------------
3 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index f43e16745270..46f6bd0d7090 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -68,15 +68,6 @@ use TYPO3\CMS\Lang\LanguageService;
*/
class ExtendedFileUtility extends BasicFileUtility
{
- /**
- * External static variables:
- * Notice; some of these are overridden in the start() method with values from $GLOBALS['TYPO3_CONF_VARS']['BE']
- * Path to unzip-program (with trailing '/')
- *
- * @var string
- */
- public $unzipPath = '';
-
/**
* Defines behaviour when uploading files with names that already exist; possible values are
* the values of the \TYPO3\CMS\Core\Resource\DuplicationBehavior enumeration
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72602-RemovedUnzipFunctionality.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72602-RemovedUnzipFunctionality.rst
index f641e1203808..f32d3ee62091 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72602-RemovedUnzipFunctionality.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72602-RemovedUnzipFunctionality.rst
@@ -7,7 +7,7 @@ Description
The legacy functionality to unzip files from outside the document root was removed.
-Additionally, the corresponding option ``$TYPO3_CONF_VARS[BE][unzip_path]`` was removed as well.
+Additionally, the corresponding option ``$TYPO3_CONF_VARS[BE][unzip_path]`` and the class member ``ExtendedFileUtility::$unzipPath`` were removed as well.
Legacy methods from the Extbase domain model BackendUser named ``isFileUnzipAllowed``
and ``setFileUnzipAllowed`` were removed.
@@ -24,4 +24,4 @@ Using the Extbase domain model methods will result in a fatal PHP error.
Migration
=========
-Use a third-party extension to integrate unzip functionality into TYPO3.
\ No newline at end of file
+Use a third-party extension to integrate unzip functionality into TYPO3.
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index 5f21a9cb4035..7f34b2af4474 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
@@ -30,7 +30,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => false,
'moveFile' => false,
'renameFile' => false,
- 'unzipFile' => false,
'deleteFile' => false,
// Folder permissions
'addFolder' => false,
@@ -255,7 +254,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => 0,
'moveFile' => 0,
'renameFile' => 0,
- 'unzipFile' => 0,
'deleteFile' => 0,
'addFolder' => 0,
'readFolder' => 1,
@@ -275,7 +273,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => 1,
'moveFile' => 1,
'renameFile' => 1,
- 'unzipFile' => 0,
'deleteFile' => 1,
'addFolder' => 0,
'readFolder' => 1,
@@ -340,7 +337,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => true,
'moveFile' => true,
'renameFile' => true,
- 'unzipFile' => true,
'deleteFile' => true,
'addFolder' => true,
'readFolder' => true,
@@ -367,7 +363,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => 1,
'moveFile' => 1,
'renameFile' => 1,
- 'unzipFile' => 1,
'deleteFile' => 1,
'addFolder' => 1,
'readFolder' => 1,
@@ -393,7 +388,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => true,
'moveFile' => true,
'renameFile' => true,
- 'unzipFile' => true,
'deleteFile' => true,
'addFolder' => true,
'readFolder' => true,
@@ -416,7 +410,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => true,
'moveFile' => true,
'renameFile' => true,
- 'unzipFile' => true,
'deleteFile' => true,
'addFolder' => true,
'readFolder' => true,
@@ -519,7 +512,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => false,
'moveFile' => false,
'renameFile' => false,
- 'unzipFile' => false,
'deleteFile' => false,
'addFolder' => false,
'readFolder' => false,
@@ -540,7 +532,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => true,
'moveFile' => true,
'renameFile' => true,
- 'unzipFile' => false,
'deleteFile' => true,
'addFolder' => false,
'readFolder' => false,
@@ -552,27 +543,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'recursivedeleteFolder' => false
)
),
- 'Unzip allowed' => array(
- 'readFile,unzipFile',
- array(
- 'addFile' => false,
- 'readFile' => true,
- 'writeFile' => false,
- 'copyFile' => false,
- 'moveFile' => false,
- 'renameFile' => false,
- 'unzipFile' => true,
- 'deleteFile' => false,
- 'addFolder' => false,
- 'readFolder' => false,
- 'writeFolder' => false,
- 'copyFolder' => false,
- 'moveFolder' => false,
- 'renameFolder' => false,
- 'deleteFolder' => false,
- 'recursivedeleteFolder' => false
- )
- ),
'Standard folder permissions' => array(
'addFolder,readFolder,moveFolder,renameFolder,writeFolder,deleteFolder',
array(
@@ -582,7 +552,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => false,
'moveFile' => false,
'renameFile' => false,
- 'unzipFile' => false,
'deleteFile' => false,
'addFolder' => true,
'readFolder' => true,
@@ -603,7 +572,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => false,
'moveFile' => false,
'renameFile' => false,
- 'unzipFile' => false,
'deleteFile' => false,
'addFolder' => false,
'readFolder' => true,
@@ -624,7 +592,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => false,
'moveFile' => false,
'renameFile' => false,
- 'unzipFile' => false,
'deleteFile' => false,
'addFolder' => false,
'readFolder' => true,
@@ -676,7 +643,6 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
'copyFile' => true,
'moveFile' => true,
'renameFile' => true,
- 'unzipFile' => true,
'deleteFile' => true,
'addFolder' => true,
'readFolder' => true,
--
GitLab