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

Rename from guacamole-default-webapp to guacamole, migrate to guacamole-auth.

Browse Source
This commit is contained in:
Michael Jumper
2012-03-22 22:44:39 -07:00
parent 6b4d49d697
commit 194784809d
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole/pom.xml
View File

@@ -3,10 +3,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.guacamole</groupId> <groupId>net.sourceforge.guacamole</groupId>
<artifactId>guacamole-default-webapp</artifactId> <artifactId>guacamole</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>0.6.0</version> <version>0.6.0</version>
<name>guacamole-default-webapp</name> <name>guacamole</name>
<url>http://guacamole.sourceforge.net/</url> <url>http://guacamole.sourceforge.net/</url>
<properties> <properties>
@@ -87,7 +87,7 @@
<!-- Guacamole Authentication API --> <!-- Guacamole Authentication API -->
<dependency> <dependency>
<groupId>net.sourceforge.guacamole</groupId> <groupId>net.sourceforge.guacamole</groupId>
<artifactId>guacamole-common-auth</artifactId> <artifactId>guacamole-auth</artifactId>
<version>0.6.0</version> <version>0.6.0</version>
</dependency> </dependency>

6
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
View File

@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.auth.UsernamePassword; import net.sourceforge.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.properties.FileGuacamoleProperty; import net.sourceforge.guacamole.properties.FileGuacamoleProperty;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import net.sourceforge.guacamole.properties.GuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
@@ -51,7 +51,7 @@ import org.xml.sax.helpers.XMLReaderFactory;
* *
* @author Michael Jumper * @author Michael Jumper
*/ */
public class BasicFileAuthenticationProvider implements AuthenticationProvider<UsernamePassword> { public class BasicFileAuthenticationProvider implements AuthenticationProvider {
private Logger logger = LoggerFactory.getLogger(BasicFileAuthenticationProvider.class); private Logger logger = LoggerFactory.getLogger(BasicFileAuthenticationProvider.class);
@@ -113,7 +113,7 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider<U
} }
@Override @Override
public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(UsernamePassword credentials) throws GuacamoleException { public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentials credentials) throws GuacamoleException {
// Check mapping file mod time // Check mapping file mod time
File userMappingFile = getUserMappingFile(); File userMappingFile = getUserMappingFile();

7
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
View File

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.auth.UsernamePassword; import net.sourceforge.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import net.sourceforge.guacamole.properties.GuacamoleProperties;
import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
@@ -75,7 +75,10 @@ public class BasicLogin extends HttpServlet {
String username = request.getParameter("username"); String username = request.getParameter("username");
String password = request.getParameter("password"); String password = request.getParameter("password");
UsernamePassword credentials = new UsernamePassword(); // Build credentials object
Credentials credentials = new Credentials ();
credentials.setSession(httpSession);
credentials.setRequest(request);
credentials.setUsername(username); credentials.setUsername(username);
credentials.setPassword(password); credentials.setPassword(password);