From 3d713565967e863b338f575a8d06902ba861b935 Mon Sep 17 00:00:00 2001 From: uboness Date: Tue, 14 Oct 2014 10:35:36 -0700 Subject: [PATCH] Fixes Transport Client that start up with shield in the classpath Now a NOOP transport filter is bound by to the secured transport service in a transport client Fixes elastic/elasticsearch#165 Original commit: elastic/x-pack-elasticsearch@7268bd445c5c836715d998c4deb8abd25627afd4 --- .../elasticsearch/shield/transport/SecuredTransportModule.java | 1 + .../org/elasticsearch/shield/transport/TransportFilter.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/org/elasticsearch/shield/transport/SecuredTransportModule.java b/src/main/java/org/elasticsearch/shield/transport/SecuredTransportModule.java index b68928db11e..084e5a0af20 100644 --- a/src/main/java/org/elasticsearch/shield/transport/SecuredTransportModule.java +++ b/src/main/java/org/elasticsearch/shield/transport/SecuredTransportModule.java @@ -53,6 +53,7 @@ public class SecuredTransportModule extends AbstractShieldModule.Spawn implement if (clientMode) { // no ip filtering on the client bind(N2NNettyUpstreamHandler.class).toProvider(Providers.of(null)); + bind(TransportFilter.class).toInstance(TransportFilter.NOOP); return; } diff --git a/src/main/java/org/elasticsearch/shield/transport/TransportFilter.java b/src/main/java/org/elasticsearch/shield/transport/TransportFilter.java index d569556e773..23363343683 100644 --- a/src/main/java/org/elasticsearch/shield/transport/TransportFilter.java +++ b/src/main/java/org/elasticsearch/shield/transport/TransportFilter.java @@ -13,6 +13,8 @@ import org.elasticsearch.transport.TransportResponse; */ public interface TransportFilter { + static final TransportFilter NOOP = new Base(); + /** * Called just before the given request is about to be sent. Any exception thrown * by this method will stop the request from being sent.