safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1020: Handle differences in Sunday processing for Java and JavaScript.

Browse Source
This commit is contained in:
Virtually Nick
2024-09-09 11:15:13 -04:00
parent d97cde0e6f
commit cc14281f01
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/guacamole-auth-restrict/src/main/java/org/apache/guacamole/calendar/TimeRestrictionParser.java
View File

@@ -49,7 +49,7 @@ public class TimeRestrictionParser {
* </ul> * </ul>
*/ */
private static final Pattern RESTRICTION_REGEX = private static final Pattern RESTRICTION_REGEX =
Pattern.compile("(?:^|;)+([1-7*])(?::((?:[01][0-9]|2[0-3])[0-5][0-9])\\-((?:[01][0-9]|2[0-3])[0-5][0-9]))+"); Pattern.compile("(?:^|;)+([0-7*])(?::((?:[01][0-9]|2[0-3])[0-5][0-9])\\-((?:[01][0-9]|2[0-3])[0-5][0-9]))+");
/** /**
* The RegEx group that contains the start day-of-week of the restriction. * The RegEx group that contains the start day-of-week of the restriction.
@@ -136,7 +136,14 @@ public class TimeRestrictionParser {
// A specific day of the week. // A specific day of the week.
default: default:
restrictions.add(new DailyRestriction(DayOfWeek.of(Integer.parseInt(dayString)), startTime, endTime)); int dayInt = Integer.parseInt(dayString);
// While JavaScript sees Sunday as "0" and "7", DayOfWeek
// does not, so we'll convert it to "7" in order to process it.
if (dayInt == 0)
dayInt = 7;
restrictions.add(new DailyRestriction(DayOfWeek.of(dayInt), startTime, endTime));
} }

13
extensions/guacamole-auth-restrict/src/main/resources/controllers/timeRestrictionFieldController.js
View File

@@ -58,7 +58,6 @@ angular.module('guacRestrict').controller('timeRestrictionFieldController', ['$s
* twice - once for the 0-index and once for the 7 index. * twice - once for the 0-index and once for the 7 index.
*/ */
$scope.weekDays = [ $scope.weekDays = [
{ id : '0', day : 'Sunday' },
{ id : '1', day : 'Monday' }, { id : '1', day : 'Monday' },
{ id : '2', day : 'Tuesday' }, { id : '2', day : 'Tuesday' },
{ id : '3', day : 'Wednesday' }, { id : '3', day : 'Wednesday' },
@@ -132,8 +131,16 @@ angular.module('guacRestrict').controller('timeRestrictionFieldController', ['$s
if (restrictionRegex.test(restrArray[i])) { if (restrictionRegex.test(restrArray[i])) {
var currArray = restrArray[i].match(restrictionRegex); var currArray = restrArray[i].match(restrictionRegex);
let entry = new TimeRestrictionEntry(); let entry = new TimeRestrictionEntry();
entry.startTime = new Date(Date.UTC(templateDate.getFullYear(), templateDate.getMonth(), templateDate.getDate(), parseInt(currArray[2].slice(0,2)), parseInt(currArray[2].slice(2)))); entry.startTime = new Date(Date.UTC(templateDate.getFullYear(),
entry.endTime = new Date(Date.UTC(templateDate.getFullYear(), templateDate.getMonth(), templateDate.getDate(), parseInt(currArray[3].slice(0,2)), parseInt(currArray[3].slice(2)))); templateDate.getMonth(),
templateDate.getDate(),
parseInt(currArray[2].slice(0,2)),
parseInt(currArray[2].slice(2))));
entry.endTime = new Date(Date.UTC(templateDate.getFullYear(),
templateDate.getMonth(),
templateDate.getDate(),
parseInt(currArray[3].slice(0,2)),
parseInt(currArray[3].slice(2))));
var origDay = currArray[1]; var origDay = currArray[1];
if (currArray[1] === '*') if (currArray[1] === '*')