Add ., -, and _ to set of unescaped characters in urlencode (#72

)
mitsuhiko · Aug 21, 2022 · b11289f · b11289f
1 parent 3dd6f38
commit b11289f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/minijinja/src/filters.rs b/minijinja/src/filters.rs
@@ -688,8 +688,12 @@ mod builtins {
     #[cfg_attr(docsrs, doc(cfg(all(feature = "builtins", feature = "urlencode"))))]
     #[cfg(feature = "urlencode")]
     pub fn urlencode(_: &State, value: Value) -> Result<String, Error> {
-        const SET: &percent_encoding::AsciiSet =
-            &percent_encoding::NON_ALPHANUMERIC.remove(b'/').add(b' ');
+        const SET: &percent_encoding::AsciiSet = &percent_encoding::NON_ALPHANUMERIC
+            .remove(b'/')
+            .remove(b'.')
+            .remove(b'-')
+            .remove(b'_')
+            .add(b' ');
         match &value.0 {
             ValueRepr::None | ValueRepr::Undefined => Ok("".into()),
             ValueRepr::Bytes(b) => Ok(percent_encoding::percent_encode(b, SET).to_string()),

diff --git a/minijinja/tests/inputs/filters.txt b/minijinja/tests/inputs/filters.txt
@@ -47,7 +47,7 @@ d: {{ undefined|d == "" }}
 json: {{ map|tojson }}
 json-pretty: {{ map|tojson(true) }}
 json-scary-html: {{ scary_html|tojson }}
-urlencode: {{ "hello world/baz"|urlencode }}
+urlencode: {{ "hello world/foo-bar_baz.txt"|urlencode }}
 urlencode-kv: {{ dict(a="x y", b=2, c=3)|urlencode }}
 batch: {{ range(10)|batch(3) }}
 batch-fill: {{ range(10)|batch(3, '-') }}

diff --git a/minijinja/tests/snapshots/test_templates__vm@filters.txt.snap b/minijinja/tests/snapshots/test_templates__vm@filters.txt.snap
@@ -1,9 +1,7 @@
 ---
 source: minijinja/tests/test_templates.rs
-assertion_line: 44
 expression: "&rendered"
 input_file: minijinja/tests/inputs/filters.txt
-
 ---
 lower: bird
 upper: BIRD
@@ -49,7 +47,7 @@ json-pretty: {
   "c": "d"
 }
 json-scary-html: "\u003c\u003e\u0026\u0027"
-urlencode: hello%20world/baz
+urlencode: hello%20world/foo-bar_baz.txt
 urlencode-kv: a=x%20y&b=2&c=3
 batch: [[0, 1, 2], [3, 4, 5], [6, 7, 8], [9]]
 batch-fill: [[0, 1, 2], [3, 4, 5], [6, 7, 8], [9, "-", "-"]]