From cf9c1ec7c362ac7abc76b774ae1ae2a257b08673 Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Fri, 10 Nov 2023 14:39:16 -0500 Subject: [PATCH] Use Java 8 runtime on sandbox and production (#2218) Java 17 injects unexpected headers to X-Forwarded-For, which causes issues with validating incoming IP addresses. This is a partial reversion of #2201. We are still keeping Java 17 in other environment but sandbox and production needs to be able to parse the header to accept incoming EPP connections from registrars. Once we fix it we will re-enable Java 17 in these environment. --- .../env/production/backend/WEB-INF/appengine-web.xml | 5 +++-- .../env/production/default/WEB-INF/appengine-web.xml | 5 +++-- .../registry/env/production/pubapi/WEB-INF/appengine-web.xml | 5 +++-- .../registry/env/production/tools/WEB-INF/appengine-web.xml | 5 +++-- .../registry/env/sandbox/backend/WEB-INF/appengine-web.xml | 5 +++-- .../registry/env/sandbox/default/WEB-INF/appengine-web.xml | 5 +++-- .../registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml | 5 +++-- .../registry/env/sandbox/tools/WEB-INF/appengine-web.xml | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml index e59cb166e..fb2c17152 100644 --- a/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 backend - true + + true true B4_1G diff --git a/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml index 44b867b5e..a72a531f2 100644 --- a/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 default - true + + true true B4_1G diff --git a/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml index 22922a18f..63d36620a 100644 --- a/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 pubapi - true + + true true B4_1G diff --git a/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml index bdacaa04c..3c7e5e627 100644 --- a/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 tools - true + + true true B4_1G diff --git a/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml index fd3f24754..cec30d9dc 100644 --- a/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 backend - true + + true true B4 diff --git a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml index e03fd12af..e8e619047 100644 --- a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 default - true + + true true B4_1G diff --git a/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml index 126835223..8e5dfba6e 100644 --- a/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 pubapi - true + + true true B4_1G diff --git a/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml index 8262a7ac8..8a370de21 100644 --- a/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,10 @@ - java17 + java8 tools - true + + true true B4