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

Jump to bottom

Extend permission checks in MessageTasks and add a test coverage [HZ-2090] #25509

Merged
merged 3 commits into from Sep 22, 2023
+277 −22
Merged

Extend permission checks in MessageTasks and add a test coverage [HZ-2090] #25509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
153f91e
Extend permission checks in MessageTasks and add a test coverage
kwart Sep 8, 2023
25102ef
Make Sonar happy
kwart Sep 22, 2023
0372936
Add CODEOWNERS entry for the MessageTaskSecurityTest
kwart Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Expand Up @@ -6,3 +6,4 @@

**/client/** @hazelcast/apis
**/hazelcast-client** @hazelcast/apis
**/MessageTaskSecurityTest* @hazelcast/security-working-group
25 changes: 25 additions & 0 deletions ...lcast/src/main/java/com/hazelcast/client/impl/protocol/task/CreateProxiesMessageTask.java
View file
Open in desktop
Expand Up @@ -22,7 +22,10 @@
import com.hazelcast.core.MemberLeftException;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.SecurityContext;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.spi.impl.operationservice.Operation;
import com.hazelcast.spi.impl.proxyservice.ProxyService;
import com.hazelcast.spi.impl.proxyservice.impl.ProxyInfo;
import com.hazelcast.spi.impl.proxyservice.impl.operations.PostJoinProxyOperation;

Expand Down Expand Up @@ -79,11 +82,33 @@ protected ClientMessage encodeResponse(Object response) {
return ClientCreateProxiesCodec.encodeResponse();
}

/**
*@see #beforeProcess()
*/
@Override
public Permission getRequiredPermission() {
return null;
}

@Override
protected void beforeProcess() {
// replacement for getRequiredPermission-based checks, we have to check multiple permission
SecurityContext securityContext = clientEngine.getSecurityContext();
if (securityContext != null) {
ProxyService proxyService = clientEngine.getProxyService();
for (Map.Entry<String, String> proxy : parameters) {
String objectName = proxy.getKey();
String serviceName = proxy.getValue();
if (proxyService.existsDistributedObject(serviceName, objectName)) {
continue;
}
Permission permission = ActionConstants.getPermission(objectName, serviceName, ActionConstants.ACTION_CREATE);
securityContext.checkPermission(endpoint.getSubject(), permission);
}
}
super.beforeProcess();
}

@Override
public String getServiceName() {
return null;
Expand Down
4 changes: 3 additions & 1 deletion .../hazelcast/client/impl/protocol/task/cache/CacheAddNearCacheInvalidationListenerTask.java
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
import com.hazelcast.internal.nearcache.impl.invalidation.Invalidation;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.internal.serialization.Data;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;

import java.security.Permission;
import java.util.List;
Expand Down Expand Up @@ -118,7 +120,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_LISTEN);
}

}
4 changes: 3 additions & 1 deletion ...m/hazelcast/client/impl/protocol/task/cache/CacheAddPartitionLostListenerMessageTask.java
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
import com.hazelcast.client.impl.protocol.task.AbstractAddListenerMessageTask;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;
import com.hazelcast.spi.impl.eventservice.EventFilter;
import com.hazelcast.spi.impl.eventservice.EventRegistration;
import com.hazelcast.spi.impl.eventservice.EventService;
Expand Down Expand Up @@ -96,7 +98,7 @@ public Object[] getParameters() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/com/hazelcast/client/impl/protocol/task/cache/CacheCreateConfigMessageTask.java
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@
import com.hazelcast.config.CacheConfig;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ConfigPermission;
import com.hazelcast.spi.impl.InternalCompletableFuture;
import com.hazelcast.spi.merge.SplitBrainMergePolicyProvider;

Expand Down Expand Up @@ -80,7 +81,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new ConfigPermission();
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions .../src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheDestroyMessageTask.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import com.hazelcast.client.impl.protocol.task.AbstractInvocationMessageTask;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;
import com.hazelcast.spi.impl.operationservice.InvocationBuilder;
import com.hazelcast.spi.impl.operationservice.Operation;
import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl;
Expand Down Expand Up @@ -66,12 +68,12 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters, ActionConstants.ACTION_DESTROY);
}

@Override
public String getDistributedObjectName() {
return null;
return parameters;
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...rc/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheGetConfigMessageTask.java
View file
Open in desktop
Expand Up @@ -24,6 +24,8 @@
import com.hazelcast.config.CacheConfig;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import java.security.Permission;
Expand Down Expand Up @@ -70,7 +72,7 @@ public Object[] getParameters() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_READ);
}

@Override
Expand Down
8 changes: 8 additions & 0 deletions .../src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheIterateMessageTask.java
View file
Open in desktop
Expand Up @@ -24,8 +24,11 @@
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.iteration.IterationPointer;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import java.security.Permission;
import java.util.Collections;

import static com.hazelcast.internal.iteration.IterationPointer.decodePointers;
Expand Down Expand Up @@ -79,4 +82,9 @@ public Object[] getParameters() {
public String getMethodName() {
return "iterator";
}

@Override
public Permission getRequiredPermission() {
return new CachePermission(parameters.name, ActionConstants.ACTION_READ);
}
}
4 changes: 3 additions & 1 deletion ...a/com/hazelcast/client/impl/protocol/task/cache/CacheListenerRegistrationMessageTask.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import com.hazelcast.client.impl.protocol.task.AbstractTargetMessageTask;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import javax.cache.configuration.CacheEntryListenerConfiguration;
Expand Down Expand Up @@ -69,7 +71,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion .../src/main/java/com/hazelcast/client/impl/protocol/task/cache/CacheLoadAllMessageTask.java
View file
Open in desktop
Expand Up @@ -25,6 +25,8 @@
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.internal.serialization.Data;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;
import com.hazelcast.spi.impl.operationservice.OperationFactory;

