Skip to content

Commit 161f5ae

Browse files
authored
Revert "Introduce a Hashing Processor (#31087)" (#32179)
This reverts commit b296936.
1 parent ee070f3 commit 161f5ae

File tree

6 files changed

+1
-525
lines changed

6 files changed

+1
-525
lines changed

x-pack/plugin/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ integTestCluster {
152152
keystoreSetting 'bootstrap.password', 'x-pack-test-password'
153153
keystoreSetting 'xpack.security.authc.token.passphrase', 'x-pack-token-service-password'
154154
keystoreSetting 'xpack.security.transport.ssl.keystore.secure_password', 'keypass'
155-
keystoreSetting 'xpack.security.ingest.hash.processor.key', 'hmackey'
156155
distribution = 'zip' // this is important since we use the reindex module in ML
157156

158157
setupCommand 'setupTestUser', 'bin/elasticsearch-users', 'useradd', 'x_pack_rest_user', '-p', 'x-pack-test-password', '-r', 'superuser'

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@
176176
import org.elasticsearch.xpack.security.authz.store.CompositeRolesStore;
177177
import org.elasticsearch.xpack.security.authz.store.FileRolesStore;
178178
import org.elasticsearch.xpack.security.authz.store.NativeRolesStore;
179-
import org.elasticsearch.xpack.security.ingest.HashProcessor;
180179
import org.elasticsearch.xpack.security.ingest.SetSecurityUserProcessor;
181180
import org.elasticsearch.xpack.security.rest.SecurityRestFilter;
182181
import org.elasticsearch.xpack.security.rest.action.RestAuthenticateAction;
@@ -602,8 +601,6 @@ public static List<Setting<?>> getSettings(boolean transportClientMode, List<Sec
602601
settingsList.add(Setting.listSetting(SecurityField.setting("hide_settings"), Collections.emptyList(), Function.identity(),
603602
Property.NodeScope, Property.Filtered));
604603
settingsList.add(INDICES_ADMIN_FILTERED_FIELDS_SETTING);
605-
// ingest processor settings
606-
settingsList.add(HashProcessor.HMAC_KEY_SETTING);
607604

608605
return settingsList;
609606
}
@@ -748,10 +745,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
748745

749746
@Override
750747
public Map<String, Processor.Factory> getProcessors(Processor.Parameters parameters) {
751-
Map<String, Processor.Factory> processors = new HashMap<>();
752-
processors.put(SetSecurityUserProcessor.TYPE, new SetSecurityUserProcessor.Factory(parameters.threadContext));
753-
processors.put(HashProcessor.TYPE, new HashProcessor.Factory(parameters.env.settings()));
754-
return processors;
748+
return Collections.singletonMap(SetSecurityUserProcessor.TYPE, new SetSecurityUserProcessor.Factory(parameters.threadContext));
755749
}
756750

757751
/**

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/ingest/HashProcessor.java

-200
This file was deleted.

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/ingest/HashProcessorFactoryTests.java

-136
This file was deleted.

0 commit comments

Comments
 (0)