Prevent NormalModule contextify from contextifying query parameters

donocode · donocode · commit 174fd4e21bc3 · 2017-08-29T23:50:22.000+02:00
When passing a path as part of a loader query string the contextify
function incorrectly modifies the query string paths, most notably
converting windows separators
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -34,12 +34,13 @@ function asString(buf) {
 
 function contextify(context, request) {
 	return request.split("!").map(function(r) {
-		let rp = path.relative(context, r);
+		const splitPath = r.split("?");
+		splitPath[0] = path.relative(context, splitPath[0]);
 		if(path.sep === "\\")
-			rp = rp.replace(/\\/g, "/");
-		if(rp.indexOf("../") !== 0)
-			rp = "./" + rp;
-		return rp;
+			splitPath[0] = splitPath[0].replace(/\\/g, "/");
+		if(splitPath[0].indexOf("../") !== 0)
+			splitPath[0] = "./" + splitPath[0];
+		return splitPath.join("?");
 	}).join("!");
 }
 
diff --git a/test/NormalModule.test.js b/test/NormalModule.test.js
@@ -81,6 +81,22 @@ describe("NormalModule", function() {
 				}).should.eql("../userRequest!../other/userRequest!../thing/is/off/here");
 			});
 		});
+		describe("given a userRequest containing query parameters", function() {
+			it("ignores paths in query parameters", function() {
+				userRequest = "some/context/loader?query=foo\\bar&otherPath=testpath/other";
+				normalModule = new NormalModule(
+					request,
+					userRequest,
+					rawRequest,
+					loaders,
+					resource,
+					parser
+				);
+				normalModule.libIdent({
+					context: "some/context",
+				}).should.eql("./loader?query=foo\\bar&otherPath=testpath/other");
+			});
+		});
 	});
 
 	describe("#nameForCondition", function() {