import javax.cache.CacheException;
Expand Down Expand Up @@ -84,7 +86,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_READ);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion .../java/com/hazelcast/client/impl/protocol/task/cache/CacheManagementConfigMessageTask.java
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@
import com.hazelcast.client.impl.protocol.task.AbstractTargetMessageTask;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ConfigPermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import java.security.Permission;
Expand Down Expand Up @@ -67,7 +68,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new ConfigPermission();
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...hazelcast/client/impl/protocol/task/cache/CacheRemoveInvalidationListenerMessageTask.java
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@
import com.hazelcast.client.impl.protocol.task.AbstractRemoveListenerMessageTask;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;

import java.security.Permission;
import java.util.UUID;
Expand Down Expand Up @@ -72,7 +74,7 @@ public String getDistributedObjectName() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...azelcast/client/impl/protocol/task/cache/CacheRemovePartitionLostListenerMessageTask.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import com.hazelcast.client.impl.protocol.task.AbstractRemoveListenerMessageTask;
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.CachePermission;

import java.security.Permission;
import java.util.UUID;
Expand Down Expand Up @@ -70,7 +72,7 @@ public String getDistributedObjectName() {

@Override
public Permission getRequiredPermission() {
return null;
return new CachePermission(parameters.name, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/hazelcast/client/impl/protocol/task/map/MapDestroyCacheMessageTask.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.map.impl.querycache.subscriber.operation.DestroyQueryCacheOperation;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import java.security.Permission;
Expand Down Expand Up @@ -76,7 +78,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.mapName, ActionConstants.ACTION_DESTROY);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchEntriesMessageTask.java
View file
Open in desktop
Expand Up @@ -24,6 +24,8 @@
import com.hazelcast.map.impl.MapService;
import com.hazelcast.map.impl.iterator.MapEntriesWithCursor;
import com.hazelcast.map.impl.operation.MapOperationProvider;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import java.security.Permission;
Expand Down Expand Up @@ -67,7 +69,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.name, ActionConstants.ACTION_READ);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...st/src/main/java/com/hazelcast/client/impl/protocol/task/map/MapFetchKeysMessageTask.java
View file
Open in desktop
Expand Up @@ -24,6 +24,8 @@
import com.hazelcast.map.impl.MapService;
import com.hazelcast.map.impl.iterator.MapKeysWithCursor;
import com.hazelcast.map.impl.operation.MapOperationProvider;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.spi.impl.operationservice.Operation;

import java.security.Permission;
Expand Down Expand Up @@ -67,7 +69,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.name, ActionConstants.ACTION_READ);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion .../main/java/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateMessageTask.java
View file
Open in desktop
Expand Up @@ -33,6 +33,8 @@
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.internal.serialization.Data;
import com.hazelcast.query.Predicate;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.spi.impl.operationservice.InvocationBuilder;
import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl;
import com.hazelcast.internal.util.ExceptionUtil;
Expand Down Expand Up @@ -136,7 +138,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.mapName, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
8 changes: 5 additions & 3 deletions ...a/com/hazelcast/client/impl/protocol/task/map/MapPublisherCreateWithValueMessageTask.java
View file
Open in desktop
Expand Up @@ -33,6 +33,8 @@
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.internal.serialization.Data;
import com.hazelcast.query.Predicate;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.spi.impl.operationservice.InvocationBuilder;
import com.hazelcast.spi.impl.operationservice.impl.OperationServiceImpl;
import com.hazelcast.internal.util.ExceptionUtil;
Expand Down Expand Up @@ -98,8 +100,8 @@ private static Set<Map.Entry<Data, Data>> fetchMapSnapshotFrom(List<Future> futu
Object result;
try {
result = future.get();
} catch (Throwable t) {
throw ExceptionUtil.rethrow(t);
} catch (Exception e) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason this is now more specific?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our Sonar gatekeeper was unhappy about the changed file (even the given try block was not touched). So I tried to make Sonar happier after checking the file history.

throw ExceptionUtil.rethrow(e);
}
if (result == null) {
continue;
Expand Down Expand Up @@ -139,7 +141,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.mapName, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...om/hazelcast/client/impl/protocol/task/map/MapRemovePartitionLostListenerMessageTask.java
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@
import com.hazelcast.instance.impl.Node;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.map.impl.MapService;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;

import java.security.Permission;
import java.util.UUID;
Expand Down Expand Up @@ -68,7 +70,7 @@ public String getDistributedObjectName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.name, ActionConstants.ACTION_LISTEN);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...rc/main/java/com/hazelcast/client/impl/protocol/task/map/MapSetReadCursorMessageTask.java
View file
Open in desktop
Expand Up @@ -22,6 +22,8 @@
import com.hazelcast.instance.impl.Node;
import com.hazelcast.map.impl.MapService;
import com.hazelcast.map.impl.querycache.subscriber.operation.SetReadCursorOperation;
import com.hazelcast.security.permission.ActionConstants;
import com.hazelcast.security.permission.MapPermission;
import com.hazelcast.internal.nio.Connection;
import com.hazelcast.spi.impl.operationservice.Operation;

Expand Down Expand Up @@ -55,7 +57,7 @@ public String getServiceName() {

@Override
public Permission getRequiredPermission() {
return null;
return new MapPermission(parameters.mapName, ActionConstants.ACTION_READ);
}

@Override
Expand Down