url/literal: consider a query param already url-encoded if it contains a +

Author: Bogdanp

http-easy-lib/http-easy/private/url.rkt

@@ -122,12 +122,14 @@
   (get-output-string out))
 
 (define (maybe-percent-encode s [encode uri-encode])
-  (if (is-percent-encoded? s) s (encode s)))
+  (if (is-percent-encoded? s encode) s (encode s)))
 
-(define (is-percent-encoded? s)
+(define (is-percent-encoded? s [encode uri-encode])
   (define num-%-matches (length (regexp-match* #rx"%" s)))
-  (and (> num-%-matches 0)
-       (= num-%-matches (length (regexp-match* #px"%[a-fA-F0-9]{2}" s)))))
+  (or (and (> num-%-matches 0)
+           (= num-%-matches (length (regexp-match* #px"%[a-fA-F0-9]{2}" s))))
+      (and (eq? encode form-urlencoded-encode)
+           (regexp-match? #rx"[+]" s))))
 
 (define (ipv6-host? s)
   (regexp-match? #rx"^[0-9a-fA-F:]*:[0-9a-fA-F:]*$" s))

http-easy-lib/info.rkt

@@ -1,7 +1,7 @@
 #lang info
 
 (define license 'BSD-3-Clause)
-(define version "0.8.1")
+(define version "0.8.2")
 (define collection "net")
 (define deps
   '(["base" #:version "8.1.0.4"]

http-easy-test/net/http-easy/private/url.rkt

@@ -65,8 +65,8 @@
           ("http://[email protected]:5100" . "http://[email protected]:5100")
           ("http://example.com/a/b/c" . "http://example.com/a/b/c")
           ("http://example.com/a%2Bb.mp3" . "http://example.com/a%2Bb.mp3")
-          ("http://example.com/a%2Bb.mp3?c=d+e" . "http://example.com/a%2Bb.mp3?c=d%2Be")
-          ("http://example.com/a%2Bb.mp3?c=d+e&f&g=h" . "http://example.com/a%2Bb.mp3?c=d%2Be&f&g=h")
+          ("http://example.com/a%2Bb.mp3?c=d+e" . "http://example.com/a%2Bb.mp3?c=d+e")
+          ("http://example.com/a%2Bb.mp3?c=d+e&f&g=h" . "http://example.com/a%2Bb.mp3?c=d+e&f&g=h")
           ("a/b/c" . "a/b/c")
           ("/a/b/c" . "/a/b/c")
           ("/a;b;c" . "/a;b;c")))
@@ -95,7 +95,11 @@
       (for ([test (in-list tests)])
         (check-equal?
          (url/literal->string (string->url/literal test))
-         (url->string (string->url test))))))
+         (url->string (string->url test)))))
+
+    (test-case "examples"
+      (let ([example "https://d12xz7rzfw7xh7.cloudfront.net/v1/download/episodes/original/43796816?a=en&eg=https%3A%2F%2Fapi.spreaker.com%2Fepisode%2F57758598&eu=https%3A%2F%2Fdts.podtrac.com%2Fredirect.mp3%2Fapi.spreaker.com%2Fdownload%2Fepisode%2F57758598%2Ftmp9u92imeh.mp3&p=3&q=9808638&f=559&r=128&t=3&u=11393707&o=2401044&d=2023-11-22&g=57758598&h=5937276&k=https%3A%2F%2Fwww.spreaker.com%2Fshow%2F5937276%2Fepisodes%2Ffeed&i=43796816&n=Petros+And+Money&b=%5B%22IAB6-7%22%2C%22IAB7-39%22%2C%22IAB11-4%22%2C%22IAB26%22%5D&c=%5B%22sports%22%5D&l=%5B%22hosting_plan_ihr%22%5D&m=%5B904294%2C904294%2C904294%2C1436858%2C1436858%2C1436858%2C1436858%2C1436858%2C1937091%2C1937091%2C1937091%5D&rr=4444444444444&fax=0.4&Expires=1732993926&Signature=XDgffPCg91Gd6ThNXoenP4axeBN2zEUK6Bs56F2Pw-LGE9XJuLPghg1f2etV1l6I3%7Ed7Ms12AQbkCp1vfkqleStA30fPDH2PpO1IKkw5k7PlSYyPCeb1DOc1No8s6KHn7C8DZ7swXjWEz5WGzrj6KtSgI%7EWMhQyiLuGxEmT9YBQViowMGeO7p1PNocQmT-SKo8WqMDMdzMmSXP2WQFYSk3AjFM2ukhGLzDkIcrNxy2ZRLGeUykF9ZWgNnGGAOfwsmx6n0IFQZcdDo2QpRKxOUjSBYOTxTo1Y716OYb73P59QurF%7El-jM7WLHgvFxWnJQHj9SwCnjSaCJgzDBlh%7EEDQ__&Key-Pair-Id=K1J2BR3INU6RYD"])
+        (check-equal? (url/literal->string (string->url/literal example)) example))))
 
    (test-suite
     "is-percent-encoded?"