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

Added logging via SLF4J

Browse Source
This commit is contained in:
Michael Jumper
2011-07-13 18:08:11 -07:00
parent b9b034eba0
commit 1240b10474
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
guacamole/pom.xml
View File

@@ -16,6 +16,7 @@
<build> <build>
<plugins> <plugins>
<!-- Written for 1.6 -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@@ -38,7 +39,7 @@
</resource> </resource>
</webResources> </webResources>
<!-- Add guacamole-common-js --> <!-- Add files from guacamole-common-js -->
<overlays> <overlays>
<overlay> <overlay>
<groupId>net.sourceforge.guacamole</groupId> <groupId>net.sourceforge.guacamole</groupId>
@@ -51,19 +52,11 @@
</plugin> </plugin>
</plugins> </plugins>
<extensions>
<!-- Required for SSH deploy -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
</extension>
</extensions>
</build> </build>
<dependencies> <dependencies>
<!-- Java servlet API -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
@@ -71,6 +64,20 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- SLF4J - logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
<version>1.6.1</version>
<scope>runtime</scope>
</dependency>
<!-- Guacamole Java API -->
<dependency> <dependency>
<groupId>net.sourceforge.guacamole</groupId> <groupId>net.sourceforge.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
@@ -78,6 +85,7 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Guacamole JavaScript API -->
<dependency> <dependency>
<groupId>net.sourceforge.guacamole</groupId> <groupId>net.sourceforge.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
@@ -89,17 +97,13 @@
</dependencies> </dependencies>
<repositories> <repositories>
<!-- Central Guacamole repository -->
<repository> <repository>
<id>guac-dev</id> <id>guac-dev</id>
<url>http://guac-dev.org/repo</url> <url>http://guac-dev.org/repo</url>
</repository> </repository>
</repositories> </repositories>
<distributionManagement>
<repository>
<id>guac-dev</id>
<url>${guac-dev.dist.repo}</url>
</repository>
</distributionManagement>
</project> </project>

10
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
View File

@@ -31,9 +31,13 @@ import net.sourceforge.guacamole.net.GuacamoleTunnel;
import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket; import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
import net.sourceforge.guacamole.servlet.GuacamoleTunnelServlet; import net.sourceforge.guacamole.servlet.GuacamoleTunnelServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class BasicGuacamoleTunnelServlet extends GuacamoleTunnelServlet { public class BasicGuacamoleTunnelServlet extends GuacamoleTunnelServlet {
private Logger logger = LoggerFactory.getLogger(BasicGuacamoleTunnelServlet.class);
private AuthenticationProvider authProvider; private AuthenticationProvider authProvider;
@Override @Override
@@ -60,8 +64,12 @@ public class BasicGuacamoleTunnelServlet extends GuacamoleTunnelServlet {
// Get authorized config // Get authorized config
GuacamoleConfiguration config = authProvider.getAuthorizedConfiguration(username, password); GuacamoleConfiguration config = authProvider.getAuthorizedConfiguration(username, password);
if (config == null) if (config == null) {
logger.warn("Failed login from {} for user \"{}\".", request.getRemoteAddr(), username);
throw new GuacamoleException("Invalid login"); throw new GuacamoleException("Invalid login");
}
logger.debug("Successful login from {} for user \"{}\".", request.getRemoteAddr(), username);
// Configure and connect socket // Configure and connect socket
String hostname = GuacamoleProperties.getProperty(GuacamoleProperties.GUACD_HOSTNAME); String hostname = GuacamoleProperties.getProperty(GuacamoleProperties.GUACD_HOSTNAME);