From f72487fe2efd7953c3e2ba4fb366e7cb455aa1dc Mon Sep 17 00:00:00 2001
From: gbrodman <gbrodman@google.com>
Date: Wed, 13 Jul 2022 14:31:16 -0400
Subject: [PATCH] Tell IANA not to encode the RDAP base URL response (#1705)

---
 .../google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java | 2 ++
 .../registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java
index a517e9d8a..bbc80f129 100644
--- a/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java
+++ b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java
@@ -99,6 +99,8 @@ public final class UpdateRegistrarRdapBaseUrlsAction implements Runnable {
     CSVParser csv;
     try {
       HttpRequest request = httpTransport.createRequestFactory().buildGetRequest(RDAP_IDS_URL);
+      // AppEngine might insert accept-encodings for us if we use the default gzip, so remove it
+      request.getHeaders().setAcceptEncoding(null);
       HttpResponse response = request.execute();
       String csvString = new String(ByteStreams.toByteArray(response.getContent()), UTF_8);
       csv =
diff --git a/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
index 17ce120ba..2daa8a9f2 100644
--- a/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
+++ b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
@@ -98,6 +98,7 @@ public final class UpdateRegistrarRdapBaseUrlsActionTest {
   private void assertCorrectRequestSent() {
     assertThat(httpTransport.getRequestSent().getUrl())
         .isEqualTo("https://www.iana.org/assignments/registrar-ids/registrar-ids-1.csv");
+    assertThat(httpTransport.getRequestSent().getHeaders().get("accept-encoding")).isNull();
   }
 
   private static void persistRegistrar(