Re: [PATCH] REGTESTS: converter: add url_dec test

[William Dauchy]

Hi Tim,

thanks for the review.

On Sun, Nov 15, 2020 at 1:50 PM Tim Düsterhus  wrote:
> Am 15.11.20 um 13:45 schrieb William Dauchy:
> > +#REQUIRE_OPTION=OPENSSL
>
> I don't believe OPENSSL is required. The test passes for me even without
> compiling with SSL.

true bad copy/paste on my side.

> > +client c1 -connect ${h1_fe_sock} {
> > + txreq -url "/bla+?foo%3Dbar%2B42+42"
>
> Maybe add %20 to the string to test the other variant of encoding a space?

fixed in v2 even though %20 is not much different than other encoded
characters to my knowledge.
--
William

Re: [PATCH] REGTESTS: converter: add url_dec test

[Tim Düsterhus]

William,

Am 15.11.20 um 13:45 schrieb William Dauchy:
> +#REQUIRE_OPTION=OPENSSL

I don't believe OPENSSL is required. The test passes for me even without
compiling with SSL.

> +client c1 -connect ${h1_fe_sock} {
> + txreq -url "/bla+?foo%3Dbar%2B42+42"

Maybe add %20 to the string to test the other variant of encoding a space?

> + rxresp
> + expect resp.http.url_dec0 == "/bla+?foo=bar+42 42"
> + expect resp.http.url_dec1 == "/bla ?foo=bar+42 42"
> + expect resp.status == 200
> +} -run
> 

Best regards
Tim Düsterhus

[PATCH] REGTESTS: converter: add url_dec test

[William Dauchy]

while looking at `url_dec` implementation I realised there was not yet a
simple test to avoid future regressions.
This one is testing simple case, including the "+" behaviour depending
on the argument passed to `url_dec`

Signed-off-by: William Dauchy 
---
 reg-tests/converter/url_dec.vtc | 39 +
 1 file changed, 39 insertions(+)
 create mode 100644 reg-tests/converter/url_dec.vtc

diff --git a/reg-tests/converter/url_dec.vtc b/reg-tests/converter/url_dec.vtc
new file mode 100644
index 0..52b3b61ca
--- /dev/null
+++ b/reg-tests/converter/url_dec.vtc
@@ -0,0 +1,39 @@
+varnishtest "url_dec converter Test"
+
+#REQUIRE_VERSION=1.6
+#REQUIRE_OPTION=OPENSSL
+
+feature ignore_unknown_macro
+
+server s1 {
+   rxreq
+   txresp
+} -repeat 2 -start
+
+haproxy h1 -conf {
+defaults
+   mode http
+   timeout connect 1s
+   timeout client  1s
+   timeout server  1s
+
+frontend fe
+   bind "fd@${fe}"
+
+   http-request  set-var(txn.url) url
+   http-response set-header url_dec0 "%[var(txn.url),url_dec]"
+   http-response set-header url_dec1 "%[var(txn.url),url_dec(1)]"
+
+   default_backend be
+
+backend be
+   server s1 ${s1_addr}:${s1_port}
+} -start
+
+client c1 -connect ${h1_fe_sock} {
+   txreq -url "/bla+?foo%3Dbar%2B42+42"
+   rxresp
+   expect resp.http.url_dec0 == "/bla+?foo=bar+42 42"
+   expect resp.http.url_dec1 == "/bla ?foo=bar+42 42"
+   expect resp.status == 200
+} -run
-- 
2.29.2