Skip to content

Deprecate transport profile security type setting #43237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 3, 2019
Merged

Deprecate transport profile security type setting #43237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6661cee
Deprecate transport profile security type setting
jaymode Jun 14, 2019
161cdc9
Merge branch '7.x' into deprecate_client_transport_filter
elasticmachine Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...erence/security/securing-communications/separating-node-client-traffic.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
[[separating-node-client-traffic]]
=== Separating node-to-node and client traffic

deprecated[7.3.0, Transport Client is deprecated and will be removed]

Elasticsearch has the feature of so called
{ref}/modules-transport.html[TCP transport profiles]
that allows it to bind to several ports and addresses. The {es}
Expand Down
6 changes: 4 additions & 2 deletions ...n/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.CheckedConsumer;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
import org.elasticsearch.common.util.concurrent.ThreadContext;
Expand Down Expand Up @@ -56,7 +57,7 @@ public class SecurityServerTransportInterceptor implements TransportInterceptor
return v;
}
throw new IllegalArgumentException("type must be one of [client, node]");
}, Setting.Property.NodeScope);
}, Setting.Property.NodeScope, Property.Deprecated);
private static final String TRANSPORT_TYPE_SETTING_KEY = "xpack.security.type";
private static final Logger logger = LogManager.getLogger(SecurityServerTransportInterceptor.class);

Expand Down Expand Up @@ -182,7 +183,8 @@ private Map<String, ServerTransportFilter> initializeProfileFilters(DestructiveO
for (Map.Entry<String, SSLConfiguration> entry : profileConfigurations.entrySet()) {
final SSLConfiguration profileConfiguration = entry.getValue();
final boolean extractClientCert = transportSSLEnabled && sslService.isSSLClientAuthEnabled(profileConfiguration);
final String type = TRANSPORT_TYPE_PROFILE_SETTING.getConcreteSettingForNamespace(entry.getKey()).get(settings);
final Setting<String> transportType = TRANSPORT_TYPE_PROFILE_SETTING.getConcreteSettingForNamespace(entry.getKey());
final String type = transportType.get(settings);
switch (type) {
case "client":
profileFilters.put(entry.getKey(), new ServerTransportFilter.ClientProfile(authcService, authzService,
Expand Down