unlock Contao 5

Author: fritzmg

.php-cs-fixer.dist.php

@@ -32,9 +32,11 @@
         'escape_implicit_backslashes' => true,
         'fully_qualified_strict_types' => true,
         'general_phpdoc_annotation_remove' => [
-            'author',
-            'expectedException',
-            'expectedExceptionMessage',
+            'annotations' => [
+                'author',
+                'expectedException',
+                'expectedExceptionMessage',
+            ],
         ],
         'header_comment' => ['header' => $header],
         'heredoc_to_nowdoc' => true,

composer.json

@@ -27,11 +27,11 @@
     ],
     "require": {
         "php": "^7.1 || ^8.0",
-        "contao/core-bundle": "^4.9",
-        "symfony/config": "^4.4 || ^5.2",
-        "symfony/dependency-injection": "^4.4 || ^5.2",
-        "symfony/http-foundation": "^4.4 || ^5.2", 
-        "symfony/http-kernel": "^4.4 || ^5.2",
+        "contao/core-bundle": "^4.9 || ^5.0",
+        "symfony/config": "^4.4 || ^5.2 || ^6.0",
+        "symfony/dependency-injection": "^4.4 || ^5.2 || ^6.0",
+        "symfony/http-foundation": "^4.4 || ^5.2 || ^6.0", 
+        "symfony/http-kernel": "^4.4 || ^5.2 || ^6.0",
         "webmozart/path-util": "^2.3"
     },
     "autoload": {

src/Controller/FilesController.php

@@ -17,6 +17,8 @@
 use Contao\CoreBundle\Exception\InsufficientAuthenticationException;
 use Contao\CoreBundle\Exception\PageNotFoundException;
 use Contao\CoreBundle\Framework\ContaoFramework;
+use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;
+use Contao\Date;
 use Contao\Dbafs;
 use Contao\FilesModel;
 use Contao\FrontendUser;
@@ -35,14 +37,16 @@ class FilesController
     protected $framework;
     protected $security;
     protected $db;
+    protected $tokenChecker;
 
-    public function __construct(string $rootDir, Session $session, ContaoFramework $framework, Security $security, Connection $db)
+    public function __construct(string $rootDir, Session $session, ContaoFramework $framework, Security $security, Connection $db, TokenChecker $tokenChecker)
     {
         $this->rootDir = $rootDir;
         $this->session = $session;
         $this->framework = $framework;
         $this->security = $security;
         $this->db = $db;
+        $this->tokenChecker = $tokenChecker;
     }
 
     public function fileAction(Request $request, string $file): BinaryFileResponse
@@ -56,9 +60,9 @@ public function fileAction(Request $request, string $file): BinaryFileResponse
 
         // Initialize the Contao framework
         $this->framework->initialize(true);
-
+FilesModel::findById(null);
         // Set the root page for the domain as the pageModel attribute
-        $root = PageModel::findFirstPublishedRootByHostAndLanguage($request->getHost(), $request->getLocale());
+        $root = $this->findFirstPublishedRootByHostAndLanguage($request->getHost(), $request->getLocale());
 
         if (null !== $root) {
             $request->attributes->set('pageModel', $root);
@@ -117,7 +121,7 @@ public function fileAction(Request $request, string $file): BinaryFileResponse
             }
 
             // Get the parent folder
-            $filesModel = FilesModel::findById($filesModel->pid);
+            $filesModel = $filesModel->pid ? FilesModel::findById($filesModel->pid) : null;
         } while (null !== $filesModel);
 
         // Throw 404 exception, if there were no user homes or folders with member groups
@@ -145,4 +149,18 @@ public function fileAction(Request $request, string $file): BinaryFileResponse
         // Return file to browser
         return new BinaryFileResponse(Path::join($this->rootDir, $file));
     }
+
+    protected function findFirstPublishedRootByHostAndLanguage(string $host, string $language): ?PageModel
+    {
+        $columns = ["type='root' AND (dns=? OR dns='') AND (language=? OR fallback='1')"];
+        $values = [$host, $language];
+        $options = ['order' => 'dns DESC, fallback'];
+
+        if (!$this->tokenChecker->isPreviewMode()) {
+            $time = Date::floorToMinute();
+            $columns[] = "published='1' AND (start='' OR start<='$time') AND (stop='' OR stop>'$time')";
+        }
+
+        return PageModel::findOneBy($columns, $values, $options);
+    }
 }

src/DataContainer/FilesCallbacks.php

@@ -25,9 +25,14 @@ class FilesCallbacks
      */
     public function onLoadCallback(DataContainer $dc): void
     {
+        if (!$dc->id) {
+            return;
+        }
+
         if ('editAll' === Input::get('act') || (null !== ($filesModel = FilesModel::findOneByPath($dc->id)) && 'folder' === $filesModel->type)) {
             PaletteManipulator::create()
-                ->addField('groups', null)
+                // We have to use a non-existent legend here (see https://github.com/contao/contao/pull/5032)
+                ->addField('groups', 'foobar')
                 ->applyToPalette('default', 'tl_files')
             ;
         }

src/Resources/config/services.yml

@@ -6,6 +6,7 @@ services:
       - '@contao.framework'
       - '@security.helper'
       - '@database_connection'
+      - '@contao.security.token_checker'
     tags: ['controller.service_arguments']
 
   InspiredMinds\ContaoFileAccessBundle\DataContainer\FilesCallbacks: