Skip to content
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

[Backport 2.x] Add cat/alias support for DNFOF #4440

Merged
merged 1 commit into from
Jun 11, 2024
Merged

[Backport 2.x] Add cat/alias support for DNFOF #4440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 37 additions & 1 deletion src/integrationTest/java/org/opensearch/security/DoNotFailOnForbiddenTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
Expand Down Expand Up @@ -128,7 +129,8 @@ public class DoNotFailOnForbiddenTests {
"indices:data/read/msearch",
"indices:data/read/scroll",
"indices:monitor/settings/get",
"indices:monitor/stats"
"indices:monitor/stats",
"indices:admin/aliases/get"
)
.on(MARVELOUS_SONGS)
);
Expand Down Expand Up @@ -444,6 +446,40 @@ public void shouldPerformCatIndices_positive() throws IOException {
}
}

@Test
public void shouldPerformCatAliases_positive() throws IOException {
// DNFOF works for limited access user
try (RestHighLevelClient restHighLevelClient = cluster.getRestHighLevelClient(LIMITED_USER)) {
Request getAliasesRequest = new Request("GET", "/_cat/aliases");
Response getAliasesResponse = restHighLevelClient.getLowLevelClient().performRequest(getAliasesRequest);
List<String> aliases = new BufferedReader(new InputStreamReader(getAliasesResponse.getEntity().getContent())).lines()
.collect(Collectors.toList());

// Does not fail on forbidden, but alias response only contains index which user has access to
assertThat(getAliasesResponse.getStatusLine().getStatusCode(), equalTo(200));
assertThat(aliases.size(), equalTo(1));
assertThat(aliases.get(0), containsString("marvelous_songs"));
assertThat(aliases.get(0), not(containsString("horrible_songs")));

}

try (RestHighLevelClient restHighLevelClient = cluster.getRestHighLevelClient(ADMIN_USER)) {
Request getAliasesRequest = new Request("GET", "/_cat/aliases");
Response getAliasesResponse = restHighLevelClient.getLowLevelClient().performRequest(getAliasesRequest);
List<String> aliases = new BufferedReader(new InputStreamReader(getAliasesResponse.getEntity().getContent())).lines()
.collect(Collectors.toList());

// Admin has access to all
assertThat(getAliasesResponse.getStatusLine().getStatusCode(), equalTo(200));
// Aliases have one entry for each index
// This response is [(both-indices: marvelous_songs), (both-indices: horrible_songs), (forbidden-index: horrible_songs)]
assertThat(aliases.size(), equalTo(3));
assertThat(aliases, hasItem(containsString("marvelous_songs")));
assertThat(aliases, hasItem(containsString("horrible_songs")));

}
}

@Test
public void checkStatsApi() {
// As admin creates 2 documents in different indices, can find both indices in search, cat indice & stats APIs
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/opensearch/security/privileges/PrivilegesEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ public class PrivilegesEvaluator {
"indices:admin/shards/search_shards",
"indices:admin/resolve/index",
"indices:monitor/settings/get",
"indices:monitor/stats"
"indices:monitor/stats",
"indices:admin/aliases/get"
)
);

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/opensearch/security/privileges/PrivilegesEvaluatorUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public class PrivilegesEvaluatorUnitTest {
"indices:data/read/search/template",
"indices:data/read/tv",
"indices:monitor/settings/get",
"indices:monitor/stats"
"indices:monitor/stats",
"indices:admin/aliases/get"
);

private static final List<String> disallowedDnfof = ImmutableList.of(
"indices:admin/aliases",
"indices:admin/aliases/exists",
"indices:admin/aliases/get",
"indices:admin/analyze",
"indices:admin/cache/clear",
"indices:admin/close",
Expand Down
Loading