Removed connect() from GuacamoleSocket. Added ConfiguredSocket for providing restricted pre-configured (finished with handshake and connect) GuacamoleSockets.

2025-09-10 07:01:21 +00:00 · 2011-05-12 23:41:10 -07:00
parent 11b29d8709
commit 3b7e71a402
8 changed files with 29 additions and 24 deletions
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredSocket.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredSocket.java
@@ -0,0 +1,83 @@
+
+package net.sourceforge.guacamole.protocol;
+
+import net.sourceforge.guacamole.io.GuacamoleReader;
+import net.sourceforge.guacamole.io.GuacamoleWriter;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.GuacamoleSocket;
+import net.sourceforge.guacamole.protocol.GuacamoleInstruction.Operation;
+
+/*
+ *  Guacamole - Clientless Remote Desktop
+ *  Copyright (C) 2010  Michael Jumper
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class ConfiguredSocket implements GuacamoleSocket {
+
+    private GuacamoleSocket socket;
+
+    public ConfiguredSocket(GuacamoleSocket socket, Configuration config) throws GuacamoleException {
+
+        this.socket = socket;
+
+        // Get reader and writer
+        GuacamoleReader reader = socket.getReader();
+        GuacamoleWriter writer = socket.getWriter();
+
+        // Send protocol
+        writer.writeInstruction(new GuacamoleInstruction(Operation.CLIENT_SELECT, config.getProtocol()));
+
+        // Wait for server args
+        GuacamoleInstruction instruction;
+        do {
+            instruction = reader.readInstruction();
+        } while (instruction.getOperation() != Operation.SERVER_ARGS);
+
+        // Build args list off provided names and config
+        String[] args = new String[instruction.getArgs().length];
+        for (int i=0; i<instruction.getArgs().length; i++) {
+
+            String requiredArg = instruction.getArgs()[i];
+
+            String value = config.getParameter(requiredArg);
+            if (value != null)
+                args[i] = value;
+            else
+                args[i] = "";
+            
+        }
+
+        // Send args
+        writer.writeInstruction(new GuacamoleInstruction(Operation.CLIENT_CONNECT, args));
+
+    }
+
+    @Override
+    public GuacamoleWriter getWriter() {
+        return socket.getWriter();
+    }
+
+    @Override
+    public GuacamoleReader getReader() {
+        return socket.getReader();
+    }
+
+    @Override
+    public void close() throws GuacamoleException {
+        socket.close();
+    }
+
+}