safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implementing API improvements made in guacamole-common

Browse Source
This commit is contained in:
Michael Jumper
2011-01-02 14:28:06 -08:00
parent 1dec9e889b
commit 62332e9f65
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleClientProvider.java
View File

@@ -2,10 +2,10 @@
package net.sourceforge.guacamole.net.authentication.basic; package net.sourceforge.guacamole.net.authentication.basic;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleClient; import net.sourceforge.guacamole.GuacamoleTCPClient;
import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.Configuration; import net.sourceforge.guacamole.net.Configuration;
import net.sourceforge.guacamole.net.GuacamoleSession; import net.sourceforge.guacamole.net.GuacamoleProperties;
import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider; import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider;
/* /*
@@ -28,7 +28,7 @@ import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider;
public class BasicGuacamoleClientProvider implements GuacamoleClientProvider { public class BasicGuacamoleClientProvider implements GuacamoleClientProvider {
public GuacamoleClient createClient(HttpSession session) throws GuacamoleException { public GuacamoleTCPClient createClient(HttpSession session) throws GuacamoleException {
// Retrieve authorized config data from session // Retrieve authorized config data from session
Configuration config = (Configuration) session.getAttribute("BASIC-LOGIN-AUTH"); Configuration config = (Configuration) session.getAttribute("BASIC-LOGIN-AUTH");
@@ -37,11 +37,10 @@ public class BasicGuacamoleClientProvider implements GuacamoleClientProvider {
if (config == null) if (config == null)
throw new GuacamoleException("Unauthorized"); throw new GuacamoleException("Unauthorized");
GuacamoleClient client = new GuacamoleClient("localhost", 4822); String hostname = GuacamoleProperties.getProperty("guacd-hostname");
int port = GuacamoleProperties.getIntProperty("guacd-port", null);
// TODO: Send "select" and "connect" messages in client connect function (based on config) ... to be implemented. GuacamoleTCPClient client = new GuacamoleTCPClient(hostname, port);
char[] initMessages = "select:vnc;connect:localhost,5901,potato;".toCharArray();
client.write(initMessages, 0, initMessages.length);
// Return authorized session // Return authorized session
return client; return client;