From c51bff3311995f65218157fa02ad14cec8645d17 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 4 Dec 2024 09:52:42 -0800 Subject: [PATCH 1/2] Encode URL query parameters when building a URL --- src/org/labkey/test/util/URLBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/util/URLBuilder.java b/src/org/labkey/test/util/URLBuilder.java index dc067e4067..566e0a5691 100644 --- a/src/org/labkey/test/util/URLBuilder.java +++ b/src/org/labkey/test/util/URLBuilder.java @@ -212,11 +212,11 @@ private void appendQueryString(StringBuilder url, Map params) if (null != param.getKey()) { url.append(firstParam ? "?" : "&"); - url.append(param.getKey()); + url.append(EscapeUtil.encode(param.getKey())); if (null != param.getValue()) { url.append("="); - url.append(param.getValue()); + url.append(EscapeUtil.encode(String.valueOf(param.getValue()))); } firstParam = false; } From fd75dc22bdf5027c49a7eb7d2a01ed178529c4a5 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 4 Dec 2024 11:17:55 -0800 Subject: [PATCH 2/2] app path encoding --- src/org/labkey/test/util/URLBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/util/URLBuilder.java b/src/org/labkey/test/util/URLBuilder.java index 566e0a5691..c911bd3899 100644 --- a/src/org/labkey/test/util/URLBuilder.java +++ b/src/org/labkey/test/util/URLBuilder.java @@ -107,7 +107,7 @@ public URLBuilder setQuery(Map query) public URLBuilder setAppResourcePath(Object... pathParts) { List encodedParts = Arrays.stream(pathParts).map(Objects::requireNonNull).map(String::valueOf) - .map(URIUtil::encodePath).collect(Collectors.toList()); + .map(s -> EscapeUtil.encode(s).replace("+", " ")).collect(Collectors.toList()); setFragment("/" + String.join("/", encodedParts)); return this; }