lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 10:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall: Settings: Schedules - cleanup the mess in filter_get_time_based_rule_status(), closes https://github.com/opnsense/core/issues/7291

Browse Source 
The legacy schedules are implemented quite messy. To find if a schedule matches, the following logic should apply (according to what you can enter in the ui).

1] Is the current time within the specified range, if not --> no match
2] (option 1) does (one of) the day(s) of the week matches the one specified in the schedule. if yes --> match
3] (option 2) does (one of) the date(s) [DDMM] match the one specified in the schedule. if yes --> match
This commit is contained in:
Ad Schellevis 2024-03-04 18:10:38 +01:00
parent b01adb4a82
commit 8623a2d4ae
1 changed files with 27 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/etc/inc/filter.inc
View File

@ -689,99 +689,40 @@ function filter_get_time_based_rule_status($schedule)
* if the rule should be installed or not.
*/
foreach ($schedule['timerange'] as $timeday) {
if (empty($timeday['month'])) {
$monthstatus = true;
} else {
$monthstatus = filter_tdr_month($timeday['month']);
$matched_time = true; /* keep original behavior, no time set allows the whole day */
if (!empty($timeday['hour'])) {
$tmp = explode("-", $timeday['hour']);
$now = strtotime("now");
$matched_time = $now >= strtotime($tmp[0]) && $now < strtotime($tmp[1]);
}
if (empty($timeday['day'])) {
$daystatus = true;
} else {
$daystatus = filter_tdr_day($timeday['day']);
}
if (empty($timeday['hour'])) {
$hourstatus = true;
} else {
$hourstatus = filter_tdr_hour($timeday['hour']);
}
if (empty($timeday['position'])) {
$positionstatus = true;
} else {
$positionstatus = filter_tdr_position($timeday['position']);
if ($matched_time) {
if (!empty($timeday['position'])) {
$this_weekday = date("w") == 0 ? 7 : date("w");;
foreach (explode(",", $timeday['position']) as $day) {
if ($day == $this_weekday) {
return true;
}
}
} else {
$months = explode(',', $timeday['month'] ?? '');
$days = explode(',', $timeday['day'] ?? '');
if (empty($months) || empty($days) || count($days) != count($months)) {
/* invalid data */
continue;
}
$today = date("dm");
for ($i=0; $i < count($days) ; ++$i) {
if (sprintf("%02d%02d", $days[$i], $months[$i]) == $today) {
return true;
}
}
}
}
if ($monthstatus == true && $daystatus == true && $positionstatus == true && $hourstatus == true) {
return true;
}
}
return false;
}
function filter_tdr_day($schedule)
{
/*
* Calculate day of month.
* IE: 29th of may
*/
$date = date("d");
$defined_days = explode(",", $schedule);
foreach ($defined_days as $dd) {
if ($date == $dd) {
return true;
}
}
return false;
}
function filter_tdr_hour($schedule)
{
/* $schedule should be a string such as 16:00-19:00 */
$tmp = explode("-", $schedule);
$starting_time = strtotime($tmp[0]);
$ending_time = strtotime($tmp[1]);
$now = strtotime("now");
if ($now >= $starting_time && $now < $ending_time) {
return true;
}
return false;
}
function filter_tdr_position($schedule)
{
/*
* Calculate position, ie: day of week.
* Sunday = 7, Monday = 1, Tuesday = 2
* Weds = 3, Thursday = 4, Friday = 5,
* Saturday = 6
* ...
*/
$weekday = date("w");
if ($weekday == 0) {
$weekday = 7;
}
$schedule_days = explode(",", $schedule);
foreach ($schedule_days as $day) {
if ($day == $weekday) {
return true;
}
}
return false;
}
function filter_tdr_month($schedule)
{
/*
* Calculate month
*/
$todays_month = date("n");
$months = explode(",", $schedule);
foreach ($months as $month) {
if ($month == $todays_month) {
return true;
}
}
return false;
}
function filter_setup_logging_interfaces(&$FilterIflist)
{