Skip to content

fix: NPE for policies when policyMap is not present #36323

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

Merged
abhvsn merged 4 commits into from
Sep 16, 2024
Merged

fix: NPE for policies when policyMap is not present #36323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03ac1a0
fix: NPE for policies when `policyMap` is not present
abhvsn Sep 15, 2024
75ec170
chore: Retain null value for policies
abhvsn Sep 16, 2024
435c4e6
chore: Fix null policies in few other places
abhvsn Sep 16, 2024
5bbb0ad
chore: Accept null values for policy generator
abhvsn Sep 16, 2024
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
3 changes: 3 additions & 0 deletions app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,9 @@ public Set<Policy> getAllChildPolicies(
Set<Policy> policySet,
Class<? extends BaseDomain> sourceEntity,
Class<? extends BaseDomain> destinationEntity) {
if (policySet == null) {
return new HashSet<>();
}
Set<Policy> policies = policySet.stream()
.map(policy -> {
AclPermission aclPermission =
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,9 @@ protected Mono<ActionDTO> createJsAction(ActionCollection actionCollection, Acti
newAction.setUnpublishedAction(action);

Set<Policy> actionCollectionPolicies = new HashSet<>();
actionCollection.getPolicies().forEach(policy -> {
Set<Policy> existingPolicies =
actionCollection.getPolicies() == null ? Set.of() : actionCollection.getPolicies();
existingPolicies.forEach(policy -> {
Policy actionPolicy = Policy.builder()
.permission(policy.getPermission())
.permissionGroups(policy.getPermissionGroups())
Expand Down
3 changes: 2 additions & 1 deletion ...server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserPermissionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
public class UserPermissionUtils {
public static boolean validateDomainObjectPermissionExists(
BaseDomain baseDomain, AclPermission aclPermission, Set<String> permissionGroups) {
Optional<Policy> permissionPolicy = baseDomain.getPolicies().stream()
Set<Policy> basePolicies = baseDomain.getPolicies() == null ? Set.of() : baseDomain.getPolicies();
Optional<Policy> permissionPolicy = basePolicies.stream()
.filter(policy -> policy.getPermission().equals(aclPermission.getValue()))
.findFirst();
return permissionPolicy.isPresent()
Expand Down
5 changes: 4 additions & 1 deletion ...ith/server/migrations/db/ce/Migration025RemoveUnassignPermissionFromUnnecessaryRoles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.springframework.data.mongodb.core.query.Update;

import java.util.Optional;
import java.util.Set;

import static com.appsmith.server.migrations.constants.DeprecatedFieldName.POLICIES;
import static com.appsmith.server.migrations.constants.FieldName.POLICY_MAP;
Expand Down Expand Up @@ -49,7 +50,9 @@ public void executeMigration() {

mongoTemplate.stream(optimizedQueryForInterestingPermissionGroups, PermissionGroup.class)
.forEach(permissionGroup -> {
Optional<Policy> optionalUnassignPolicy = permissionGroup.getPolicies().stream()
Set<Policy> policies =
permissionGroup.getPolicies() == null ? Set.of() : permissionGroup.getPolicies();
Optional<Policy> optionalUnassignPolicy = policies.stream()
.filter(policy -> policy.getPermission().equals("unassign:permissionGroups"))
.findFirst();

Expand Down
3 changes: 2 additions & 1 deletion ...ver/migrations/db/ce/Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ public void tagUserManagementRolesWithoutDefaultDomainTypeAndId() {
*/
Set<String> userManagementRoleIds = new HashSet<>();
existingUsers.forEach(existingUser -> {
Optional<Policy> resetPasswordPolicyOptional = existingUser.getPolicies().stream()
Set<Policy> policies = existingUser.getPolicies() == null ? Set.of() : existingUser.getPolicies();
Optional<Policy> resetPasswordPolicyOptional = policies.stream()
.filter(policy1 -> RESET_PASSWORD_USERS.getValue().equals(policy1.getPermission()))
.findFirst();
resetPasswordPolicyOptional.ifPresent(resetPasswordPolicy -> {
Expand Down
4 changes: 3 additions & 1 deletion ...ith/server/migrations/db/ce/Migration029PopulateDefaultDomainIdInUserManagementRoles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

import static com.appsmith.server.acl.AclPermission.RESET_PASSWORD_USERS;
import static com.appsmith.server.migrations.constants.DeprecatedFieldName.POLICIES;
Expand Down Expand Up @@ -51,7 +52,8 @@ public void populateDefaultDomainIdInUserManagementRoles() {
Map<String, String> userManagementRoleIdToUserIdMap = new HashMap<>();
mongoTemplate.stream(queryExistingUsersWithResetPasswordPolicy, User.class)
.forEach(existingUser -> {
Optional<Policy> resetPasswordPolicyOptional = existingUser.getPolicies().stream()
Set<Policy> policies = existingUser.getPolicies() == null ? Set.of() : existingUser.getPolicies();
Optional<Policy> resetPasswordPolicyOptional = policies.stream()
.filter(policy1 -> RESET_PASSWORD_USERS.getValue().equals(policy1.getPermission()))
.findFirst();
resetPasswordPolicyOptional.ifPresent(resetPasswordPolicy -> {
Expand Down
3 changes: 2 additions & 1 deletion ...th-server/src/main/java/com/appsmith/server/services/ce/PermissionGroupServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ public Mono<String> getPublicPermissionGroupId() {

@Override
public boolean isEntityAccessible(BaseDomain object, String permission, String permissionGroupId) {
return object.getPolicies().stream()
Set<Policy> policies = object.getPolicies() == null ? Set.of() : object.getPolicies();
return policies.stream()
.filter(policy -> policy.getPermission().equals(permission)
&& policy.getPermissionGroups().contains(permissionGroupId))
.findFirst()
Expand Down