Simplify original request paths.

Assisted-By: devx/cbdeae41-9308-4071-ad53-58cd92db2946

Author: samuel-williams-shopify

lib/utopia/request.rb

@@ -101,7 +101,7 @@ def request_path
 		# The original request path as decoded application components.
 		# @returns [Utopia::Path] The normalized original request path.
 		def original_path
-			path = Protocol::URL::Path[self.request_path].normalize
+			path = Protocol::URL::Path[self.request_path].normalize.simplify
 			return Path.new(path.components(Protocol::URL::Encoding::System))
 		end
 

test/utopia/content/document.rb

@@ -22,6 +22,15 @@
 		expect(document.request_path).to be == Utopia::Path["/index"]
 	end
 
+	it "uses the normalized original request path" do
+		request = Utopia::Request["GET", "/nested/../%69ndex"]
+		document = subject.new(request, {})
+		
+		request.path = "/rewritten"
+		
+		expect(document.request_path).to be == Utopia::Path["/index"]
+	end
+	
 	it "should generate valid self-closing markup" do
 		node = proc do |document, state|
 			document.tag("img", src: "cats.jpg")

test/utopia/request.rb

@@ -38,6 +38,13 @@
 		expect(request.request_path).to be == "/search"
 	end
 
+	it "normalizes and simplifies the original request path" do
+		request = Utopia::Request["GET", "/nested/../%69ndex?key=value"]
+		request.path = "/rewritten"
+		
+		expect(request.original_path).to be == Utopia::Path["/index"]
+	end
+	
 	it "identifies POST requests" do
 		expect(request.post?).to be == true