Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 16:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add flag to negotiate server_no_context_takeover

Browse Source
This commit is contained in:
Andrew
2025-11-03 17:00:41 -05:00
committed by ravi-signal
parent 4dbd564442
commit ce945ff245
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@@ -58,7 +58,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.function.Function;
import java.util.stream.Stream;
import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
import org.glassfish.jersey.server.ServerProperties;
import org.signal.i18n.HeaderControlledResourceBundleLookup;
@@ -267,6 +267,7 @@ import org.whispersystems.textsecuregcm.util.VirtualThreadPinEventMonitor;
import org.whispersystems.textsecuregcm.util.logging.LoggingUnhandledExceptionMapper;
import org.whispersystems.textsecuregcm.util.logging.UncaughtExceptionHandler;
import org.whispersystems.textsecuregcm.websocket.AuthenticatedConnectListener;
import org.whispersystems.textsecuregcm.websocket.NoContextTakeoverPerMessageDeflateExtension;
import org.whispersystems.textsecuregcm.websocket.ProvisioningConnectListener;
import org.whispersystems.textsecuregcm.websocket.WebSocketAccountAuthenticator;
import org.whispersystems.textsecuregcm.workers.BackupMetricsCommand;
@@ -1132,11 +1133,14 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
container.setMaxBinaryMessageSize(config.getWebSocketConfiguration().getMaxBinaryMessageSize());
container.setMaxTextMessageSize(config.getWebSocketConfiguration().getMaxTextMessageSize());
final WebSocketExtensionRegistry extensionRegistry = WebSocketServerComponents
.getWebSocketComponents(environment.getApplicationContext())
.getExtensionRegistry();
if (config.getWebSocketConfiguration().isDisablePerMessageDeflate()) {
WebSocketComponents components =
WebSocketServerComponents.getWebSocketComponents(environment.getApplicationContext());
components.getExtensionRegistry().unregister("permessage-deflate");
extensionRegistry.unregister("permessage-deflate");
} else if (config.getWebSocketConfiguration().isDisableCrossMessageOutgoingCompression()) {
extensionRegistry.unregister("permessage-deflate");
extensionRegistry.register("permessage-deflate", NoContextTakeoverPerMessageDeflateExtension.class);
}
});

16
service/src/main/java/org/whispersystems/textsecuregcm/websocket/NoContextTakeoverPerMessageDeflateExtension.java Normal file
View File

@@ -0,0 +1,16 @@
package org.whispersystems.textsecuregcm.websocket;
import org.eclipse.jetty.websocket.core.ExtensionConfig;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension;
/// A variant of the Jetty {@link PerMessageDeflateExtension} that always negotiates the [server_no_context_takeover
/// extension parameter](https://datatracker.ietf.org/doc/html/rfc7692#section-7.1.1.1)
public final class NoContextTakeoverPerMessageDeflateExtension extends PerMessageDeflateExtension {
@Override
public void init(ExtensionConfig config, WebSocketComponents components) {
config.setParameter("server_no_context_takeover");
super.init(config, components);
}
}