From 803ff274688cd83e339e5ce0515411d08db71199 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 13 May 2019 18:21:38 -0700 Subject: [PATCH 1/3] GUACAMOLE-422: Update TIMEZONE field documentation to reference IANA time zone database. --- .../main/java/org/apache/guacamole/form/TimeZoneField.java | 5 +++-- .../webapp/app/form/controllers/timeZoneFieldController.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java index 93054101b..90084e4cc 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java @@ -20,8 +20,9 @@ package org.apache.guacamole.form; /** - * Represents a time zone field. The field may contain only valid time zone IDs, - * as dictated by TimeZone.getAvailableIDs(). + * Represents a time zone field. The field may contain only valid time zone + * identifiers, as defined by the IANA time zone database. Such identifiers are + * also valid Java time zone IDs as dictated by TimeZone.getAvailableIDs(). */ public class TimeZoneField extends Field { diff --git a/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js b/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js index 5f1791533..26157e879 100644 --- a/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js +++ b/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js @@ -19,8 +19,9 @@ /** - * Controller for time zone fields. Time zone fields use Java IDs as the - * standard representation for each supported time zone. + * Controller for time zone fields. Time zone fields use IANA time zone + * database identifiers as the standard representation for each supported time + * zone. These identifiers are also legal Java time zone IDs. */ angular.module('form').controller('timeZoneFieldController', ['$scope', '$injector', function timeZoneFieldController($scope, $injector) { From 5be810ec6b3de63e180fa4c03f341139acf94fad Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 13 May 2019 18:24:37 -0700 Subject: [PATCH 2/3] GUACAMOLE-422: Remove "Canada/East-Saskatchewan" time zone, which was removed from the IANA database in release 2017c of the database. From http://mm.icann.org/pipermail/tz-announce/2017-October/000047.html: > > Remove Canada/East-Saskatchewan from the 'backward' file, as it > exceeded the 14-character limit and was an unused misnomer anyway. > --- .../main/webapp/app/form/controllers/timeZoneFieldController.js | 1 - 1 file changed, 1 deletion(-) diff --git a/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js b/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js index 26157e879..39f0c38ec 100644 --- a/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js +++ b/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js @@ -419,7 +419,6 @@ angular.module('form').controller('timeZoneFieldController', ['$scope', '$inject "Canada" : { "Atlantic" : "Canada/Atlantic", "Central" : "Canada/Central", - "East-Saskatchewan" : "Canada/East-Saskatchewan", "Eastern" : "Canada/Eastern", "Mountain" : "Canada/Mountain", "Newfoundland" : "Canada/Newfoundland", From fb3451283309e73c10f0c128c42cb58930649129 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 13 May 2019 18:26:01 -0700 Subject: [PATCH 3/3] GUACAMOLE-422: Use TIMEZONE rather than TEXT fields for RDP/SSH "timezone" parameter. It has been confirmed that the TIMEZONE field does indeed represent IANA time zone database IDs, as required by the "timezone" parameter. --- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 2 +- .../src/main/resources/org/apache/guacamole/protocols/ssh.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json index 11a4d080f..bebc27e2c 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json @@ -108,7 +108,7 @@ }, { "name" : "timezone", - "type" : "TEXT" + "type" : "TIMEZONE" }, { "name" : "console", diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json index a25e26628..c38da3375 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json @@ -80,7 +80,7 @@ }, { "name" : "timezone", - "type" : "TEXT" + "type" : "TIMEZONE" }, { "name" : "server-alive-interval",