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

Ignore anything after UUID in tunnel requests (required for fix to #201).

Browse Source
This commit is contained in:
Michael Jumper
2012-10-16 14:13:48 -07:00
parent 2a89f9ff09
commit 361b3149a5
1 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
View File

@@ -59,6 +59,31 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
private Logger logger = LoggerFactory.getLogger(GuacamoleHTTPTunnelServlet.class); private Logger logger = LoggerFactory.getLogger(GuacamoleHTTPTunnelServlet.class);
/**
* The prefix of the query string which denotes a tunnel read operation.
*/
private static final String READ_PREFIX = "read:";
/**
* The prefix of the query string which denotes a tunnel write operation.
*/
private static final String WRITE_PREFIX = "write:";
/**
* The length of the read prefix, in characters.
*/
private static final int READ_PREFIX_LENGTH = READ_PREFIX.length();
/**
* The length of the write prefix, in characters.
*/
private static final int WRITE_PREFIX_LENGTH = WRITE_PREFIX.length();
/**
* The length of every tunnel UUID, in characters.
*/
private static final int UUID_LENGTH = 36;
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
handleTunnelRequest(request, response); handleTunnelRequest(request, response);
@@ -151,13 +176,19 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
} }
// If read operation, call doRead() with tunnel UUID // If read operation, call doRead() with tunnel UUID, ignoring any
else if(query.startsWith("read:")) // characters following the tunnel UUID.
doRead(request, response, query.substring(5)); else if(query.startsWith(READ_PREFIX))
doRead(request, response, query.substring(
READ_PREFIX_LENGTH,
READ_PREFIX_LENGTH + UUID_LENGTH));
// If write operation, call doWrite() with tunnel UUID // If write operation, call doWrite() with tunnel UUID, ignoring any
else if(query.startsWith("write:")) // characters following the tunnel UUID.
doWrite(request, response, query.substring(6)); else if(query.startsWith(WRITE_PREFIX))
doWrite(request, response, query.substring(
WRITE_PREFIX_LENGTH,
WRITE_PREFIX_LENGTH + UUID_LENGTH));
// Otherwise, invalid operation // Otherwise, invalid operation
else else