build(Spring Security): Upgrade to 5.8.16 (#308)

Author: hirokiterashima

pom.xml

@@ -428,10 +428,6 @@
       <artifactId>mysql-connector-java</artifactId>
       <version>8.0.30</version>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>
@@ -560,6 +556,7 @@
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <spring-security.version>5.8.16</spring-security.version>
     <spring-security-oauth2.version>2.2.5.RELEASE</spring-security-oauth2.version>
     <spring-security-jwt.version>1.0.9.RELEASE</spring-security-jwt.version>
     <jwks-rsa.version>0.3.0</jwks-rsa.version>

src/main/java/org/wise/Application.java

@@ -24,13 +24,11 @@
 package org.wise;
 
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
-import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
@@ -58,18 +56,4 @@ public PropertiesFactoryBean i18nProperties() {
     bean.setLocation(new ClassPathResource("i18n/i18n.properties"));
     return bean;
   }
-
-  @Bean
-  public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
-    return args -> {
-      /*
-      System.out.println("Beans provided by Spring Boot:");
-      String[] beanNames = ctx.getBeanDefinitionNames();
-      Arrays.sort(beanNames);
-      for (String beanName : beanNames) {
-        System.out.println(beanName);
-      }
-      */
-    };
-  }
 }

src/main/java/org/wise/portal/spring/impl/ACLContext.java

@@ -23,24 +23,22 @@
  */
 package org.wise.portal.spring.impl;
 
-import java.util.Properties;
-
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.ehcache.EhCacheFactoryBean;
-import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.security.acls.domain.AclAuthorizationStrategy;
 import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
 import org.springframework.security.acls.domain.ConsoleAuditLogger;
 import org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy;
-import org.springframework.security.acls.domain.EhCacheBasedAclCache;
+import org.springframework.security.acls.domain.SpringCacheBasedAclCache;
 import org.springframework.security.acls.jdbc.BasicLookupStrategy;
 import org.springframework.security.acls.jdbc.JdbcMutableAclService;
 import org.springframework.security.acls.jdbc.LookupStrategy;
+import org.springframework.security.acls.model.AclCache;
 import org.springframework.security.acls.model.MutableAclService;
 import org.springframework.security.acls.model.PermissionGrantingStrategy;
 import org.wise.portal.domain.authentication.MutableAclSid;
@@ -60,22 +58,13 @@ public class ACLContext {
   @Autowired
   Environment appProperties;
 
-  @Bean
-  public EhCacheBasedAclCache aclCache() {
-    return new EhCacheBasedAclCache(aclEhCacheFactoryBean().getObject(), permissionGrantingStrategy(), aclAuthorizationStrategy());
-  }
-
-  @Bean
-  public EhCacheFactoryBean aclEhCacheFactoryBean() {
-    EhCacheFactoryBean ehCacheFactoryBean = new EhCacheFactoryBean();
-    ehCacheFactoryBean.setCacheManager(aclCacheManager().getObject());
-    ehCacheFactoryBean.setCacheName("aclCache");
-    return ehCacheFactoryBean;
-  }
+  @Autowired
+  CacheManager cacheManager;
 
   @Bean
-  public EhCacheManagerFactoryBean aclCacheManager() {
-    return new EhCacheManagerFactoryBean();
+  public AclCache aclCache() {
+    return new SpringCacheBasedAclCache(cacheManager.getCache("aclCache"),
+        permissionGrantingStrategy(), aclAuthorizationStrategy());
   }
 
   @Bean
@@ -90,14 +79,17 @@ public AclAuthorizationStrategy aclAuthorizationStrategy() {
 
   @Bean
   public LookupStrategy lookupStrategy() {
-    return new BasicLookupStrategy(dataSource, aclCache(), aclAuthorizationStrategy(), new ConsoleAuditLogger());
+    return new BasicLookupStrategy(dataSource, aclCache(), aclAuthorizationStrategy(),
+        new ConsoleAuditLogger());
   }
 
   @Bean
   public MutableAclService aclservice() {
-    JdbcMutableAclService aclService = new JdbcMutableAclService(dataSource, lookupStrategy(), aclCache());
+    JdbcMutableAclService aclService = new JdbcMutableAclService(dataSource, lookupStrategy(),
+        aclCache());
     if (appProperties.containsProperty("spring.datasource.driver-class-name")) {
-      String driverClass = (String) appProperties.getProperty("spring.datasource.driver-class-name");
+      String driverClass = (String) appProperties
+          .getProperty("spring.datasource.driver-class-name");
       if ("com.mysql.cj.jdbc.Driver".equals(driverClass)) {
         aclService.setClassIdentityQuery("SELECT @@IDENTITY");
         aclService.setSidIdentityQuery("SELECT @@IDENTITY");