From ba12d39121de992ebe9f56d610393495ad8e5375 Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Mon, 23 Sep 2024 13:55:15 -0500
Subject: [PATCH] URLEncode shortCode paths

---
 .../textsecuregcm/captcha/ShortCodeExpander.java              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/captcha/ShortCodeExpander.java b/service/src/main/java/org/whispersystems/textsecuregcm/captcha/ShortCodeExpander.java
index 546b6b3eb..e762723a6 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/captcha/ShortCodeExpander.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/captcha/ShortCodeExpander.java
@@ -9,9 +9,11 @@ import io.micrometer.core.instrument.Metrics;
 import org.apache.http.HttpStatus;
 import java.io.IOException;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
 import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
@@ -28,7 +30,7 @@ public class ShortCodeExpander {
   }
 
   public Optional<String> retrieve(final String shortCode) throws IOException {
-    final URI uri = shortenerHost.resolve(shortCode);
+    final URI uri = shortenerHost.resolve(URLEncoder.encode(shortCode, StandardCharsets.UTF_8));
     final HttpRequest request = HttpRequest.newBuilder().uri(uri).GET().build();
 
     try {