fix(wildcard context matching): Use RFC 3986 path in wildcard match…

…ing. (excludes query parameters)

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [develop](https://github.com/chimurai/http-proxy-middleware/releases/tag/v0.17.0)
+- fix(wildcard context matching): Use [RFC 3986 path](https://tools.ietf.org/html/rfc3986#section-3.3) in wildcard matching. (excludes query parameters)
+
 ## [v0.16.0](https://github.com/chimurai/http-proxy-middleware/releases/tag/v0.16.0)
 - deprecated(proxyTable): renamed `proxyTable` to `router`.
 - feat(router): support for custom `router` function.

lib/context-matcher.js

@@ -33,7 +33,7 @@ function matchContext(context, uri, req) {
 
     // custom matching
     if (_.isFunction(context)) {
-        var path = getUrlPath(uri);
+        var path = getUrl(uri).path;
         return context(path, req);
     }
 
@@ -46,13 +46,13 @@ function matchContext(context, uri, req) {
  * @return {Boolean}
  */
 function matchSingleStringPath(context, uri) {
-    var path = getUrlPath(uri);
+    var path = getUrl(uri).path;
     return path.indexOf(context) === 0;
 }
 
 function matchSingleGlobPath(pattern, uri) {
-    var path = getUrlPath(uri);
-    var matches = micromatch(path, pattern);
+    var pathname = getUrl(uri).pathname;
+    var matches = micromatch(pathname, pattern);
     return matches && (matches.length > 0);
 }
 
@@ -75,8 +75,8 @@ function matchMultiPath(contextList, uri) {
     return false;
 }
 
-function getUrlPath(uri) {
-    return uri && url.parse(uri).path;
+function getUrl(uri) {
+    return uri && url.parse(uri);
 }
 
 function isStringPath(context) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-proxy-middleware",
-  "version": "0.16.0",
+  "version": "0.17.0-beta",
   "description": "The one-liner node.js proxy middleware for connect, express and browser-sync",
   "main": "index.js",
   "scripts": {

test/unit/context-matcher.spec.js

@@ -111,9 +111,9 @@ describe('Context Matching', function() {
                     expect(contextMatcher.match(pattern, 'http://localhost/some/path/index.html')).to.be.false;
                 });
 
-                it('should only match .php files with query params', function() {
-                    expect(contextMatcher.match('/**/*.php', 'http://localhost/a/b/c.php?d=e&e=f')).to.be.false;
-                    expect(contextMatcher.match('/**/*.php?*', 'http://localhost/a/b/c.php?d=e&e=f')).to.be.true;
+                it('should ignore query params', function() {
+                    expect(contextMatcher.match('/**/*.php', 'http://localhost/a/b/c.php?d=e&e=f')).to.be.true;
+                    expect(contextMatcher.match('/**/*.php?*', 'http://localhost/a/b/c.php?d=e&e=f')).to.be.false;
                 });
 
                 it('should only match any file in root path', function() {