From ef2441ad829c40c81697518abbc3d96af9b40c58 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 29 Jul 2015 15:18:40 -0700
Subject: [PATCH] Don't pass response objects back from federated client.

// FREEBIE
---
 .../textsecuregcm/federation/FederatedClient.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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