Services/MediaObjects/classes/class.ilObjMediaObjectAccess.php

@@ -32,7 +32,7 @@ class ilObjMediaObjectAccess implements ilWACCheckingClass
         $this->access = $DIC->access();
     }
 
-    public function canBeDelivered(ilWACPath $ilWACPath)
+    public function canBeDelivered(ilWACPath $ilWACPath) : bool
     {
         preg_match("/.\\/data\\/.*\\/mm_([0-9]*)\\/.*/ui", $ilWACPath->getPath(), $matches);
         $obj_id = $matches[1];

Services/Notifications/classes/Setup/ilNotificationUpdateAgent.php

 <?php declare(strict_types = 1);
 
-use ILIAS\Setup;
-
-/******************************************************************************
- *
+/**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
  *
@@ -14,20 +11,63 @@ use ILIAS\Setup;
  *
  * If this is not the case or you just want to try ILIAS, you'll find
  * us at:
- *     https://www.ilias.de
- *     https://github.com/ILIAS-eLearning
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
  *
- *****************************************************************************/
+ *********************************************************************/
 
-/**
- * @author Ingmar Szmais <iszmais@databay.de>
- */
-class ilNotificationUpdateAgent extends Setup\Agent\NullAgent
+use ILIAS\Setup;
+use ILIAS\Refinery;
+use ILIAS\Setup\Environment;
+
+class ilNotificationUpdateAgent implements Setup\Agent
 {
+    use Setup\Agent\HasNoNamedObjective;
+
+    public function hasConfig() : bool
+    {
+        return false;
+    }
+
+    public function getArrayToConfigTransformation() : Refinery\Transformation
+    {
+        throw new LogicException('Agent has no config.');
+    }
+
+    public function getInstallObjective(Setup\Config $config = null) : Setup\Objective
+    {
+        return new Setup\Objective\NullObjective();
+    }
+
     public function getUpdateObjective(Setup\Config $config = null) : Setup\Objective
     {
-        return new ilDatabaseUpdateStepsExecutedObjective(
-            new ilNotificationUpdateSteps()
-        );
+        return new class(new ilNotificationUpdateSteps()) extends ilDatabaseUpdateStepsExecutedObjective {
+            public function getPreconditions(Environment $environment) : array
+            {
+                $preconditions = parent::getPreconditions($environment);
+                
+                $preconditions[] = new ilTreeAdminNodeAddedObjective(
+                    'nota',
+                    'Notification Service Administration Object'
+                );
+
+                return $preconditions;
+            }
+        };
+    }
+
+    public function getBuildArtifactObjective() : Setup\Objective
+    {
+        return new Setup\Objective\NullObjective();
+    }
+
+    public function getStatusObjective(Setup\Metrics\Storage $storage) : Setup\Objective
+    {
+        return new Setup\Objective\NullObjective();
+    }
+
+    public function getMigrations() : array
+    {
+        return [];
     }
 }

Services/Notifications/classes/Setup/ilNotificationUpdateSteps.php

 <?php declare(strict_types = 1);
 
-/******************************************************************************
- *
+/**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
  *
@@ -12,29 +11,23 @@
  *
  * If this is not the case or you just want to try ILIAS, you'll find
  * us at:
- *     https://www.ilias.de
- *     https://github.com/ILIAS-eLearning
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
  *
- *****************************************************************************/
-
-use ILIAS\Notifications\ilNotificationSetupHelper;
+ *********************************************************************/
 
-/**
- * @author Ingmar Szmais <iszmais@databay.de>
- */
 class ilNotificationUpdateSteps implements ilDatabaseUpdateSteps
 {
-    protected \ilDBInterface $db;
+    protected ilDBInterface $db;
 
     public function prepare(ilDBInterface $db) : void
     {
         $this->db = $db;
     }
-    
+
     public function step_1() : void
     {
-        include_once('./Services/Migration/DBUpdate_3560/classes/class.ilDBUpdateNewObjectType.php');
-        ilDBUpdateNewObjectType::addAdminNode('nota', 'Notification Service Administration Object');
+        // Creation of administration node forced by \ilTreeAdminNodeAddedObjective
     }
 
     public function step_2() : void

Services/Style/classes/class.ilContentStyleWAC.php

@@ -10,10 +10,8 @@ class ilContentStyleWAC implements ilWACCheckingClass
 
     /**
      * @param ilWACPath $ilWACPath
-     *
-     * @return bool
      */
-    public function canBeDelivered(ilWACPath $ilWACPath)
+    public function canBeDelivered(ilWACPath $ilWACPath) : bool
     {
         //preg_match("/.\\/data\\/.*\\/mm_([0-9]*)\\/.*/ui", $ilWACPath->getPath(), $matches);
         return true;

Services/WebAccessChecker/class.ilWACException.php

@@ -20,17 +20,17 @@
  */
 class ilWACException extends ilException
 {
-    const CODE_NO_TYPE = 9001;
-    const CODE_NO_PATH = 9002;
-    const ACCESS_WITHOUT_CHECK = 9003;
-    const NO_CHECKING_INSTANCE = 9004;
-    const WRONG_PATH_TYPE = 9005;
-    const INITIALISATION_FAILED = 9006;
-    const DATA_DIR_NON_WRITEABLE = 9007;
-    const ACCESS_DENIED = 9010;
-    const ACCESS_DENIED_NO_PUB = 9011;
-    const ACCESS_DENIED_NO_LOGIN = 9012;
-    const MAX_LIFETIME = 9013;
+    public const CODE_NO_TYPE = 9001;
+    public const CODE_NO_PATH = 9002;
+    public const ACCESS_WITHOUT_CHECK = 9003;
+    public const NO_CHECKING_INSTANCE = 9004;
+    public const WRONG_PATH_TYPE = 9005;
+    public const INITIALISATION_FAILED = 9006;
+    public const DATA_DIR_NON_WRITEABLE = 9007;
+    public const ACCESS_DENIED = 9010;
+    public const ACCESS_DENIED_NO_PUB = 9011;
+    public const ACCESS_DENIED_NO_LOGIN = 9012;
+    public const MAX_LIFETIME = 9013;
     /**
      * @var array
      */
@@ -57,7 +57,7 @@ class ilWACException extends ilException
         $message = self::$messages[$code];
 
         if ($this->isNonEmptyString($additional_message)) {
-            $message = "\"{$this->message}\" with additional message: \"$additional_message\"";
+            $message = "\"$this->message\" with additional message: \"$additional_message\"";
         }
 
         //ilWACLog::getInstance()->write('Exception in ' . $this->getFile() . ':' . $this->getLine() . ': ' . $message);

Services/WebAccessChecker/classes/HttpServiceAware.php

-<?php
-// declare(strict_types=1);
-
-namespace ILIAS\WebAccessChecker;
-
-use ILIAS\HTTP\Services;
-
-/******************************************************************************
- *
- * This file is part of ILIAS, a powerful learning management system.
- *
- * ILIAS is licensed with the GPL-3.0, you should have received a copy
- * of said license along with the source code.
- *
- * If this is not the case or you just want to try ILIAS, you'll find
- * us at:
- *      https://www.ilias.de
- *      https://github.com/ILIAS-eLearning
- *
- *****************************************************************************/
-/**
- * Trait HttpServiceAware
- *
- * This trait provide a convenient way to consume the global http state
- * and aids to reduce code duplication.
- *
- * Please only use this trait if you need the global http state from a
- * static context! Otherwise consider to pass the http global state via constructor (DI).
- *
- * @author  Nicolas Schäfli <ns@studer-raimann.ch>
- * @version 1.0
- * @since 5.3
- *
- * @Internal
- */
-trait HttpServiceAware
-{
-    private static $http;
-
-
-    /**
-     * Fetches the global http state from ILIAS.
-     *
-     * The GlobalHttpStore is stored after the first
-     * invocation.
-     *
-     * @return Services  The current http global state of ILIAS.
-     * @since 5.3
-     */
-    protected static function http()
-    {
-        if (self::$http === null) {
-            self::$http = $GLOBALS['DIC']['http'];
-        }
-
-        return self::$http;
-    }
-}

Services/WebAccessChecker/classes/class.ilWACPath.php

@@ -21,12 +21,12 @@
  */
 class ilWACPath
 {
-    const DIR_DATA = "data";
-    const DIR_SEC = "sec";
+    public const DIR_DATA = "data";
+    public const DIR_SEC = "sec";
     /**
      * Copy this without to regex101.com and test with some URL of files
      */
-    const REGEX = "(?<prefix>.*?)(?<path>(?<path_without_query>(?<secure_path_id>(?<module_path>\/data\/(?<client>[\w\-\.]*)\/(?<sec>sec\/|)(?<module_type>.*?)\/(?<module_identifier>.*\/|)))(?<appendix>[^\?\n]*)).*)";
+    public const REGEX = "(?<prefix>.*?)(?<path>(?<path_without_query>(?<secure_path_id>(?<module_path>\/data\/(?<client>[\w\-\.]*)\/(?<sec>sec\/|)(?<module_type>.*?)\/(?<module_identifier>.*\/|)))(?<appendix>[^\?\n]*)).*)";
     /**
      * @var string[]
      */
@@ -117,7 +117,7 @@ class ilWACPath
             $module_path = ('.' . (!isset($result['module_path']) || is_null($result['module_path']) ? '' : $result['module_path']));
         }
 
-        $this->setModulePath("$module_path");
+        $this->setModulePath($module_path);
         $this->setInSecFolder(isset($result['sec']) && $result['sec'] === 'sec/');
         $this->setPathWithoutQuery(
             '.' . (!isset($result['path_without_query']) || is_null($result['path_without_query']) ? '' : $result['path_without_query'])

Services/WebAccessChecker/classes/class.ilWACSignedPath.php

@@ -4,7 +4,6 @@
 use ILIAS\HTTP\Cookies\CookieFactory;
 use ILIAS\HTTP\Cookies\CookieFactoryImpl;
 use ILIAS\HTTP\Services;
-use ILIAS\WebAccessChecker\HttpServiceAware;
 use ILIAS\WebAccessChecker\PathType;
 use ILIAS\HTTP\GlobalHttpState;
 
@@ -29,14 +28,12 @@ use ILIAS\HTTP\GlobalHttpState;
  */
 class ilWACSignedPath
 {
-    use HttpServiceAware;
-
-    const WAC_TOKEN_ID = 'il_wac_token';
-    const WAC_TIMESTAMP_ID = 'il_wac_ts';
-    const WAC_TTL_ID = 'il_wac_ttl';
-    const TS_SUFFIX = 'ts';
-    const TTL_SUFFIX = 'ttl';
-    const MAX_LIFETIME = 600;
+    public const WAC_TOKEN_ID = 'il_wac_token';
+    public const WAC_TIMESTAMP_ID = 'il_wac_ts';
+    public const WAC_TTL_ID = 'il_wac_ttl';
+    public const TS_SUFFIX = 'ts';
+    public const TTL_SUFFIX = 'ttl';
+    public const MAX_LIFETIME = 600;
 
     protected ?ilWACPath $path_object = null;
     protected ?ilWACToken $token_instance = null;
@@ -80,7 +77,7 @@ class ilWACSignedPath
                 . $this->getTokenInstance()->getToken();
         }
 
-        $path = $path . '&' . self::WAC_TTL_ID . '=' . $this->getTokenInstance()->getTTL();
+        $path .= '&' . self::WAC_TTL_ID . '=' . $this->getTokenInstance()->getTTL();
 
         return $path . '&' . self::WAC_TIMESTAMP_ID . '='
             . $this->getTokenInstance()->getTimestamp();
@@ -214,6 +211,7 @@ class ilWACSignedPath
      */
     public static function signFile(string $path_to_file) : string
     {
+        global $DIC;
         if ($path_to_file === '' || $path_to_file === '0') {
             return '';
         }
@@ -221,7 +219,7 @@ class ilWACSignedPath
         if ($ilWACPath->getClient() === '' || $ilWACPath->getClient() === '0') {
             return $path_to_file;
         }
-        $obj = new self($ilWACPath, self::http(), new CookieFactoryImpl());
+        $obj = new self($ilWACPath, $DIC->http(), new CookieFactoryImpl());
         $obj->setType(PathType::FILE);
         $obj->buildAndSetTokenInstance(time(), self::getTokenMaxLifetimeInSeconds());
 
@@ -230,7 +228,8 @@ class ilWACSignedPath
 
     public static function signFolderOfStartFile(string $start_file_path) : void
     {
-        $obj = new self(new ilWACPath($start_file_path), self::http(), new CookieFactoryImpl());
+        global $DIC;
+        $obj = new self(new ilWACPath($start_file_path), $DIC->http(), new CookieFactoryImpl());
         $obj->setType(PathType::FOLDER);
         $obj->buildAndSetTokenInstance(time(), self::getCookieMaxLifetimeInSeconds());
         $obj->saveFolderToken();

Services/WebAccessChecker/classes/class.ilWACToken.php

@@ -20,7 +20,7 @@
  */
 class ilWACToken
 {
-    const SALT_FILE_PATH = './data/wacsalt.php';
+    private const SALT_FILE_PATH = './data/wacsalt.php';
     protected static string $SALT = '';
     protected string $session_id = '';
     protected int $timestamp = 0;
@@ -45,7 +45,7 @@ class ilWACToken
         $this->setClient($client);
         $this->setPath($path);
         $session_id = session_id();
-        $this->setSessionId($session_id ? $session_id : '-');
+        $this->setSessionId($session_id ?: '-');
         if (isset($_SERVER['REMOTE_ADDR'])) {
             $this->setIp($_SERVER['REMOTE_ADDR']);
         }

Services/WebAccessChecker/classes/class.ilWebAccessChecker.php

@@ -27,13 +27,13 @@ use Psr\Http\Message\UriInterface;
  */
 class ilWebAccessChecker
 {
-    const DISPOSITION = 'disposition';
-    const STATUS_CODE = 'status_code';
-    const REVALIDATE = 'revalidate';
-    const CM_FILE_TOKEN = 1;
-    const CM_FOLDER_TOKEN = 2;
-    const CM_CHECKINGINSTANCE = 3;
-    const CM_SECFOLDER = 4;
+    public const DISPOSITION = 'disposition';
+    public const STATUS_CODE = 'status_code';
+    public const REVALIDATE = 'revalidate';
+    public const CM_FILE_TOKEN = 1;
+    public const CM_FOLDER_TOKEN = 2;
+    public const CM_CHECKINGINSTANCE = 3;
+    public const CM_SECFOLDER = 4;
 
     protected ?ilWACPath $path_object = null;
     protected bool $checked = false;
@@ -108,28 +108,15 @@ class ilWebAccessChecker
                 if ($ilWACSignedPath->isFolderSigned() && $this->isRevalidateFolderTokens()) {
                     $ilWACSignedPath->revalidatingFolderToken();
                 }
-
-                $this->setChecked(true);
-
-                return true;
-            } else {
-                $this->setChecked(true);
-
-                return false;
             }
+            $this->setChecked(true);
+            return $canBeDelivered;
         }
 
         // none of the checking mechanisms could have been applied. no access
         $this->setChecked(true);
-        if ($this->getPathObject()->isInSecFolder()) {
-            $this->addAppliedCheckingMethod(self::CM_SECFOLDER);
-
-            return false;
-        } else {
-            $this->addAppliedCheckingMethod(self::CM_SECFOLDER);
-
-            return true;
-        }
+        $this->addAppliedCheckingMethod(self::CM_SECFOLDER);
+        return !$this->getPathObject()->isInSecFolder();
     }
 
     protected function sendHeader(string $message) : void
@@ -166,7 +153,7 @@ class ilWebAccessChecker
                 && $e->getCode() !== ilWACException::ACCESS_DENIED_NO_LOGIN) {
                 throw  $e;
             }
-            if (($e instanceof Exception && $e->getMessage() == 'Authentication failed.')
+            if (($e instanceof Exception && $e->getMessage() === 'Authentication failed.')
                 || $e->getCode() === ilWACException::ACCESS_DENIED_NO_LOGIN) {
                 $this->initAnonymousSession();
                 $this->checkUser();
@@ -183,7 +170,7 @@ class ilWebAccessChecker
     {
         global $DIC;
         $on_login_page = !$this->isRequestNotFromLoginPage();
-        $is_anonymous = ((int) $DIC->user()->getId() === (int) ANONYMOUS_USER_ID);
+        $is_anonymous = ($DIC->user()->getId() === ANONYMOUS_USER_ID);
         $is_null_user = ($DIC->user()->getId() === 0);
         $pub_section_activated = (bool) $DIC['ilSetting']->get('pub_section');
         $isset = isset($DIC['ilSetting']);
@@ -213,7 +200,7 @@ class ilWebAccessChecker
         global $DIC;
 
         $is_user = $DIC->user() instanceof ilObjUser;
-        $user_id_is_zero = ((int) $DIC->user()->getId() === 0);
+        $user_id_is_zero = ($DIC->user()->getId() === 0);
         $not_on_login_page = $this->isRequestNotFromLoginPage();
         if (!$is_user || ($user_id_is_zero && $not_on_login_page)) {
             throw new ilWACException(ilWACException::ACCESS_DENIED_NO_LOGIN);
@@ -333,15 +320,14 @@ class ilWebAccessChecker
         $ilAuthSession = $DIC['ilAuthSession'];
         $ilAuthSession->init();
         $ilAuthSession->regenerateId();
-        $a_id = (int) ANONYMOUS_USER_ID;
-        $ilAuthSession->setUserId($a_id);
-        $ilAuthSession->setAuthenticated(false, $a_id);
-        $DIC->user()->setId($a_id);
+        $ilAuthSession->setUserId(ANONYMOUS_USER_ID);
+        $ilAuthSession->setAuthenticated(false, ANONYMOUS_USER_ID);
+        $DIC->user()->setId(ANONYMOUS_USER_ID);
     }
 
     protected function isRequestNotFromLoginPage() : bool
     {
-        $referrer = (string) ($_SERVER['HTTP_REFERER'] ?? '');
+        $referrer = $_SERVER['HTTP_REFERER'] ?? '';
         $not_on_login_page = (strpos($referrer, 'login.php') === false
             && strpos($referrer, '&baseClass=ilStartUpGUI') === false);
 

Services/WebAccessChecker/interfaces/PathType.php

@@ -25,6 +25,6 @@ namespace ILIAS\WebAccessChecker;
  */
 interface PathType
 {
-    const FILE = 1;
-    const FOLDER = 2;
+    public const FILE = 1;
+    public const FOLDER = 2;
 }

Services/WebAccessChecker/interfaces/interface.ilWACCheckingClass.php

@@ -20,9 +20,5 @@
  */
 interface ilWACCheckingClass
 {
-
-    /**
-     * @return bool
-     */
-    public function canBeDelivered(ilWACPath $ilWACPath);
+    public function canBeDelivered(ilWACPath $ilWACPath) : bool;
 }

Services/WebAccessChecker/wac.php

@@ -14,15 +14,15 @@ require_once('./libs/composer/vendor/autoload.php');
 $container = new \ILIAS\DI\Container();
 
 //manually init http service
-$container['http.request_factory'] = fn ($c) => new \ILIAS\HTTP\Request\RequestFactoryImpl();
+$container['http.request_factory'] = static fn ($c) => new \ILIAS\HTTP\Request\RequestFactoryImpl();
 
-$container['http.response_factory'] = fn ($c) => new \ILIAS\HTTP\Response\ResponseFactoryImpl();
+$container['http.response_factory'] = static fn ($c) => new \ILIAS\HTTP\Response\ResponseFactoryImpl();
 
-$container['http.cookie_jar_factory'] = fn ($c) => new \ILIAS\HTTP\Cookies\CookieJarFactoryImpl();
+$container['http.cookie_jar_factory'] = static fn ($c) => new \ILIAS\HTTP\Cookies\CookieJarFactoryImpl();
 
-$container['http.response_sender_strategy'] = fn ($c) => new \ILIAS\HTTP\Response\Sender\DefaultResponseSenderStrategy();
+$container['http.response_sender_strategy'] = static fn ($c) => new \ILIAS\HTTP\Response\Sender\DefaultResponseSenderStrategy();
 
-$container['http'] = fn ($c) => new \ILIAS\HTTP\Services($c);
+$container['http'] = static fn ($c) => new \ILIAS\HTTP\Services($c);
 
 $GLOBALS["DIC"] = $container;