Author: remy.maucherat(a)jboss.com Date: 2008-08-05 09:28:49 -0400 (Tue, 05 Aug 2008) New Revision: 740 Modified: branches/2.0.x/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java Log: - CVE-2008-2938: Additional URI decoding checks. Modified: branches/2.0.x/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2008-08-05 13:28:16 UTC (rev 739) +++ branches/2.0.x/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2008-08-05 13:28:49 UTC (rev 740) @@ -380,6 +380,12 @@ } // Character decoding convertURI(decodedURI, request); + // Check that the URI is still normalized + if (!checkNormalize(req.decodedURI())) { + res.setStatus(400); + res.setMessage("Invalid URI character encoding"); + return false; + } } else { // The URL is chars or String, and has been sent using an in-memory // protocol handler, we have to assume the URL has been properly @@ -744,6 +750,67 @@ } + /** + * Check that the URI is normalized following character decoding. + * <p> + * This method checks for "\", 0, "//", "/./" and "/../". This method will + * return false if sequences that are supposed to be normalized are still + * present in the URI. + * + * @param uriMB URI to be checked (should be chars) + */ + public static boolean checkNormalize(MessageBytes uriMB) { + + CharChunk uriCC = uriMB.getCharChunk(); + char[] c = uriCC.getChars(); + int start = uriCC.getStart(); + int end = uriCC.getEnd(); + + int pos = 0; + + // Check for '\' and 0 + for (pos = start; pos < end; pos++) { + if (c[pos] == '\\') { + return false; + } + if (c[pos] == 0) { + return false; + } + } + + // Check for "//" + for (pos = start; pos < (end - 1); pos++) { + if (c[pos] == '/') { + if (c[pos + 1] == '/') { + return false; + } + } + } + + // Check for ending with "/." or "/.." + if (((end - start) >= 2) && (c[end - 1] == '.')) { + if ((c[end - 2] == '/') + || ((c[end - 2] == '.') + && (c[end - 3] == '/'))) { + return false; + } + } + + // Check for "/./" + if (uriCC.indexOf("/./", 0, 3, 0) >= 0) { + return false; + } + + // Check for "/../" + if (uriCC.indexOf("/../", 0, 4, 0) >= 0) { + return false; + } + + return true; + + } + + // ------------------------------------------------------ Protected Methods