Merge branch 'apache:main' into GUACAMOLE-2013

apache · Jan 21, 2025 · bc076c1 · bc076c1
2 parents 85abb6e + fff0015
commit bc076c1
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 3 deletions.
diff --git a/...ult-ksm/src/main/java/org/apache/guacamole/vault/ksm/KsmAuthenticationProviderModule.java b/...ult-ksm/src/main/java/org/apache/guacamole/vault/ksm/KsmAuthenticationProviderModule.java
@@ -19,6 +19,8 @@
 
 package org.apache.guacamole.vault.ksm;
 
+import java.security.Security;
+
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.vault.VaultAuthenticationProviderModule;
 import org.apache.guacamole.vault.ksm.conf.KsmAttributeService;
@@ -36,6 +38,8 @@
 import org.apache.guacamole.vault.secret.VaultSecretService;
 import org.apache.guacamole.vault.user.VaultDirectoryService;
 
+import org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider;
+
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 
 /**
@@ -53,7 +57,14 @@ public class KsmAuthenticationProviderModule
      * @throws GuacamoleException
      *     If configuration details in guacamole.properties cannot be parsed.
      */
-    public KsmAuthenticationProviderModule() throws GuacamoleException {}
+    public KsmAuthenticationProviderModule() throws GuacamoleException {
+        // KSM recommends using BouncyCastleFipsProvider to avoid potential
+        // issues (for example with FIPS enabled RHEL).
+        // https://docs.keeper.io/en/secrets-manager/secrets-manager/developer-sdk-library/java-sdk
+        // The addProvider method checks for duplications internally,
+        // so it is safe to add the same provider multiple times.
+        Security.addProvider(new BouncyCastleFipsProvider());
+    }
 
     @Override
     protected void configureVault() {

diff --git a/guacamole-common-js/src/main/webapp/modules/Client.js b/guacamole-common-js/src/main/webapp/modules/Client.js
@@ -194,7 +194,6 @@ Guacamole.Client = function(tunnel) {
 
                 var index = parseInt(key);
                 var layer = layersSnapshot[key];
-                var canvas = layer.toCanvas();
 
                 // Store layer/buffer dimensions
                 var exportLayer = {
@@ -203,8 +202,10 @@ Guacamole.Client = function(tunnel) {
                 };
 
                 // Store layer/buffer image data, if it can be generated
-                if (layer.width && layer.height)
+                if (layer.width && layer.height) {
+                    var canvas = layer.toCanvas();
                     exportLayer.url = canvas.toDataURL('image/png');
+                }
 
                 // Add layer properties if not a buffer nor the default layer
                 if (index > 0) {

diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/kubernetes.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/kubernetes.json
@@ -96,6 +96,22 @@
             ]
         },
 
+        {
+            "name"  : "clipboard",
+            "fields" : [
+                {
+                    "name"    : "disable-copy",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                },
+                {
+                    "name"    : "disable-paste",
+                    "type"    : "BOOLEAN",
+                    "options" : [ "true" ]
+                }
+            ]
+        },
+
         {
             "name" : "behavior",
             "fields" : [

diff --git a/guacamole/src/main/frontend/src/translations/ca.json b/guacamole/src/main/frontend/src/translations/ca.json
@@ -421,6 +421,8 @@
         "FIELD_HEADER_CONTAINER"       : "Nom del contenidor:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Crea automàticament la ruta de gravació:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Crea automàticament la ruta de typescript:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Desactiva la còpia des del terminal:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Desactiva l'enganxament del client:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Comanda (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Nom del tipus de lletra:",
         "FIELD_HEADER_FONT_SIZE"       : "Mida de la lletra:",
@@ -467,6 +469,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Autenticació",
         "SECTION_HEADER_BEHAVIOR"       : "Comportament del terminal",
+        "SECTION_HEADER_CLIPBOARD"      : "Porta-retalls",
         "SECTION_HEADER_CONTAINER"      : "Contenidor",
         "SECTION_HEADER_DISPLAY"        : "Pantalla",
         "SECTION_HEADER_RECORDING"      : "Gravació de la pantalla",

diff --git a/guacamole/src/main/frontend/src/translations/cs.json b/guacamole/src/main/frontend/src/translations/cs.json
@@ -495,6 +495,8 @@
         "FIELD_HEADER_CONTAINER"       : "Jméno kontejneru:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Automaticky vytvořit cestu k záznamu:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automaticky vytvořit cestu ke strojopisu:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Zakázat kopírování ze vzdáleného terminálu:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Zakázat vkládání z klienta:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Příkaz (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Jméno fontu:",
         "FIELD_HEADER_FONT_SIZE"       : "Velikost fontu:",
@@ -544,6 +546,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Ověřování",
         "SECTION_HEADER_BEHAVIOR"       : "Chování terminálu",
+        "SECTION_HEADER_CLIPBOARD"      : "Schránka",
         "SECTION_HEADER_CONTAINER"      : "Kontejner",
         "SECTION_HEADER_DISPLAY"        : "Zobrazení",
         "SECTION_HEADER_RECORDING"      : "Záznam obrazovky",

diff --git a/guacamole/src/main/frontend/src/translations/de.json b/guacamole/src/main/frontend/src/translations/de.json
@@ -502,6 +502,8 @@
         "FIELD_HEADER_CONTAINER"       : "Container Name:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Aufname-Pfad automatisch erstellen:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Typescript-Pfad automatisch erstellen:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Kopieren deaktivieren:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Einfügen deaktivieren:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Befehl ausführen (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Schriftname:",
         "FIELD_HEADER_FONT_SIZE"       : "Schriftgröße:",
@@ -533,6 +535,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Authentifizierung",
         "SECTION_HEADER_BEHAVIOR"       : "Konsolenverhalten",
+        "SECTION_HEADER_CLIPBOARD"      : "Zwischenablage",
         "SECTION_HEADER_CONTAINER"      : "Container",
         "SECTION_HEADER_DISPLAY"        : "Bildschirm",
         "SECTION_HEADER_RECORDING"      : "Monitor-Aufnahme",

diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json
@@ -511,6 +511,8 @@
         "FIELD_HEADER_CONTAINER"       : "Container name:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Automatically create recording path:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatically create typescript path:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Disable copying from terminal:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Disable pasting from client:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Command (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Font name:",
         "FIELD_HEADER_FONT_SIZE"       : "Font size:",
@@ -562,6 +564,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Authentication",
         "SECTION_HEADER_BEHAVIOR"       : "Terminal behavior",
+        "SECTION_HEADER_CLIPBOARD"      : "Clipboard",
         "SECTION_HEADER_CONTAINER"      : "Container",
         "SECTION_HEADER_DISPLAY"        : "Display",
         "SECTION_HEADER_RECORDING"      : "Screen Recording",

diff --git a/guacamole/src/main/frontend/src/translations/es.json b/guacamole/src/main/frontend/src/translations/es.json
@@ -392,6 +392,8 @@
         "FIELD_HEADER_CONTAINER"       : "Nombre de contenedor:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Crear automáticamente la ruta de grabación:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Crear automáticamente la ruta de transcripción:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Desactivar copia desde el terminal:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Desactivar pegar desde el cliente:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Commando (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Nombre de fuente:",
         "FIELD_HEADER_FONT_SIZE"       : "Tamaño de fuente:",
@@ -441,6 +443,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Autenticación",
         "SECTION_HEADER_BEHAVIOR"       : "Comportamiento del terminal",
+        "SECTION_HEADER_CLIPBOARD"      : "Portapapeles",
         "SECTION_HEADER_CONTAINER"      : "Contenedor",
         "SECTION_HEADER_DISPLAY"        : "Monitor",
         "SECTION_HEADER_RECORDING"      : "Grabación de Pantalla",

diff --git a/guacamole/src/main/frontend/src/translations/fr.json b/guacamole/src/main/frontend/src/translations/fr.json
@@ -506,6 +506,8 @@
         "FIELD_HEADER_CONTAINER"       : "Nom du conteneur:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Créer automatiquement le chemin d'enregistrement:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Créer automatiquement le chemin typescript:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Désactiver copier depuis le terminal:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Désactiver coller depuis le terminal:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Commande (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Nom police:",
         "FIELD_HEADER_FONT_SIZE"       : "Taille police:",
@@ -557,6 +559,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Authentification",
         "SECTION_HEADER_BEHAVIOR"       : "Comportement Terminal",
+        "SECTION_HEADER_CLIPBOARD"      : "Presse-papiers",
         "SECTION_HEADER_CONTAINER"      : "Conteneur",
         "SECTION_HEADER_DISPLAY"        : "Affichage",
         "SECTION_HEADER_RECORDING"      : "Enregistrement Ecran",

diff --git a/guacamole/src/main/frontend/src/translations/ja.json b/guacamole/src/main/frontend/src/translations/ja.json
@@ -357,6 +357,8 @@
         "FIELD_HEADER_CONTAINER"       : "コンテナ名:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "ログの保存ディレクトリを自動的に作成する:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "タイプスクリプトの保存ディレクトリを自動的に作成する:",
+        "FIELD_HEADER_DISABLE_COPY"    : "端末からのコピーを無効化:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "クライアントからの貼り付けを無効化:",
         "FIELD_HEADER_FONT_NAME"       : "フォント名:",
         "FIELD_HEADER_FONT_SIZE"       : "フォントサイズ:",
         "FIELD_HEADER_HOSTNAME"        : "ホスト名:",
@@ -395,6 +397,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "認証",
         "SECTION_HEADER_BEHAVIOR"       : "ターミナルのふるまい",
+        "SECTION_HEADER_CLIPBOARD"      : "クリップボード",
         "SECTION_HEADER_CONTAINER"      : "コンテナ",
         "SECTION_HEADER_DISPLAY"        : "ディスプレイ",
         "SECTION_HEADER_RECORDING"      : "スクリーンレコーディング",

diff --git a/guacamole/src/main/frontend/src/translations/ko.json b/guacamole/src/main/frontend/src/translations/ko.json
@@ -389,6 +389,8 @@
         "FIELD_HEADER_CONTAINER"       : "컨테이너 이름 :",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "자동으로 레코드 경로 생성 :",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "자동으로 typescript 경로 생성 :",
+        "FIELD_HEADER_DISABLE_COPY"    : "터미널에서 복사 비활성화:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "클라이언트에서 붙여넣기 비활성화:",
         "FIELD_HEADER_EXEC_COMMAND"    : "명령어 (exec):",
         "FIELD_HEADER_FONT_NAME"       : "글꼴 이름 :",
         "FIELD_HEADER_FONT_SIZE"       : "글꼴 크기 :",
@@ -434,6 +436,7 @@
         "NAME" : "Kubernetes",
         "SECTION_HEADER_AUTHENTICATION" : "인증",
         "SECTION_HEADER_BEHAVIOR"       : "터미널 동작",
+        "SECTION_HEADER_CLIPBOARD"      : "클립보드",
         "SECTION_HEADER_CONTAINER"      : "컨테이너",
         "SECTION_HEADER_DISPLAY"        : "디스플레이",
         "SECTION_HEADER_RECORDING"      : "스크린 레코드",

diff --git a/guacamole/src/main/frontend/src/translations/pl.json b/guacamole/src/main/frontend/src/translations/pl.json
@@ -412,6 +412,8 @@
         "FIELD_HEADER_CONTAINER"       : "Nazwa kontenera:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Automatycznie utwórz ścieżkę nagrywania:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Automatycznie utwórz ścieżkę maszynopisu:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Wyłącz kopiowanie z terminala:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Wyłącz wklejanie z klienta:",
         "FIELD_HEADER_EXEC_COMMAND"    : "Komenda (exec):",
         "FIELD_HEADER_FONT_NAME"       : "Nazwa czcionki:",
         "FIELD_HEADER_FONT_SIZE"       : "Rozmiar czcionki:",
@@ -461,6 +463,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Uwierzytelnianie",
         "SECTION_HEADER_BEHAVIOR"       : "Zachowanie terminala",
+        "SECTION_HEADER_CLIPBOARD"      : "Schowek",
         "SECTION_HEADER_CONTAINER"      : "Kontener",
         "SECTION_HEADER_DISPLAY"        : "Wyświetlanie",
         "SECTION_HEADER_RECORDING"      : "Nagrywanie Ekranu",

diff --git a/guacamole/src/main/frontend/src/translations/pt.json b/guacamole/src/main/frontend/src/translations/pt.json
@@ -393,6 +393,8 @@
         "FIELD_HEADER_CONTAINER"       : "Nome do container:",
         "FIELD_HEADER_CREATE_RECORDING_PATH"  : "Criar caminho de gravação automaticamente:",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "Criar caminho de transcrição automaticamente:",
+        "FIELD_HEADER_DISABLE_COPY"    : "Desabilitar copiar do terminal:",
+        "FIELD_HEADER_DISABLE_PASTE"   : "Desabilitar colar do cliente:",
         "FIELD_HEADER_FONT_NAME"       : "Nome da fonte:",
         "FIELD_HEADER_FONT_SIZE"       : "Tamanho da fonte:",
         "FIELD_HEADER_HOSTNAME"        : "Nome do host:",
@@ -441,6 +443,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "Autenticação",
         "SECTION_HEADER_BEHAVIOR"       : "Comportamento do terminal",
+        "SECTION_HEADER_CLIPBOARD"      : "Área de Transferência",
         "SECTION_HEADER_CONTAINER"      : "Container",
         "SECTION_HEADER_DISPLAY"        : "Tela",
         "SECTION_HEADER_RECORDING"      : "Gravação da Tela",

diff --git a/guacamole/src/main/frontend/src/translations/zh.json b/guacamole/src/main/frontend/src/translations/zh.json
@@ -492,6 +492,8 @@
         "FIELD_HEADER_CONTAINER"       : "容器名称：",
         "FIELD_HEADER_CREATE_RECORDING_PATH" : "自动建立录像目录：",
         "FIELD_HEADER_CREATE_TYPESCRIPT_PATH" : "自动建立 Typescript 目录：",
+        "FIELD_HEADER_DISABLE_COPY"    : "禁用从终端复制：",
+        "FIELD_HEADER_DISABLE_PASTE"   : "禁用从客户端粘贴：",
         "FIELD_HEADER_EXEC_COMMAND"    : "命令（exec）：",
         "FIELD_HEADER_FONT_NAME"      : "字体名：",
         "FIELD_HEADER_FONT_SIZE"      : "字体大小：",
@@ -541,6 +543,7 @@
 
         "SECTION_HEADER_AUTHENTICATION" : "认证方式",
         "SECTION_HEADER_BEHAVIOR"       : "终端行为",
+        "SECTION_HEADER_CLIPBOARD"      : "剪贴板",
         "SECTION_HEADER_CONTAINER"      : "容器",
         "SECTION_HEADER_DISPLAY"        : "显示",
         "SECTION_HEADER_RECORDING"      : "屏幕录制",