projects
/
guacamole.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
97ea2c0
)
Rename from guacamole-default-webapp to guacamole, migrate to guacamole-auth.
author
Michael Jumper <zhangmaike@users.sourceforge.net>
Fri, 23 Mar 2012 05:44:39 +0000
(22:44 -0700)
committer
Michael Jumper <zhangmaike@users.sourceforge.net>
Fri, 23 Mar 2012 05:44:39 +0000
(22:44 -0700)
pom.xml
patch
|
blob
|
history
src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
patch
|
blob
|
history
src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
patch
|
blob
|
history
diff --git
a/pom.xml
b/pom.xml
index
72e019a
..
66c1e94
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-3,10
+3,10
@@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.guacamole</groupId>
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.guacamole</groupId>
- <artifactId>guacamole-default-webapp</artifactId>
+ <artifactId>guacamole</artifactId>
<packaging>war</packaging>
<version>0.6.0</version>
<packaging>war</packaging>
<version>0.6.0</version>
- <name>guacamole-default-webapp</name>
+ <name>guacamole</name>
<url>http://guacamole.sourceforge.net/</url>
<properties>
<url>http://guacamole.sourceforge.net/</url>
<properties>
@@
-87,7
+87,7
@@
<!-- Guacamole Authentication API -->
<dependency>
<groupId>net.sourceforge.guacamole</groupId>
<!-- Guacamole Authentication API -->
<dependency>
<groupId>net.sourceforge.guacamole</groupId>
- <artifactId>guacamole-common-auth</artifactId>
+ <artifactId>guacamole-auth</artifactId>
<version>0.6.0</version>
</dependency>
<version>0.6.0</version>
</dependency>
diff --git
a/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
b/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
index
3f14763
..
316f093
100644
(file)
--- a/
src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/
src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@
-31,7
+31,7
@@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import net.sourceforge.guacamole.GuacamoleException;
import java.util.HashMap;
import java.util.Map;
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.GuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
import net.sourceforge.guacamole.properties.FileGuacamoleProperty;
import net.sourceforge.guacamole.properties.GuacamoleProperties;
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
File userMappingFile = getUserMappingFile();
// Check mapping file mod time
File userMappingFile = getUserMappingFile();
diff --git
a/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
b/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
index
f7b8355
..
e3714a4
100644
(file)
--- a/
src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
+++ b/
src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
@@
-27,7
+27,7
@@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleException;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
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.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
import net.sourceforge.guacamole.properties.GuacamoleProperties;
import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
@@
-75,7
+75,10
@@
public class BasicLogin extends HttpServlet {
String username = request.getParameter("username");
String password = request.getParameter("password");
String username = request.getParameter("username");
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.setPassword(password);
credentials.setUsername(username);
credentials.setPassword(password);