Dev 2.0

eq.lib.php

@@ -1,10 +1,11 @@
 <?php
 /**
 *    This file is part of the eQual framework.
-*    https://github.com/cedricfrancoys/equal
+*    https://github.com/equalframework/equal
 *
-*    Some Rights Reserved, Cedric Francoys, 2010-2021
-*    Licensed under GNU LGPL 3 license <http://www.gnu.org/licenses/>
+*    Some Rights Reserved, The eQual Framework, 2010-2024
+*    Original Author: Cedric Francoys
+*    License: GNU LGPL 3 license <http://www.gnu.org/licenses/>
 *
 *    This program is free software: you can redistribute it and/or modify
 *    it under the terms of the GNU Lesser General Public License as published by
@@ -870,7 +871,7 @@ public static function announce(array $announcement) {
                 $access = $container->get('access');
                 if(!$access->isRequestCompliant($user_id, $request->getHeaders()->getIpAddress())) {
                     Reporter::errorHandler(EQ_REPORT_SYSTEM, "AAA::".json_encode(['type' => 'policy', 'status' => 'denied']));
-                    throw new Exception("Request rejected by Security Policies", EQ_ERROR_NOT_ALLOWED);
+                    throw new \Exception("Request rejected by Security Policies", EQ_ERROR_NOT_ALLOWED);
                 }
                 else {
                     Reporter::errorHandler(EQ_REPORT_SYSTEM, "AAA::".json_encode(['type' => 'policy', 'status' => 'accepted', 'policy_id' => $access->getComplyingPolicyId()]));

lib/equal/access/AccessController.class.php

@@ -12,6 +12,7 @@
 use core\security\SecurityPolicy;
 use core\security\SecurityPolicyRule;
 use core\security\SecurityPolicyRuleValue;
+use core\setting\Setting;
 use equal\orm\ObjectManager;
 use equal\organic\Service;
 use equal\services\Container;
@@ -731,7 +732,7 @@ public function isRequestCompliant($user_id, $ip_address) {
         $result = true;
         $time = time();
 
-        // fetch policies: request must be compliant with at least one policy.
+        // fetch security policies: request must be compliant with at least one policy.
         /** @var \equal\orm\ObjectManager */
         $orm = $this->container->get('orm');
         $security_policies_ids = $orm->search(SecurityPolicy::getType(), [['is_active', '=', true]]);
@@ -826,6 +827,11 @@ private function validateTimeRange($time, $pattern) {
         list($hours, $minutes) = explode(':', date('H:i', $time));
         $time_of_day = ($hours * 3600) + ($minutes * 60);
 
+        // retrieve timezone offset between local timezone and UTC (times in settings use local time)
+        $tz = new \DateTimeZone(Setting::get_value('core', 'locale', 'time_zone', 'Europe/Brussels'));
+        // apply timezone offset, in seconds to apply, depending on the date of the given date (based on received timestamp)
+        $time_of_day += $tz->getOffset(new \DateTime('@'.$time));
+
         $map_days = ['sun' => 0, 'mon' => 1, 'tue' => 2, 'wed' => 3, 'thu' => 4, 'fri' => 5, 'sat' => 6];
 
         $day_of_week = strtolower(date('D', $time));