[patch] Patch for issue fixing unsafe URLs during parsing

HttpRequestHdr.java.patch (text/plain), 1.76 KB, created by Philippe Mouawad on 2013-08-03 22:50:40 UTC

(hide)

Description: Patch for issue fixing unsafe URLs during parsing

Filename:

MIME Type:

Creator: Philippe Mouawad

Created: 2013-08-03 22:50:40 UTC

Size: 1.76 KB

patch

obsolete

>Index: src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java >=================================================================== >--- src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (revision 1509948) >+++ src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (working copy) >@@ -21,7 +21,9 @@ > import java.io.ByteArrayOutputStream; > import java.io.IOException; > import java.io.InputStream; >+import java.net.URI; > import java.net.URL; >+import java.net.URLDecoder; > import java.util.HashMap; > import java.util.Map; > import java.util.StringTokenizer; >@@ -167,9 +169,31 @@ > if (url.startsWith("/")) { > url = HTTPS + "://" + paramHttps + url; // $NON-NLS-1$ > } >+ try { >+ URI testCleanUri = new URI(url); >+ } catch (Exception e) { >+ log.info("Url contains unsafe characters"); >+ try { >+ url = escapeIllegalURLCharacters(url); >+ } catch (Exception e1) { >+ log.error("Error sanitzing URL:"+url); >+ } >+ } > log.debug("First Line: " + url); > } > >+ /** >+ * @param url >+ * @return >+ * @throws Exception >+ */ >+ public static String escapeIllegalURLCharacters(String url) throws Exception{ >+ String decodeUrl = URLDecoder.decode(url,"UTF-8"); >+ URL urlString = new URL(decodeUrl); >+ URI uri = new URI(urlString.getProtocol(), urlString.getUserInfo(), urlString.getHost(), urlString.getPort(), urlString.getPath(), urlString.getQuery(), urlString.getRef()); >+ return uri.toString(); >+ } >+ > /* > * Split line into name/value pairs and store in headers if relevant > * If name = "content-length", then return value as int, else return 0 View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]