Revert explicit escaping

src/Scarf/Gateway/Rule.hs

@@ -45,7 +45,7 @@ import Data.Text (Text)
 import Data.Text qualified as Text
 import Data.Text.Encoding qualified as Text
 import Network.HTTP.Types.URI (Query, parseQuery, parseQueryText, renderQuery)
-import Network.URI (URI (..), escapeURIString, isUnreserved, parseRelativeReference, parseURI)
+import Network.URI (URI (..), parseRelativeReference, parseURI)
 import Network.Wai
   ( pathInfo,
     rawQueryString,
@@ -643,11 +643,15 @@ rewriteQueryString ::
   Wai.Request ->
   ByteString
 rewriteQueryString redirectTarget request
+  -- Fast path: In case there are no query parameters on the request
+  -- there is no need for rewriting.
+  | [] <- Wai.queryString request =
+      Text.encodeUtf8 redirectTarget
   -- Parse the redirect target as a URI to extract, combine and replace
   -- the query part of it.
   -- TODO: there are an aweful lot of string conversions going on,
   -- maybe there's a more direct way.
-  | Just uri@URI {uriQuery, uriPath} <- parseURI (Text.unpack redirectTarget) =
+  | Just uri@URI {uriQuery} <- parseURI (Text.unpack redirectTarget) =
       let redirectTargetQuery =
             parseQuery (Text.encodeUtf8 (Text.pack uriQuery))
 
@@ -672,18 +676,7 @@ rewriteQueryString redirectTarget request
               )
        in Text.encodeUtf8 $
             Text.pack $
-              show
-                ( uri
-                    { uriQuery =
-                        Text.unpack renderedQuery,
-                      uriPath =
-                        -- We go over the URI path to escape anything that is worth escaping.
-                        -- Unfortunately rendering the URI doesn't do any escaping automatically.
-                        escapeURIString
-                          (\c -> c == '/' || isUnreserved c)
-                          uriPath
-                    }
-                )
+              show (uri {uriQuery = Text.unpack renderedQuery})
   -- In case the redirectTarget didn't parse as a URI we are not doing anything
   -- and ideally shouldn't happen.
   | otherwise =

test/golden/file-package-escaping-1.output.yaml

@@ -0,0 +1,12 @@
+capture: |-
+  Just
+    FlatfileCapture
+      { fileAbsoluteUrl =
+          Just "https://output.com/some-nice-path/very-nice/really+nice"
+      , fileVariables =
+          fromList [ ( "path" , "some-nice-path/very-nice/really+nice" ) ]
+      , filePackage = "21c24cd1-73fa-4970-8a6a-bc570e55b91e"
+      }
+headers:
+  Location: https://output.com/some-nice-path/very-nice/really+nice
+status: 302

test/golden/file-package-escaping-1.yaml

@@ -0,0 +1,14 @@
+# This tests a catch-all pattern with a file variable. This 
+# Using {+path} to render out the captured value will result 
+# in invalid encoding in the output. 
+# The encoding issue makes this a pattern that you don't want to use
+path: "/some-nice-path/very-nice/really+nice"
+headers:
+  Host: nicedomain.com
+manifest:
+  rules:
+    - type: file-v1
+      incoming-path: "/{+path}"
+      domain: nicedomain.com
+      package-id: 21c24cd1-73fa-4970-8a6a-bc570e55b91e
+      outgoing-url: https://output.com/{+path}

test/golden/file-package-escaping.output.yaml

@@ -1,12 +1,10 @@
 capture: |-
   Just
     FlatfileCapture
-      { fileAbsoluteUrl =
-          Just "https://output.com/some-nice-path/very-nice/really%2Bnice"
-      , fileVariables =
-          fromList [ ( "path" , "some-nice-path/very-nice/really+nice" ) ]
+      { fileAbsoluteUrl = Just "https://output.com/really%2Bnice"
+      , fileVariables = fromList [ ( "variable" , "really+nice" ) ]
       , filePackage = "21c24cd1-73fa-4970-8a6a-bc570e55b91e"
       }
 headers:
-  Location: https://output.com/some-nice-path/very-nice/really%2Bnice
+  Location: https://output.com/really%2Bnice
 status: 302

test/golden/file-package-escaping.yaml

@@ -5,7 +5,7 @@ headers:
 manifest:
   rules:
     - type: file-v1
-      incoming-path: "/{+path}"
+      incoming-path: "/some-nice-path/very-nice/{+variable}"
       domain: nicedomain.com
       package-id: 21c24cd1-73fa-4970-8a6a-bc570e55b91e
-      outgoing-url: https://output.com/{+path}
+      outgoing-url: https://output.com/{variable}