MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increase from default binary message size

This commit is contained in:
Chris Eager 2021-08-06 12:32:44 -05:00 committed by Chris Eager
parent 73c368ea86
commit 095fc8140e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
websocket-resources/src/main/java/org/whispersystems/websocket/WebSocketResourceProviderFactory.java
View File

@ -4,7 +4,13 @@
*/ */
package org.whispersystems.websocket; package org.whispersystems.websocket;
import static java.util.Optional.ofNullable;
import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider; import io.dropwizard.jersey.jackson.JacksonMessageBodyProvider;
import java.io.IOException;
import java.security.Principal;
import java.util.Arrays;
import java.util.Optional;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator; import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
@ -20,13 +26,6 @@ import org.whispersystems.websocket.auth.WebsocketAuthValueFactoryProvider;
import org.whispersystems.websocket.session.WebSocketSessionContextValueFactoryProvider; import org.whispersystems.websocket.session.WebSocketSessionContextValueFactoryProvider;
import org.whispersystems.websocket.setup.WebSocketEnvironment; import org.whispersystems.websocket.setup.WebSocketEnvironment;
import java.io.IOException;
import java.security.Principal;
import java.util.Arrays;
import java.util.Optional;
import static java.util.Optional.ofNullable;
public class WebSocketResourceProviderFactory<T extends Principal> extends WebSocketServlet implements WebSocketCreator { public class WebSocketResourceProviderFactory<T extends Principal> extends WebSocketServlet implements WebSocketCreator {
private static final Logger logger = LoggerFactory.getLogger(WebSocketResourceProviderFactory.class); private static final Logger logger = LoggerFactory.getLogger(WebSocketResourceProviderFactory.class);
@ -80,6 +79,9 @@ public class WebSocketResourceProviderFactory<T extends Principal> extends WebSo
@Override @Override
public void configure(WebSocketServletFactory factory) { public void configure(WebSocketServletFactory factory) {
factory.setCreator(this); factory.setCreator(this);
// TODO extract to configuration
factory.getPolicy().setMaxBinaryMessageSize(512 * 1024);
factory.getPolicy().setMaxTextMessageSize(512 * 1024);
} }
private String getRemoteAddress(ServletUpgradeRequest request) { private String getRemoteAddress(ServletUpgradeRequest request) {

2
websocket-resources/src/test/java/org/whispersystems/websocket/WebSocketResourceProviderFactoryTest.java
View File

@ -20,6 +20,7 @@ import java.util.Optional;
import javax.security.auth.Subject; import javax.security.auth.Subject;
import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.UpgradeRequest; import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
@ -105,6 +106,7 @@ public class WebSocketResourceProviderFactoryTest {
WebSocketEnvironment environment = mock(WebSocketEnvironment.class ); WebSocketEnvironment environment = mock(WebSocketEnvironment.class );
WebSocketServletFactory servletFactory = mock(WebSocketServletFactory.class ); WebSocketServletFactory servletFactory = mock(WebSocketServletFactory.class );
when(environment.jersey()).thenReturn(jerseyEnvironment); when(environment.jersey()).thenReturn(jerseyEnvironment);
when(servletFactory.getPolicy()).thenReturn(mock(WebSocketPolicy.class));
WebSocketResourceProviderFactory factory = new WebSocketResourceProviderFactory(environment, Account.class); WebSocketResourceProviderFactory factory = new WebSocketResourceProviderFactory(environment, Account.class);
factory.configure(servletFactory); factory.configure(servletFactory);