Skip to content

Commit efc2741

Browse files
peterniedpeternied
authored
Revert "Fix data-stream name resolution for wild-cards (#1716)" (#1719)
This reverts commit 2a05ce4.
1 parent 2a05ce4 commit efc2741

File tree

3 files changed

+10
-84
lines changed

3 files changed

+10
-84
lines changed

‎src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ private void resolveIndexPatterns(final String name, final IndicesOptions indice
224224

225225
final Collection<String> matchingAliases;
226226
Collection<String> matchingAllIndices;
227-
Collection<String> matchingDataStreams = null;
228227

229228
if (isLocalAll(original)) {
230229
if (isTraceEnabled) {
@@ -260,11 +259,8 @@ private void resolveIndexPatterns(final String name, final IndicesOptions indice
260259
final boolean isDebugEnabled = log.isDebugEnabled();
261260
try {
262261
matchingAllIndices = Arrays.asList(resolver.concreteIndexNames(state, indicesOptions, localRequestedPatterns.toArray(new String[0])));
263-
matchingDataStreams = resolver.dataStreamNames(state, indicesOptions, localRequestedPatterns.toArray(new String[0]));
264-
265262
if (isDebugEnabled) {
266-
log.debug("Resolved pattern {} to indices: {} and data-streams: {}",
267-
localRequestedPatterns, matchingAllIndices, matchingDataStreams);
263+
log.debug("Resolved pattern {} to {}", localRequestedPatterns, matchingAllIndices);
268264
}
269265
} catch (IndexNotFoundException e1) {
270266
if (isDebugEnabled) {
@@ -275,16 +271,13 @@ private void resolveIndexPatterns(final String name, final IndicesOptions indice
275271
}
276272
}
277273

278-
if (matchingDataStreams == null || matchingDataStreams.size() == 0) {
279-
matchingDataStreams = Arrays.asList(NOOP);
280-
}
281-
282274
if (isTraceEnabled) {
283-
log.trace("Resolved patterns {} for {} ({}) to [aliases {}, allIndices {}, dataStreams {}, originalRequested{}, remote indices {}]",
284-
original, name, this.name, matchingAliases, matchingAllIndices, matchingDataStreams, Arrays.toString(original), remoteIndices);
275+
log.trace("Resolved patterns {} for {} ({}) to [aliases {}, allIndices {}, originalRequested{}, remote indices {}]",
276+
original, name, this.name, matchingAliases, matchingAllIndices, Arrays.toString(original), remoteIndices);
285277
}
286278

287-
resolveTo(matchingAliases, matchingAllIndices, matchingDataStreams, original, remoteIndices);
279+
resolveTo(matchingAliases, matchingAllIndices, original, remoteIndices);
280+
288281
}
289282

290283
private void resolveToLocalAll() {
@@ -293,11 +286,9 @@ private void resolveToLocalAll() {
293286
originalRequested.add(Resolved.ANY);
294287
}
295288

296-
private void resolveTo(Iterable<String> matchingAliases, Iterable<String> matchingAllIndices,
297-
Iterable<String> matchingDataStreams, String[] original, Iterable<String> remoteIndices) {
289+
private void resolveTo(Iterable<String> matchingAliases, Iterable<String> matchingAllIndices, String[] original, Iterable<String> remoteIndices) {
298290
aliases.addAll(matchingAliases);
299291
allIndices.addAll(matchingAllIndices);
300-
allIndices.addAll(matchingDataStreams);
301292
originalRequested.add(original);
302293
this.remoteIndices.addAll(remoteIndices);
303294
}

‎src/test/java/org/opensearch/security/DataStreamIntegrationTests.java‎

Lines changed: 3 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ public void createSampleDataStreams(RestHelper rh) throws Exception{
3434
rh.executePutRequest("/_index_template/my-data-stream-template", getIndexTemplateBody(), encodeBasicHeader("ds1", "nagilum"));
3535

3636
rh.executePutRequest("/_data_stream/my-data-stream11", getIndexTemplateBody(), encodeBasicHeader("ds3", "nagilum"));
37-
rh.executePutRequest("/_data_stream/my-data-stream21", getIndexTemplateBody(), encodeBasicHeader("ds3", "nagilum"));
3837
rh.executePutRequest("/_data_stream/my-data-stream22", getIndexTemplateBody(), encodeBasicHeader("ds3", "nagilum"));
39-
rh.executePutRequest("/_data_stream/my-data-stream23", getIndexTemplateBody(), encodeBasicHeader("ds3", "nagilum"));
4038
rh.executePutRequest("/_data_stream/my-data-stream33", getIndexTemplateBody(), encodeBasicHeader("ds3", "nagilum"));
4139
}
4240

@@ -91,27 +89,6 @@ public void testGetDataStream() throws Exception {
9189

9290
response = rh.executeGetRequest("/_data_stream/my-data-stream33", encodeBasicHeader("ds3", "nagilum"));
9391
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
94-
95-
response = rh.executeGetRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds0", "nagilum"));
96-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
97-
98-
response = rh.executeGetRequest("/_data_stream/my-data-stream21,my-data-stream22", encodeBasicHeader("ds0", "nagilum"));
99-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
100-
101-
response = rh.executeGetRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds1", "nagilum"));
102-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
103-
104-
response = rh.executeGetRequest("/_data_stream/my-data-stream2*", encodeBasicHeader("ds2", "nagilum"));
105-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
106-
107-
response = rh.executeGetRequest("/_data_stream/my-data-stream21,my-data-stream22", encodeBasicHeader("ds2", "nagilum"));
108-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
109-
110-
response = rh.executeGetRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds2", "nagilum"));
111-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
112-
113-
response = rh.executeGetRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds3", "nagilum"));
114-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
11592
}
11693

11794
@Test
@@ -126,39 +103,18 @@ public void testDeleteDataStream() throws Exception {
126103
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
127104

128105
response = rh.executeDeleteRequest("/_data_stream/my-data-stream11", encodeBasicHeader("ds1", "nagilum"));
129-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
106+
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
130107

131108
response = rh.executeDeleteRequest("/_data_stream/my-data-stream11", encodeBasicHeader("ds2", "nagilum"));
132109
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
133110

134111
response = rh.executeDeleteRequest("/_data_stream/my-data-stream22", encodeBasicHeader("ds2", "nagilum"));
135-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
136-
137-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream33", encodeBasicHeader("ds3", "nagilum"));
138-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
139-
140-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds0", "nagilum"));
141-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
142-
143-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream21,my-data-stream22", encodeBasicHeader("ds0", "nagilum"));
144112
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
145113

146-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds1", "nagilum"));
147-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
148-
149-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream21,my-data-stream22", encodeBasicHeader("ds1", "nagilum"));
150-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
151-
152-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream2*", encodeBasicHeader("ds2", "nagilum"));
153-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
154-
155-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream21,my-data-stream22", encodeBasicHeader("ds2", "nagilum"));
114+
response = rh.executeDeleteRequest("/_data_stream/my-data-stream22", encodeBasicHeader("ds1", "nagilum"));
156115
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
157116

158-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds2", "nagilum"));
159-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
160-
161-
response = rh.executeDeleteRequest("/_data_stream/my-data-stream*", encodeBasicHeader("ds3", "nagilum"));
117+
response = rh.executeDeleteRequest("/_data_stream/my-data-stream33", encodeBasicHeader("ds3", "nagilum"));
162118
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
163119
}
164120

@@ -187,26 +143,5 @@ public void testDataStreamStats() throws Exception {
187143

188144
response = rh.executeGetRequest("/_data_stream/my-data-stream33/_stats", encodeBasicHeader("ds3", "nagilum"));
189145
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
190-
191-
response = rh.executeGetRequest("/_data_stream/my-data-stream*/_stats", encodeBasicHeader("ds0", "nagilum"));
192-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
193-
194-
response = rh.executeGetRequest("/_data_stream/my-data-stream21,my-data-stream22/_stats", encodeBasicHeader("ds0", "nagilum"));
195-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
196-
197-
response = rh.executeGetRequest("/_data_stream/my-data-stream*/_stats", encodeBasicHeader("ds1", "nagilum"));
198-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
199-
200-
response = rh.executeGetRequest("/_data_stream/my-data-stream2*/_stats", encodeBasicHeader("ds2", "nagilum"));
201-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
202-
203-
response = rh.executeGetRequest("/_data_stream/my-data-stream21,my-data-stream22/_stats", encodeBasicHeader("ds2", "nagilum"));
204-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
205-
206-
response = rh.executeGetRequest("/_data_stream/my-data-stream*/_stats", encodeBasicHeader("ds2", "nagilum"));
207-
Assert.assertEquals(HttpStatus.SC_FORBIDDEN, response.getStatusCode());
208-
209-
response = rh.executeGetRequest("/_data_stream/my-data-stream*/_stats", encodeBasicHeader("ds3", "nagilum"));
210-
Assert.assertEquals(HttpStatus.SC_OK, response.getStatusCode());
211146
}
212147
}

‎src/test/resources/roles.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ data_stream_1:
10911091
allowed_actions:
10921092
- "indices:admin/data_stream/get"
10931093
- "indices:admin/data_stream/create"
1094+
- "indices:admin/data_stream/delete"
10941095

10951096
data_stream_2:
10961097
reserved: true
@@ -1104,7 +1105,6 @@ data_stream_2:
11041105
- "indices:admin/data_stream/get"
11051106
- "indices:admin/data_stream/create"
11061107
- "indices:monitor/data_stream/stats"
1107-
- "indices:admin/data_stream/delete"
11081108

11091109
data_stream_3:
11101110
reserved: true

0 commit comments

Comments
 (0)