From 459882e6fa3698f5c4fcfa91fde61ba830b26263 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 15 Mar 2024 16:29:54 -0500
Subject: [PATCH] Add JettyHttpConfigurationCustomizer

---
 .../textsecuregcm/WhisperServerService.java   |  3 ++
 .../JettyHttpConfigurationCustomizer.java     | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/jetty/JettyHttpConfigurationCustomizer.java

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 4c6853625..e63801566 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -141,6 +141,7 @@ import org.whispersystems.textsecuregcm.grpc.ProfileGrpcService;
 import org.whispersystems.textsecuregcm.grpc.UserAgentInterceptor;
 import org.whispersystems.textsecuregcm.grpc.net.ManagedDefaultEventLoopGroup;
 import org.whispersystems.textsecuregcm.grpc.net.ManagedLocalGrpcServer;
+import org.whispersystems.textsecuregcm.jetty.JettyHttpConfigurationCustomizer;
 import org.whispersystems.textsecuregcm.limits.CardinalityEstimator;
 import org.whispersystems.textsecuregcm.limits.PushChallengeManager;
 import org.whispersystems.textsecuregcm.limits.RateLimitChallengeManager;
@@ -339,6 +340,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
           });
     }
 
+    environment.lifecycle().addEventListener(new JettyHttpConfigurationCustomizer());
+
     HeaderControlledResourceBundleLookup headerControlledResourceBundleLookup =
         new HeaderControlledResourceBundleLookup();
     ConfiguredProfileBadgeConverter profileBadgeConverter = new ConfiguredProfileBadgeConverter(
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/jetty/JettyHttpConfigurationCustomizer.java b/service/src/main/java/org/whispersystems/textsecuregcm/jetty/JettyHttpConfigurationCustomizer.java
new file mode 100644
index 000000000..6882b79ac
--- /dev/null
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/jetty/JettyHttpConfigurationCustomizer.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.whispersystems.textsecuregcm.jetty;
+
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.util.component.Container;
+import org.eclipse.jetty.util.component.LifeCycle;
+
+/**
+ * Uses {@link Container.Listener} to update {@link org.eclipse.jetty.server.HttpConfiguration}
+ */
+public class JettyHttpConfigurationCustomizer implements Container.Listener, LifeCycle.Listener {
+
+  @Override
+  public void beanAdded(final Container parent, final Object child) {
+    if (child instanceof Connector c) {
+      final HttpConnectionFactory hcf = c.getConnectionFactory(HttpConnectionFactory.class);
+      if (hcf != null) {
+        // see https://github.com/jetty/jetty.project/issues/1891
+        hcf.getHttpConfiguration().setNotifyRemoteAsyncErrors(false);
+      }
+    }
+  }
+
+  @Override
+  public void beanRemoved(final Container parent, final Object child) {
+
+  }
+}