From de366b976ee4ec3c292c67963fe50044426873df Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 25 Jun 2015 08:50:10 -0700 Subject: [PATCH] Ignore unknown properties from federated responses. // FREEBIE --- .../textsecuregcm/federation/FederatedClient.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java b/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java index 00fe477ab..d82c579fa 100644 --- a/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java +++ b/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java @@ -17,6 +17,8 @@ package org.whispersystems.textsecuregcm.federation; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import com.google.common.base.Optional; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientHandlerException; @@ -234,6 +236,7 @@ public class FederatedClient { config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, new HTTPSProperties(new StrictHostnameVerifier(), sslContext)); config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE); + config.getSingletons().add(new JacksonJsonProvider().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)); return config; }