Commit bc81a380 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '170-acl-auditsuccess' into 'master'

Resolve "ACL auditSuccess"

Closes #170

See merge request !165
parents 1af9af3d f0d05db6
Pipeline #5576 passed with stage
in 1 minute and 45 seconds
......@@ -18,6 +18,7 @@ package org.genesys.catalog.server.config;
import java.io.Serializable;
import org.apache.tomcat.jdbc.pool.DataSource;
import org.genesys.blocks.security.component.Slf4jLogAuditLogger;
import org.genesys.catalog.model.user.UserRole;
import org.genesys.catalog.server.service.impl.CaffeineAclCache;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -27,7 +28,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.acls.AclPermissionEvaluator;
import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
import org.springframework.security.acls.domain.ConsoleAuditLogger;
import org.springframework.security.acls.domain.AuditLogger;
import org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy;
import org.springframework.security.acls.jdbc.BasicLookupStrategy;
import org.springframework.security.acls.jdbc.JdbcMutableAclService;
......@@ -49,6 +50,11 @@ public class SpringAclConfig {
@Autowired
CacheManager cacheManager;
@Bean
public AuditLogger auditLogger() {
return new Slf4jLogAuditLogger();
}
/**
* Acl permission evaluator.
*
......@@ -106,7 +112,7 @@ public class SpringAclConfig {
*/
@Bean
public DefaultPermissionGrantingStrategy permissionGrantingStrategy() {
return new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger());
return new DefaultPermissionGrantingStrategy(auditLogger());
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment