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

Don't pass response objects back from federated client. 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-07-29 15:18:40 -07:00
parent bb7859138c
commit ef2441ad82
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java
View File

@ -17,6 +17,7 @@
package org.whispersystems.textsecuregcm.federation; package org.whispersystems.textsecuregcm.federation;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import org.apache.http.config.Registry; import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder; import org.apache.http.config.RegistryBuilder;
@ -42,6 +43,7 @@ import javax.net.ssl.TrustManagerFactory;
import javax.ws.rs.ProcessingException; import javax.ws.rs.ProcessingException;
import javax.ws.rs.WebApplicationException; import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.Client; import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
@ -175,11 +177,10 @@ public class FederatedClient {
response = client.target(peer.getUrl()) response = client.target(peer.getUrl())
.path(String.format(RELAY_MESSAGE_PATH, source, sourceDeviceId, destination)) .path(String.format(RELAY_MESSAGE_PATH, source, sourceDeviceId, destination))
.request() .request()
.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.BUFFERED) .put(Entity.json(messages));
.put(Entity.entity(messages, MediaType.APPLICATION_JSON_TYPE));
if (response.getStatus() != 200 && response.getStatus() != 204) { if (response.getStatus() != 200 && response.getStatus() != 204) {
throw new WebApplicationException(response); throw new WebApplicationException(Response.status(response.getStatusInfo()).build());
} }
} catch (ProcessingException e) { } catch (ProcessingException e) {
@ -203,7 +204,7 @@ public class FederatedClient {
.put(Entity.entity("", MediaType.APPLICATION_JSON_TYPE)); .put(Entity.entity("", MediaType.APPLICATION_JSON_TYPE));
if (response.getStatus() != 200 && response.getStatus() != 204) { if (response.getStatus() != 200 && response.getStatus() != 204) {
throw new WebApplicationException(response); throw new WebApplicationException(Response.status(response.getStatusInfo()).build());
} }
} catch (ProcessingException e) { } catch (ProcessingException e) {
logger.warn("sendMessage", e); logger.warn("sendMessage", e);
@ -232,6 +233,7 @@ public class FederatedClient {
client.property(ClientProperties.CONNECT_TIMEOUT, 5000); client.property(ClientProperties.CONNECT_TIMEOUT, 5000);
client.property(ClientProperties.READ_TIMEOUT, 10000); client.property(ClientProperties.READ_TIMEOUT, 10000);
client.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.BUFFERED);
client.register(HttpAuthenticationFeature.basic(federationName, peer.getAuthenticationToken())); client.register(HttpAuthenticationFeature.basic(federationName, peer.getAuthenticationToken()));
return client; return client;