|
13 | 13 | import org.elasticsearch.cluster.service.ClusterService;
|
14 | 14 | import org.elasticsearch.common.CheckedConsumer;
|
15 | 15 | import org.elasticsearch.common.settings.Setting;
|
| 16 | +import org.elasticsearch.common.settings.Setting.Property; |
16 | 17 | import org.elasticsearch.common.settings.Settings;
|
17 | 18 | import org.elasticsearch.common.util.concurrent.AbstractRunnable;
|
18 | 19 | import org.elasticsearch.common.util.concurrent.ThreadContext;
|
@@ -56,7 +57,7 @@ public class SecurityServerTransportInterceptor implements TransportInterceptor
|
56 | 57 | return v;
|
57 | 58 | }
|
58 | 59 | throw new IllegalArgumentException("type must be one of [client, node]");
|
59 |
| - }, Setting.Property.NodeScope); |
| 60 | + }, Setting.Property.NodeScope, Property.Deprecated); |
60 | 61 | private static final String TRANSPORT_TYPE_SETTING_KEY = "xpack.security.type";
|
61 | 62 | private static final Logger logger = LogManager.getLogger(SecurityServerTransportInterceptor.class);
|
62 | 63 |
|
@@ -187,7 +188,8 @@ private Map<String, ServerTransportFilter> initializeProfileFilters(DestructiveO
|
187 | 188 | for (Map.Entry<String, SSLConfiguration> entry : profileConfigurations.entrySet()) {
|
188 | 189 | final SSLConfiguration profileConfiguration = entry.getValue();
|
189 | 190 | final boolean extractClientCert = transportSSLEnabled && sslService.isSSLClientAuthEnabled(profileConfiguration);
|
190 |
| - final String type = TRANSPORT_TYPE_PROFILE_SETTING.getConcreteSettingForNamespace(entry.getKey()).get(settings); |
| 191 | + final Setting<String> transportType = TRANSPORT_TYPE_PROFILE_SETTING.getConcreteSettingForNamespace(entry.getKey()); |
| 192 | + final String type = transportType.get(settings); |
191 | 193 | switch (type) {
|
192 | 194 | case "client":
|
193 | 195 | profileFilters.put(entry.getKey(), new ServerTransportFilter.ClientProfile(authcService, authzService,
|
|
0 commit comments