GUACAMOLE-1332: Merge parameter definitions for automatically trustin…

…g RDP certificates.
apache · Sep 26, 2023 · dd2d566 · dd2d566
2 parents 6710b31 + d7e91a8
commit dd2d566
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 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
@@ -45,6 +45,15 @@
                     "name"    : "ignore-cert",
                     "type"    : "BOOLEAN",
                     "options" : [ "true" ]
+                },
+                {
+                    "name"    : "cert-tofu",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                },
+                {
+                    "name"    : "cert-fingerprints",
+                    "type"    : "TEXT"
                 }
             ]
         },

diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json
@@ -561,20 +561,22 @@
 
     "PROTOCOL_RDP" : {
 
-        "FIELD_HEADER_CLIENT_NAME"     : "Client name:",
-        "FIELD_HEADER_COLOR_DEPTH"     : "Color depth:",
-        "FIELD_HEADER_CONSOLE"         : "Administrator console:",
-        "FIELD_HEADER_CONSOLE_AUDIO"   : "Support audio in console:",
-        "FIELD_HEADER_CREATE_DRIVE_PATH" : "Automatically create drive:",
+        "FIELD_HEADER_CERT_TOFU"             : "Trust host certificate on first use:",
+        "FIELD_HEADER_CERT_FINGERPRINTS"     : "Fingerprints of trusted host certificates:",
+        "FIELD_HEADER_CLIENT_NAME"           : "Client name:",
+        "FIELD_HEADER_COLOR_DEPTH"           : "Color depth:",
+        "FIELD_HEADER_CONSOLE"               : "Administrator console:",
+        "FIELD_HEADER_CONSOLE_AUDIO"         : "Support audio in console:",
+        "FIELD_HEADER_CREATE_DRIVE_PATH"     : "Automatically create drive:",
         "FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",
-        "FIELD_HEADER_DISABLE_AUDIO"   : "Disable audio:",
-        "FIELD_HEADER_DISABLE_AUTH"    : "Disable authentication:",
-        "FIELD_HEADER_DISABLE_COPY"    : "Disable copying from remote desktop:",
+        "FIELD_HEADER_DISABLE_AUDIO"    : "Disable audio:",
+        "FIELD_HEADER_DISABLE_AUTH"     : "Disable authentication:",
+        "FIELD_HEADER_DISABLE_COPY"     : "Disable copying from remote desktop:",
         "FIELD_HEADER_DISABLE_DOWNLOAD" : "Disable file download:",
-        "FIELD_HEADER_DISABLE_PASTE"   : "Disable pasting from client:",
+        "FIELD_HEADER_DISABLE_PASTE"    : "Disable pasting from client:",
         "FIELD_HEADER_DISABLE_UPLOAD"   : "Disable file upload:",
-        "FIELD_HEADER_DOMAIN"          : "Domain:",
-        "FIELD_HEADER_DPI"             : "Resolution (DPI):",
+        "FIELD_HEADER_DOMAIN"           : "Domain:",
+        "FIELD_HEADER_DPI"              : "Resolution (DPI):",
         "FIELD_HEADER_DRIVE_NAME"       : "Drive name:",
         "FIELD_HEADER_DRIVE_PATH"       : "Drive path:",
         "FIELD_HEADER_ENABLE_AUDIO_INPUT"         : "Enable audio input (microphone):",