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

Make WebSocket optional, disabled by default. Add tests.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-02-12 14:39:45 -08:00
parent a9994ef5aa
commit a6463df5bb
13 changed files with 250 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@@ -147,8 +147,11 @@ public class WhisperServerService extends Service<WhisperServerConfiguration> {
environment.addResource(keysController);
environment.addResource(messageController);
environment.addServlet(new WebsocketControllerFactory(deviceAuthenticator, storedMessageManager, pubSubManager),
"/v1/websocket/");
if (config.getWebsocketConfiguration().isEnabled()) {
environment.addServlet(new WebsocketControllerFactory(deviceAuthenticator, storedMessageManager, pubSubManager),
"/v1/websocket/");
environment.addFilter(new CORSHeaderFilter(), "/*");
}
environment.addHealthCheck(new RedisHealthCheck(redisClient));
environment.addHealthCheck(new MemcacheHealthCheck(memcachedClient));
@@ -156,8 +159,6 @@ public class WhisperServerService extends Service<WhisperServerConfiguration> {
environment.addProvider(new IOExceptionMapper());
environment.addProvider(new RateLimitExceededExceptionMapper());
environment.addFilter(new CORSHeaderFilter(), "/*");
if (config.getGraphiteConfiguration().isEnabled()) {
GraphiteReporter.enable(15, TimeUnit.SECONDS,
config.getGraphiteConfiguration().getHost(),