Skip to content

Commit 27d663b

Browse files
authored
Revert "Introduce a Hashing Processor (#31087)" (#32178)
This reverts commit 8c78fe7.
1 parent 6374949 commit 27d663b

File tree

6 files changed

+1
-527
lines changed

6 files changed

+1
-527
lines changed

x-pack/plugin/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ integTestCluster {
151151
setting 'xpack.license.self_generated.type', 'trial'
152152
keystoreSetting 'bootstrap.password', 'x-pack-test-password'
153153
keystoreSetting 'xpack.security.transport.ssl.keystore.secure_password', 'keypass'
154-
keystoreSetting 'xpack.security.ingest.hash.processor.key', 'hmackey'
155154
distribution = 'zip' // this is important since we use the reindex module in ML
156155

157156
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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
import org.elasticsearch.xpack.security.authz.store.CompositeRolesStore;
176176
import org.elasticsearch.xpack.security.authz.store.FileRolesStore;
177177
import org.elasticsearch.xpack.security.authz.store.NativeRolesStore;
178-
import org.elasticsearch.xpack.security.ingest.HashProcessor;
179178
import org.elasticsearch.xpack.security.ingest.SetSecurityUserProcessor;
180179
import org.elasticsearch.xpack.security.rest.SecurityRestFilter;
181180
import org.elasticsearch.xpack.security.rest.action.RestAuthenticateAction;
@@ -580,10 +579,6 @@ public static List<Setting<?>> getSettings(boolean transportClientMode, List<Sec
580579
// hide settings
581580
settingsList.add(Setting.listSetting(SecurityField.setting("hide_settings"), Collections.emptyList(), Function.identity(),
582581
Property.NodeScope, Property.Filtered));
583-
584-
// ingest processor settings
585-
settingsList.add(HashProcessor.HMAC_KEY_SETTING);
586-
587582
return settingsList;
588583
}
589584

@@ -727,10 +722,7 @@ public List<RestHandler> getRestHandlers(Settings settings, RestController restC
727722

728723
@Override
729724
public Map<String, Processor.Factory> getProcessors(Processor.Parameters parameters) {
730-
Map<String, Processor.Factory> processors = new HashMap<>();
731-
processors.put(SetSecurityUserProcessor.TYPE, new SetSecurityUserProcessor.Factory(parameters.threadContext));
732-
processors.put(HashProcessor.TYPE, new HashProcessor.Factory(parameters.env.settings()));
733-
return processors;
725+
return Collections.singletonMap(SetSecurityUserProcessor.TYPE, new SetSecurityUserProcessor.Factory(parameters.threadContext));
734726
}
735727

736728

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

Lines changed: 0 additions & 200 deletions
This file was deleted.

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

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)