Skip to content

Commit b7878c6

Browse files
cwperkscwperks
authored
Fix build failure in SecurityFilterTests (#5736)
Signed-off-by: Craig Perkins <[email protected]>
1 parent 51535dc commit b7878c6

File tree

10 files changed

+35
-46
lines changed

10 files changed

+35
-46
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2222
### Refactoring
2323
- [Resource Sharing] Make migrate api require default access level to be supplied and updates documentations + tests ([#5717](https://github.com/opensearch-project/security/pull/5717))
2424
- [Resource Sharing] Removes share and revoke java APIs ([#5718](https://github.com/opensearch-project/security/pull/5718))
25+
- Fix build failure in SecurityFilterTests ([#5736](https://github.com/opensearch-project/security/pull/5736))
2526

2627
### Maintenance
2728
- Bump `org.junit.jupiter:junit-jupiter` from 5.13.4 to 5.14.0 ([#5678](https://github.com/opensearch-project/security/pull/5678))

‎sample-resource-plugin/src/main/java/org/opensearch/sample/resource/actions/rest/create/CreateResourceRestAction.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ private RestChannelConsumer createResource(Map<String, Object> source, NodeClien
9090
);
9191
}
9292

93-
// NOTE: Do NOT use @SuppressWarnings("unchecked") on untrusted data in production code. This is used here only to keep the code simple
9493
@SuppressWarnings("unchecked")
9594
private Map<String, String> getAttributes(Map<String, Object> source) {
9695
return source.containsKey("attributes") ? (Map<String, String>) source.get("attributes") : null;

‎sample-resource-plugin/src/main/java/org/opensearch/sample/resourcegroup/actions/rest/create/CreateResourceGroupRequest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.opensearch.action.DocRequest;
1616
import org.opensearch.core.common.io.stream.StreamInput;
1717
import org.opensearch.core.common.io.stream.StreamOutput;
18-
import org.opensearch.sample.SampleResource;
18+
import org.opensearch.sample.SampleResourceGroup;
1919

2020
import static org.opensearch.sample.utils.Constants.RESOURCE_GROUP_TYPE;
2121
import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
@@ -25,31 +25,31 @@
2525
*/
2626
public class CreateResourceGroupRequest extends ActionRequest implements DocRequest {
2727

28-
private final SampleResource resource;
28+
private final SampleResourceGroup resourceGroup;
2929

3030
/**
3131
* Default constructor
3232
*/
33-
public CreateResourceGroupRequest(SampleResource resource) {
34-
this.resource = resource;
33+
public CreateResourceGroupRequest(SampleResourceGroup resourceGroup) {
34+
this.resourceGroup = resourceGroup;
3535
}
3636

3737
public CreateResourceGroupRequest(StreamInput in) throws IOException {
38-
this.resource = in.readNamedWriteable(SampleResource.class);
38+
this.resourceGroup = in.readNamedWriteable(SampleResourceGroup.class);
3939
}
4040

4141
@Override
4242
public void writeTo(final StreamOutput out) throws IOException {
43-
resource.writeTo(out);
43+
resourceGroup.writeTo(out);
4444
}
4545

4646
@Override
4747
public ActionRequestValidationException validate() {
4848
return null;
4949
}
5050

51-
public SampleResource getResource() {
52-
return this.resource;
51+
public SampleResourceGroup getResourceGroup() {
52+
return this.resourceGroup;
5353
}
5454

5555
@Override

‎sample-resource-plugin/src/main/java/org/opensearch/sample/resourcegroup/actions/rest/create/CreateResourceGroupRestAction.java‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.opensearch.rest.BaseRestHandler;
1717
import org.opensearch.rest.RestRequest;
1818
import org.opensearch.rest.action.RestToXContentListener;
19-
import org.opensearch.sample.SampleResource;
19+
import org.opensearch.sample.SampleResourceGroup;
2020
import org.opensearch.transport.client.node.NodeClient;
2121

2222
import static org.opensearch.rest.RestRequest.Method.POST;
@@ -60,12 +60,10 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
6060
private RestChannelConsumer updateResource(Map<String, Object> source, String resourceId, NodeClient client) throws IOException {
6161
String name = (String) source.get("name");
6262
String description = source.containsKey("description") ? (String) source.get("description") : null;
63-
Map<String, String> attributes = getAttributes(source);
64-
SampleResource resource = new SampleResource();
65-
resource.setName(name);
66-
resource.setDescription(description);
67-
resource.setAttributes(attributes);
68-
final UpdateResourceGroupRequest updateResourceRequest = new UpdateResourceGroupRequest(resourceId, resource);
63+
SampleResourceGroup resourceGroup = new SampleResourceGroup();
64+
resourceGroup.setName(name);
65+
resourceGroup.setDescription(description);
66+
final UpdateResourceGroupRequest updateResourceRequest = new UpdateResourceGroupRequest(resourceId, resourceGroup);
6967
return channel -> client.executeLocally(
7068
UpdateResourceGroupAction.INSTANCE,
7169
updateResourceRequest,
@@ -76,22 +74,14 @@ private RestChannelConsumer updateResource(Map<String, Object> source, String re
7674
private RestChannelConsumer createResource(Map<String, Object> source, NodeClient client) throws IOException {
7775
String name = (String) source.get("name");
7876
String description = source.containsKey("description") ? (String) source.get("description") : null;
79-
Map<String, String> attributes = getAttributes(source);
80-
SampleResource resource = new SampleResource();
81-
resource.setName(name);
82-
resource.setDescription(description);
83-
resource.setAttributes(attributes);
84-
final CreateResourceGroupRequest createSampleResourceRequest = new CreateResourceGroupRequest(resource);
77+
SampleResourceGroup resourceGroup = new SampleResourceGroup();
78+
resourceGroup.setName(name);
79+
resourceGroup.setDescription(description);
80+
final CreateResourceGroupRequest createSampleResourceRequest = new CreateResourceGroupRequest(resourceGroup);
8581
return channel -> client.executeLocally(
8682
CreateResourceGroupAction.INSTANCE,
8783
createSampleResourceRequest,
8884
new RestToXContentListener<>(channel)
8985
);
9086
}
91-
92-
// NOTE: Do NOT use @SuppressWarnings("unchecked") on untrusted data in production code. This is used here only to keep the code simple
93-
@SuppressWarnings("unchecked")
94-
private Map<String, String> getAttributes(Map<String, Object> source) {
95-
return source.containsKey("attributes") ? (Map<String, String>) source.get("attributes") : null;
96-
}
9787
}

‎sample-resource-plugin/src/main/java/org/opensearch/sample/resourcegroup/actions/rest/create/UpdateResourceGroupRequest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.opensearch.action.DocRequest;
1616
import org.opensearch.core.common.io.stream.StreamInput;
1717
import org.opensearch.core.common.io.stream.StreamOutput;
18-
import org.opensearch.sample.SampleResource;
18+
import org.opensearch.sample.SampleResourceGroup;
1919

2020
import static org.opensearch.sample.utils.Constants.RESOURCE_GROUP_TYPE;
2121
import static org.opensearch.sample.utils.Constants.RESOURCE_INDEX_NAME;
@@ -26,34 +26,34 @@
2626
public class UpdateResourceGroupRequest extends ActionRequest implements DocRequest {
2727

2828
private final String resourceId;
29-
private final SampleResource resource;
29+
private final SampleResourceGroup resourceGroup;
3030

3131
/**
3232
* Default constructor
3333
*/
34-
public UpdateResourceGroupRequest(String resourceId, SampleResource resource) {
34+
public UpdateResourceGroupRequest(String resourceId, SampleResourceGroup resourceGroup) {
3535
this.resourceId = resourceId;
36-
this.resource = resource;
36+
this.resourceGroup = resourceGroup;
3737
}
3838

3939
public UpdateResourceGroupRequest(StreamInput in) throws IOException {
4040
this.resourceId = in.readString();
41-
this.resource = in.readNamedWriteable(SampleResource.class);
41+
this.resourceGroup = in.readNamedWriteable(SampleResourceGroup.class);
4242
}
4343

4444
@Override
4545
public void writeTo(final StreamOutput out) throws IOException {
4646
out.writeString(resourceId);
47-
resource.writeTo(out);
47+
resourceGroup.writeTo(out);
4848
}
4949

5050
@Override
5151
public ActionRequestValidationException validate() {
5252
return null;
5353
}
5454

55-
public SampleResource getResource() {
56-
return this.resource;
55+
public SampleResourceGroup getResourceGroup() {
56+
return this.resourceGroup;
5757
}
5858

5959
public String getResourceId() {

‎sample-resource-plugin/src/main/java/org/opensearch/sample/resourcegroup/actions/transport/CreateResourceGroupTransportAction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.opensearch.core.action.ActionListener;
2626
import org.opensearch.core.xcontent.ToXContent;
2727
import org.opensearch.core.xcontent.XContentBuilder;
28-
import org.opensearch.sample.SampleResource;
28+
import org.opensearch.sample.SampleResourceGroup;
2929
import org.opensearch.sample.resourcegroup.actions.rest.create.CreateResourceGroupAction;
3030
import org.opensearch.sample.resourcegroup.actions.rest.create.CreateResourceGroupRequest;
3131
import org.opensearch.sample.resourcegroup.actions.rest.create.CreateResourceGroupResponse;
@@ -57,7 +57,7 @@ protected void doExecute(Task task, CreateResourceGroupRequest request, ActionLi
5757
}
5858

5959
private void createResource(CreateResourceGroupRequest request, ActionListener<CreateResourceGroupResponse> listener) {
60-
SampleResource sample = request.getResource();
60+
SampleResourceGroup sampleGroup = request.getResourceGroup();
6161

6262
// 1. Read mapping JSON from the config file
6363
final String mappingJson;
@@ -81,7 +81,7 @@ private void createResource(CreateResourceGroupRequest request, ActionListener<C
8181
IndexRequest ir = pluginClient.prepareIndex(RESOURCE_INDEX_NAME)
8282
.setWaitForActiveShards(1)
8383
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
84-
.setSource(sample.toXContent(builder, ToXContent.EMPTY_PARAMS))
84+
.setSource(sampleGroup.toXContent(builder, ToXContent.EMPTY_PARAMS))
8585
.request();
8686

8787
log.debug("Index Request: {}", ir);

‎sample-resource-plugin/src/main/java/org/opensearch/sample/resourcegroup/actions/transport/UpdateResourceGroupTransportAction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.opensearch.core.action.ActionListener;
2020
import org.opensearch.core.xcontent.ToXContent;
2121
import org.opensearch.core.xcontent.XContentBuilder;
22-
import org.opensearch.sample.SampleResource;
22+
import org.opensearch.sample.SampleResourceGroup;
2323
import org.opensearch.sample.resourcegroup.actions.rest.create.CreateResourceGroupResponse;
2424
import org.opensearch.sample.resourcegroup.actions.rest.create.UpdateResourceGroupAction;
2525
import org.opensearch.sample.resourcegroup.actions.rest.create.UpdateResourceGroupRequest;
@@ -59,7 +59,7 @@ protected void doExecute(Task task, UpdateResourceGroupRequest request, ActionLi
5959
private void updateResource(UpdateResourceGroupRequest request, ActionListener<CreateResourceGroupResponse> listener) {
6060
try {
6161
String resourceId = request.getResourceId();
62-
SampleResource sample = request.getResource();
62+
SampleResourceGroup sample = request.getResourceGroup();
6363
try (XContentBuilder builder = jsonBuilder()) {
6464
sample.toXContent(builder, ToXContent.EMPTY_PARAMS);
6565

@@ -73,7 +73,7 @@ private void updateResource(UpdateResourceGroupRequest request, ActionListener<C
7373

7474
pluginClient.index(ir, ActionListener.wrap(updateResponse -> {
7575
listener.onResponse(
76-
new CreateResourceGroupResponse("Resource " + request.getResource().getName() + " updated successfully.")
76+
new CreateResourceGroupResponse("Resource " + request.getResourceGroup().getName() + " updated successfully.")
7777
);
7878
}, listener::onFailure));
7979
}

‎src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,6 @@ public final class OpenSearchSecurityPlugin extends OpenSearchSecuritySSLPlugin
305305
private ResourceAccessHandler resourceAccessHandler;
306306
private final ResourcePluginInfo resourcePluginInfo = new ResourcePluginInfo();
307307
private volatile ResourceAccessEvaluator resourceAccessEvaluator;
308-
// CS-SUPPRESS-SINGLE: RegexpSingleline get Extensions Settings
309-
private final Set<ResourceSharingExtension> resourceSharingExtensions = new HashSet<>();
310-
// CS-ENFORCE-SINGLE
311308

312309
public static boolean isActionTraceEnabled() {
313310

‎src/main/java/org/opensearch/security/filter/SecurityFilter.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import org.opensearch.action.search.SearchRequest;
6262
import org.opensearch.action.support.ActionFilter;
6363
import org.opensearch.action.support.ActionFilterChain;
64+
import org.opensearch.action.support.ActionRequestMetadata;
6465
import org.opensearch.action.update.UpdateRequest;
6566
import org.opensearch.cluster.service.ClusterService;
6667
import org.opensearch.common.settings.Settings;
@@ -167,6 +168,7 @@ public <Request extends ActionRequest, Response extends ActionResponse> void app
167168
Task task,
168169
final String action,
169170
Request request,
171+
ActionRequestMetadata<Request, Response> actionRequestMetadata,
170172
ActionListener<Response> listener,
171173
ActionFilterChain<Request, Response> chain
172174
) {

‎src/test/java/org/opensearch/security/filter/SecurityFilterTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void testUnexepectedCausesAreNotSendToCallers() {
119119
);
120120

121121
// Act
122-
filter.apply(null, null, null, listener, null);
122+
filter.apply(null, null, null, null, listener, null);
123123

124124
// Verify
125125
verify(auditLog).getComplianceConfig(); // Make sure the exception was thrown

0 commit comments

Comments
 (0)