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

Migrated to new tunnel servlet API, updated .gitignore

Browse Source
This commit is contained in:
Michael Jumper
2011-01-23 15:25:37 -08:00
parent 297696c905
commit dcd259f93e
6 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicFileAuthenticationProvider.java → guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
View File

@@ -1,5 +1,5 @@
package net.sourceforge.guacamole.net.authentication.basic;
package net.sourceforge.guacamole.net.basic;
/*
* Guacamole - Clientless Remote Desktop

36
guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleClientProvider.java → guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
View File

@@ -1,12 +1,4 @@
package net.sourceforge.guacamole.net.authentication.basic;
import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleTCPClient;
import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.Configuration;
import net.sourceforge.guacamole.net.GuacamoleProperties;
import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider;
package net.sourceforge.guacamole.net.basic;
/*
* Guacamole - Clientless Remote Desktop
@@ -26,12 +18,26 @@ import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider;
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
public class BasicGuacamoleClientProvider implements GuacamoleClientProvider {
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.GuacamoleTCPClient;
import net.sourceforge.guacamole.net.Configuration;
import net.sourceforge.guacamole.net.GuacamoleProperties;
import net.sourceforge.guacamole.net.GuacamoleSession;
import net.sourceforge.guacamole.net.tunnel.GuacamoleTunnelServlet;
public GuacamoleTCPClient createClient(HttpSession session) throws GuacamoleException {
public class BasicGuacamoleTunnelServlet extends GuacamoleTunnelServlet {
@Override
protected void doConnect(HttpServletRequest request, HttpServletResponse response) throws GuacamoleException {
// Session must already exist from login
HttpSession httpSession = request.getSession(false);
// Retrieve authorized config data from session
Configuration config = (Configuration) session.getAttribute("BASIC-LOGIN-AUTH");
Configuration config = (Configuration) httpSession.getAttribute("BASIC-LOGIN-AUTH");
// If no data, not authorized
if (config == null)
@@ -43,9 +49,11 @@ public class BasicGuacamoleClientProvider implements GuacamoleClientProvider {
GuacamoleTCPClient client = new GuacamoleTCPClient(hostname, port);
client.connect(config);
// Return authorized session
return client;
// Set client for session
GuacamoleSession session = new GuacamoleSession(httpSession);
session.attachClient(client);
}
}

2
guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicLogin.java → guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
View File

@@ -1,5 +1,5 @@
package net.sourceforge.guacamole.net.authentication.basic;
package net.sourceforge.guacamole.net.basic;
/*
* Guacamole - Clientless Remote Desktop