necouchman commented on code in PR #1029:
URL: https://github.com/apache/guacamole-client/pull/1029#discussion_r1802150479
##########
extensions/guacamole-auth-restrict/src/main/java/org/apache/guacamole/auth/restrict/RestrictionVerificationService.java:
##########
@@ -54,6 +54,67 @@ public class RestrictionVerificationService {
*/
private static final Logger LOGGER =
LoggerFactory.getLogger(RestrictionVerificationService.class);
+ /**
+ * Given the provided strings of an absolute date after which an action is
+ * valid and before which an action is valid, parse the strings into Date
+ * objects and determine if the current date and time falls within the
+ * provided window, returning the appropriate restriction type.
+ *
+ * @param afterTimeString
+ * The string that has the date and time value after which the activity
+ * is allowed.
+ *
+ * @param beforeTimeString
+ * The string that has the date and time value before which the
activity
+ * is allowed.
+ *
+ * @return
+ * The RestrictionType that represents the allowed or denied state of
+ * the activity.
+ */
+ private static RestrictionType allowedByDateTimeRestrictions(
+ String afterTimeString, String beforeTimeString) {
+
+ // Set a default restriction.
+ RestrictionType dateTimeRestriction = RestrictionType.IMPLICIT_ALLOW;
+
+ // Check the after string and make sure that now is after that date.
+ if (afterTimeString != null && !afterTimeString.isEmpty()) {
+ Date now = new Date();
+ try {
+ Date afterTime =
DateTimeRestrictionField.parse(afterTimeString);
+ if (now.before(afterTime))
+ return RestrictionType.EXPLICIT_DENY;
+ }
+ catch (ParseException e) {
+ LOGGER.warn("Failed to parse date and time string: {}:",
e.getMessage());
+ LOGGER.debug("Parse exception while parsing date and time
string.", e);
+ return RestrictionType.IMPLICIT_DENY;
+ }
+ dateTimeRestriction = RestrictionType.EXPLICIT_ALLOW;
+ }
+
+ // Check the before string and make sure that now is prior to that
date.
+ if (beforeTimeString != null && !beforeTimeString.isEmpty()) {
+ Date now = new Date();
+ try {
+ Date beforeTime =
DateTimeRestrictionField.parse(beforeTimeString);
+ if (now.after(beforeTime))
+ return RestrictionType.EXPLICIT_DENY;
+ }
+ catch (ParseException e) {
+ LOGGER.warn("Failed to parse date and time string: {}:",
e.getMessage());
+ LOGGER.debug("Parse exception while parsing date and time
string.", e);
+ return RestrictionType.IMPLICIT_DENY;
+ }
+ dateTimeRestriction = RestrictionType.EXPLICIT_ALLOW;
+
+ }
+
+ // No restrictions present, so we allow the connection.
Review Comment:
Fixed via rebase.
##########
extensions/guacamole-auth-restrict/src/main/resources/controllers/dateTimeRestrictionFieldController.js:
##########
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+/**
+ * Controller for date+time restriction fields.
+ */
+angular.module('form').controller('dateTimeRestrictionFieldController',
+ ['$scope', '$injector',
+ function dateTimeRestrictionFieldController($scope, $injector) {
+
+ // Required services
+ var $filter = $injector.get('$filter');
+
+ /**
+ * Options which dictate the behavior of the input field model, as defined
+ * by https://docs.angularjs.org/api/ng/directive/ngModelOptions
+ *
+ * @type Object.<String, String>
+ */
+ $scope.modelOptions = {
+
+ /**
+ * Space-delimited list of events on which the model will be updated.
+ *
+ * @type String
+ */
+ updateOn : 'blur',
+
+ /**
+ * The time zone to use when reading/writing the Date object of the
+ * model.
+ *
+ * @type String
+ */
+ timezone : 'UTC'
+
+ };
+
+ /**
+ * Parses the date and time components of the given string into a Date in
+ * the UTC timezone. The input string must be in the format
+ * YYYY-MM-DDTHH:mm:ss (zero-padded).
+ *
+ * @param {String} str
+ * The date+time string to parse.
+ *
+ * @returns {Date}
+ * A Date object, in the UTC timezone.
Review Comment:
Fixed via rebase.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
