Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Revert "RED-5246: updated ACLBeanConfiguration to use... #283

Merged
ali.oezyetimoglu1 merged 1 commits from RED-5246-revert into master 2023-12-21 12:33:07 +01:00
Conversation 3 Commits 1 Files Changed 2 +11 -6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/ACLBeanConfiguration.java
View File

@ -1,7 +1,5 @@
package com.iqser.red.service.persistence.management.v1.processor.acl; package com.iqser.red.service.persistence.management.v1.processor.acl;
import com.knecon.fforesight.databasetenantcommons.providers.MultiTenantDataSource;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -9,6 +7,7 @@ import org.springframework.context.annotation.Primary;
import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
import org.springframework.security.acls.AclPermissionCacheOptimizer; import org.springframework.security.acls.AclPermissionCacheOptimizer;
import org.springframework.security.acls.AclPermissionEvaluator;
import org.springframework.security.acls.domain.AclAuthorizationStrategy; import org.springframework.security.acls.domain.AclAuthorizationStrategy;
import org.springframework.security.acls.domain.ConsoleAuditLogger; import org.springframework.security.acls.domain.ConsoleAuditLogger;
import org.springframework.security.acls.domain.DefaultPermissionFactory; import org.springframework.security.acls.domain.DefaultPermissionFactory;
@ -21,6 +20,10 @@ import org.springframework.security.acls.jdbc.LookupStrategy;
import org.springframework.security.acls.model.PermissionGrantingStrategy; import org.springframework.security.acls.model.PermissionGrantingStrategy;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import com.knecon.fforesight.databasetenantcommons.providers.MultiTenantDataSource;
import lombok.RequiredArgsConstructor;
@Configuration @Configuration
@RequiredArgsConstructor @RequiredArgsConstructor
@EnableTransactionManagement @EnableTransactionManagement
@ -78,7 +81,7 @@ public class ACLBeanConfiguration {
public MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler() { public MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler() {
DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler(); DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
CustomAclPermissionEvaluator permissionEvaluator = new CustomAclPermissionEvaluator(aclService()); AclPermissionEvaluator permissionEvaluator = new AclPermissionEvaluator(aclService());
permissionEvaluator.setPermissionFactory(permissionFactory()); permissionEvaluator.setPermissionFactory(permissionFactory());
expressionHandler.setPermissionEvaluator(permissionEvaluator); expressionHandler.setPermissionEvaluator(permissionEvaluator);

8
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/CustomAclPermissionEvaluator.java
View File

@ -1,16 +1,18 @@
package com.iqser.red.service.persistence.management.v1.processor.acl; package com.iqser.red.service.persistence.management.v1.processor.acl;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException; import java.io.Serializable;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
import org.springframework.security.acls.AclPermissionEvaluator; import org.springframework.security.acls.AclPermissionEvaluator;
import org.springframework.security.acls.model.AclService; import org.springframework.security.acls.model.AclService;
import org.springframework.security.acls.model.NotFoundException;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import java.io.Serializable; import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException;
public class CustomAclPermissionEvaluator extends AclPermissionEvaluator { public class CustomAclPermissionEvaluator extends AclPermissionEvaluator {
public CustomAclPermissionEvaluator(AclService aclService) { public CustomAclPermissionEvaluator(AclService aclService) {
super(aclService); super(aclService);
} }