GUACAMOLE-1701: Implement connection date and time before and after restrictions.

extensions/guacamole-auth-restrict/src/main/resources/config/restrictConfig.js

@@ -36,5 +36,12 @@ angular.module('guacRestrict').config(['formServiceProvider',
         controller  : 'hostRestrictionFieldController',
         templateUrl : 'app/ext/restrict/templates/hostRestrictionField.html'
     });
+    
+    // Define the date and time restriction field
+    formServiceProvider.registerFieldType('GUAC_DATETIME_RESTRICTION', {
+        module      : 'guacRestrict',
+        controller  : 'dateTimeRestrictionFieldController',
+        templateUrl : 'app/ext/restrict/templates/dateTimeRestrictionField.html'
+    });
 
 }]);

extensions/guacamole-auth-restrict/src/main/resources/controllers/dateTimeRestrictionFieldController.js

@@ -0,0 +1,89 @@
+/*
+ * 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, or null if parsing the provided
+     *     string fails.
+     */
+    var parseDate = function parseDate(str) {
+
+        // Parse date, return null if parsing fails
+        var parsedDate = new Date(str);
+        if (isNaN(parsedDate.getTime()))
+            return null;
+
+        return parsedDate;
+
+    };
+
+    // Update typed value when model is changed
+    $scope.$watch('model', function modelChanged(model) {
+        $scope.typedValue = (model ? parseDate(model) : null);
+    });
+
+    // Update string value in model when typed value is changed
+    $scope.$watch('typedValue', function typedValueChanged(typedValue) {
+        $scope.model = (typedValue ? $filter('date')(typedValue, 'yyyy-MM-ddTHH:mm:ssZ', 'UTC') : '');
+    });
+
+}]);

extensions/guacamole-auth-restrict/src/main/resources/guac-manifest.json

@@ -22,8 +22,9 @@
     ],
 
     "resources" : {
-        "templates/hostRestrictionField.html" : "text/html",
-        "templates/timeRestrictionField.html" : "text/html"
+        "templates/dateTimeRestrictionField.html" : "text/html",
+        "templates/hostRestrictionField.html"     : "text/html",
+        "templates/timeRestrictionField.html"     : "text/html"
     }
 
 }

extensions/guacamole-auth-restrict/src/main/resources/templates/dateTimeRestrictionField.html

@@ -0,0 +1,12 @@
+<div class="date-time-restriction-field">
+    <input type="datetime-local"
+           ng-disabled="disabled"
+           ng-attr-id="{{ fieldId }}"
+           ng-attr-name="{{ field.name }}"
+           ng-model="typedValue"
+           ng-model-options="modelOptions"
+           guac-focus="focused"
+           placeholder="{{'RESTRICT.FIELD_PLACEHOLDER_DATE_TIME_RESTRICTION' | translate}}"
+           autocorrect="off"
+           autocapitalize="off">
+</div>

extensions/guacamole-auth-restrict/src/main/resources/translations/en.json

@@ -8,7 +8,9 @@
         
         "FIELD_HEADER_GUAC_RESTRICT_HOSTS_ALLOWED" : "Hosts from which connection may be accessed:",
         "FIELD_HEADER_GUAC_RESTRICT_HOSTS_DENIED"  : "Hosts from which connection may not be accessed:",
+        "FIELD_HEADER_GUAC_RESTRICT_TIME_AFTER"    : "Date and time after which this connection may be used:",
         "FIELD_HEADER_GUAC_RESTRICT_TIME_ALLOWED"  : "Times connection is allowed to be used:",
+        "FIELD_HEADER_GUAC_RESTRICT_TIME_BEFORE"   : "Date and time before which this connection may be used:",
         "FIELD_HEADER_GUAC_RESTRICT_TIME_DENIED"   : "Times connection may not be used:",
         
         "SECTION_HEADER_RESTRICT_LOGIN_FORM" : "Additional Connection Restrictions"
@@ -19,7 +21,9 @@
         
         "FIELD_HEADER_GUAC_RESTRICT_HOSTS_ALLOWED" : "Hosts from which connection group may be accessed:",
         "FIELD_HEADER_GUAC_RESTRICT_HOSTS_DENIED"  : "Hosts from which connection group may not be accessed:",
+        "FIELD_HEADER_GUAC_RESTRICT_TIME_AFTER"    : "Date and time after which this connection group may be used:",
         "FIELD_HEADER_GUAC_RESTRICT_TIME_ALLOWED"  : "Times connection group is allowed to be used:",
+        "FIELD_HEADER_GUAC_RESTRICT_TIME_BEFORE"   : "Date and time before which this connection group may be used:",
         "FIELD_HEADER_GUAC_RESTRICT_TIME_DENIED"   : "Times connection group may not be used:",
         
         "SECTION_HEADER_RESTRICT_LOGIN_FORM" : "Additional Connection Restrictions"
@@ -35,6 +39,8 @@
         "ERROR_USER_LOGIN_NOT_ALLOWED_NOW"       : "The login for this user is not allowed at this time.",
         "ERROR_USER_LOGIN_NOT_ALLOWED_FROM_HOST" : "The login for this user is not allowed from this host.",
         
+        "FIELD_PLACEHOLDER_DATE_TIME_RESTRICTION" : "YYYY-MM-DD HH:MM:SS",
+        
         "TABLE_HEADER_DAY"        : "Day",
         "TABLE_HEADER_END_TIME"   : "End Time",
         "TABLE_HEADER_HOST"       : "Host",