From e37174b6990e9f51019f234fc9dc6106c914e888 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 24 Mar 2012 22:48:29 -0700 Subject: [PATCH] Remove use of X-Guacamole-Error-Message header, return null rather than throwing exception when config not found. --- .../sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java | 1 - .../guacamole/net/basic/BasicGuacamoleTunnelServlet.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java b/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java index b2aa8ff..e696986 100644 --- a/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java +++ b/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java @@ -150,7 +150,6 @@ public abstract class AuthenticatingHttpServlet extends HttpServlet { * @throws IOException If an error occurs while sending the error. */ private void failAuthentication(HttpServletResponse response) throws IOException { - response.setHeader("X-Guacamole-Error-Message", AUTH_ERROR_MESSAGE); response.sendError(HttpServletResponse.SC_FORBIDDEN); } diff --git a/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java index 2962e50..a04f5e7 100644 --- a/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java +++ b/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java @@ -176,8 +176,8 @@ public class BasicGuacamoleTunnelServlet extends AuthenticatingHttpServlet { // Get authorized config GuacamoleConfiguration config = configs.get(id); if (config == null) { - logger.error("Error retrieving authorized configuration id={}.", id); - throw new GuacamoleException("Unknown configuration ID."); + logger.error("Configuration id={} not found.", id); + return null; } logger.info("Successful connection from {} to \"{}\".", request.getRemoteAddr(), id); -- 1.7.10.4