forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix downsample failure when FLS/DLS is enabled. (elastic#98587)
If FLS/DLS is enabled (this is the case when trial/licence is active and security is enabled) then invoking the downsample API results in immediate failure. The downsample shard persistent task executor opens a searcher, but security didn't set indices permissions in the thread local (this happens via SecurityActionFilter). This will only happen on indices actions (which are actions with a request that implement IndicesRequest. This change does this by delegating to a transport action that executes always locally, and this way security prepares thread local headers correctly. This adds another layer of indirection, but without doing this FLS/DLS wouldn't work. Closes elastic#98569 (Marking as a non-issue, because this a bug in not released code)
- Loading branch information
Showing
8 changed files
with
615 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import org.elasticsearch.gradle.Version | ||
| import org.elasticsearch.gradle.internal.info.BuildParams | ||
|
|
||
| apply plugin: 'elasticsearch.legacy-yaml-rest-test' | ||
| apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test' | ||
|
|
||
| dependencies { | ||
| yamlRestTestImplementation project(path: xpackModule('rollup')) | ||
| } | ||
|
|
||
| restResources { | ||
| restApi { | ||
| include '_common', 'bulk', 'cluster', 'indices', 'search', 'ingest.put_pipeline', 'ingest.delete_pipeline' | ||
| } | ||
| } | ||
|
|
||
| testClusters.configureEach { | ||
| testDistribution = 'DEFAULT' | ||
| setting 'xpack.license.self_generated.type', 'trial' | ||
| setting 'xpack.security.enabled', 'true' | ||
| user username: 'elastic_admin', password: 'admin-password' | ||
| } | ||
|
|
||
| if (BuildParams.inFipsJvm){ | ||
| // This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC | ||
| tasks.named("yamlRestTest").configure{enabled = false } | ||
| } |
35 changes: 35 additions & 0 deletions
35
...h-security/src/yamlRestTest/java/org/elasticsearch/xpack/downsample/DownsampleRestIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.downsample; | ||
|
|
||
| import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; | ||
|
|
||
| import org.elasticsearch.common.settings.SecureString; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.concurrent.ThreadContext; | ||
| import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; | ||
| import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; | ||
|
|
||
| public class DownsampleRestIT extends ESClientYamlSuiteTestCase { | ||
|
|
||
| public DownsampleRestIT(final ClientYamlTestCandidate testCandidate) { | ||
| super(testCandidate); | ||
| } | ||
|
|
||
| @Override | ||
| protected Settings restClientSettings() { | ||
| String authentication = basicAuthHeaderValue("elastic_admin", new SecureString("admin-password".toCharArray())); | ||
| return Settings.builder().put(super.restClientSettings()).put(ThreadContext.PREFIX + ".Authorization", authentication).build(); | ||
| } | ||
|
|
||
| @ParametersFactory | ||
| public static Iterable<Object[]> parameters() throws Exception { | ||
| return ESClientYamlSuiteTestCase.createParameters(); | ||
| } | ||
|
|
||
| } |
378 changes: 378 additions & 0 deletions
378
...le/qa/with-security/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.