Merge pull request #227 from adrienlauer/fix-226-security-cache

adrienlauer · web-flow · commit 42dc39fb7063 · 2017-02-15T15:19:28.000+01:00
Add security cache, fixes #226
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 2.3.4 (2017-02-15)
+
+* [new] Add security cache for authentication (enabled by default, can be disabled with `org.seedstack.seed.security.cache.authentication.enabled = false`)
+* [new] Add security cache for authorization (enabled by default, can be disabled with `org.seedstack.seed.security.cache.authorization.enabled = false`)
+
 # Version 2.3.3 (2017-01-24)
 
 * [fix] JAX-RS resources were not decorated with cache busting headers when using Jersey2 implementation.
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-core</artifactId>
diff --git a/crypto/pom.xml b/crypto/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-crypto</artifactId>
diff --git a/el/pom.xml b/el/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-el</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-metrics</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack.seed</groupId>
     <artifactId>seed</artifactId>
-    <version>2.3.3-SNAPSHOT</version>
+    <version>2.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/rest/core/pom.xml b/rest/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-core</artifactId>
diff --git a/rest/jersey1/pom.xml b/rest/jersey1/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey1</artifactId>
diff --git a/rest/jersey2/pom.xml b/rest/jersey2/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-jersey2</artifactId>
diff --git a/rest/pom.xml b/rest/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest</artifactId>
diff --git a/rest/specs/pom.xml b/rest/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-rest</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-rest-specs</artifactId>
diff --git a/security/core/pom.xml b/security/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-security</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security-core</artifactId>
diff --git a/security/core/src/main/java/org/seedstack/seed/security/internal/SecurityInternalModule.java b/security/core/src/main/java/org/seedstack/seed/security/internal/SecurityInternalModule.java
@@ -7,6 +7,7 @@
  */
 package org.seedstack.seed.security.internal;
 
+import com.google.common.base.Strings;
 import com.google.inject.Injector;
 import com.google.inject.PrivateModule;
 import com.google.inject.Provider;
@@ -72,27 +73,43 @@ private void bindRealms() {
         }
 
         bind(new TypeLiteral<Set<Class<? extends org.seedstack.seed.security.Realm>>>() {}).toInstance(apiRealmClasses);
-        bind(new TypeLiteral<Set<Realm>>() {}).toProvider(RealmProvider.class).asEagerSingleton();
+        bind(new TypeLiteral<Set<Realm>>() {}).toProvider(new RealmProvider(securityConfigurer.getSecurityConfiguration())).asEagerSingleton();
     }
 
     static class RealmProvider implements Provider<Set<Realm>> {
-
+        private final Configuration securityConfiguration;
         @Inject
         private Injector injector;
-
         @Inject
         private Set<Class<? extends org.seedstack.seed.security.Realm>> realmClasses;
-
         private Set<Realm> realms;
 
+        RealmProvider(Configuration securityConfiguration) {
+            this.securityConfiguration = securityConfiguration;
+        }
+
         @Override
         public Set<Realm> get() {
             if (realms == null) {
                 realms = new HashSet<Realm>();
                 for (Class<? extends org.seedstack.seed.security.Realm> seedRealmClass : realmClasses) {
-                    org.seedstack.seed.security.Realm realmInstance = injector.getInstance(seedRealmClass);
                     ShiroRealmAdapter realmAdapter = injector.getInstance(ShiroRealmAdapter.class);
-                    realmAdapter.setRealm(realmInstance);
+                    realmAdapter.setRealm(injector.getInstance(seedRealmClass));
+
+                    // Authentication cache
+                    realmAdapter.setAuthenticationCachingEnabled(securityConfiguration.getBoolean("cache.authentication.enabled", true));
+                    String authenticationCacheName = securityConfiguration.getString("cache.authentication.name");
+                    if (!Strings.isNullOrEmpty(authenticationCacheName)) {
+                        realmAdapter.setAuthenticationCacheName(authenticationCacheName);
+                    }
+
+                    // Authorization cache
+                    realmAdapter.setAuthorizationCachingEnabled(securityConfiguration.getBoolean("cache.authorization.enabled", true));
+                    String authorizationCacheName = securityConfiguration.getString("cache.authorization.name");
+                    if (!Strings.isNullOrEmpty(authorizationCacheName)) {
+                        realmAdapter.setAuthorizationCacheName(authorizationCacheName);
+                    }
+
                     realms.add(realmAdapter);
                 }
             }
diff --git a/security/core/src/test/java/org/seedstack/seed/security/internal/SecurityInternalModuleUnitTest.java b/security/core/src/test/java/org/seedstack/seed/security/internal/SecurityInternalModuleUnitTest.java
@@ -7,30 +7,32 @@
  */
 package org.seedstack.seed.security.internal;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.lang.annotation.Annotation;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.shiro.realm.Realm;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.internal.util.reflection.Whitebox;
-
 import com.google.inject.Injector;
 import com.google.inject.PrivateBinder;
+import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.binder.AnnotatedBindingBuilder;
 import com.google.inject.binder.AnnotatedElementBuilder;
 import com.google.inject.binder.ScopedBindingBuilder;
+import org.apache.commons.configuration.MapConfiguration;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.shiro.realm.Realm;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.internal.util.reflection.Whitebox;
 import org.seedstack.seed.security.Scope;
 import org.seedstack.seed.security.internal.realms.ConfigurationRealm;
 
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class SecurityInternalModuleUnitTest {
 
     private SecurityInternalModule underTest;
@@ -39,7 +41,7 @@ public class SecurityInternalModuleUnitTest {
 
     private SecurityConfigurer securityConfigurer;
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Before
     public void before() {
         binder = mock(PrivateBinder.class);
@@ -49,7 +51,7 @@ public void before() {
         AnnotatedElementBuilder aeb = mock(AnnotatedElementBuilder.class);
         when(binder.expose(any(Class.class))).thenReturn(aeb);
         ScopedBindingBuilder sb = mock(ScopedBindingBuilder.class);
-        when(ab.toProvider(any(Class.class))).thenReturn(sb);
+        when(ab.toProvider(any(Provider.class))).thenReturn(sb);
         when(binder.bind(any(TypeLiteral.class))).thenReturn(ab);
         when(binder.skipSources(any(Class.class), any(Class.class))).thenReturn(binder);
         securityConfigurer = mock(SecurityConfigurer.class);
@@ -62,13 +64,14 @@ public void testConfigure() {
         Set<RealmConfiguration> realmConfs = new HashSet<RealmConfiguration>();
         realmConfs.add(new RealmConfiguration("ConfigurationRealm", ConfigurationRealm.class));
         when(securityConfigurer.getConfigurationRealms()).thenReturn(realmConfs);
+        when(securityConfigurer.getSecurityConfiguration()).thenReturn(new PropertiesConfiguration());
 
         underTest.configure();
     }
 
     @Test
     public void testProvider() {
-        SecurityInternalModule.RealmProvider rp = new SecurityInternalModule.RealmProvider();
+        SecurityInternalModule.RealmProvider rp = new SecurityInternalModule.RealmProvider(new PropertiesConfiguration());
         Injector i = mock(Injector.class);
         ShiroRealmAdapter adapter = new ShiroRealmAdapter();
         when(i.getInstance(ShiroRealmAdapter.class)).thenReturn(adapter);
diff --git a/security/pom.xml b/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-security</artifactId>
diff --git a/security/specs/pom.xml b/security/specs/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.seedstack.seed</groupId>
 		<artifactId>seed-security</artifactId>
-		<version>2.3.3-SNAPSHOT</version>
+		<version>2.3.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>seed-security-specs</artifactId>
diff --git a/shell/pom.xml b/shell/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-shell</artifactId>
diff --git a/specs/pom.xml b/specs/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-specs</artifactId>
diff --git a/testing/pom.xml b/testing/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-testing</artifactId>
diff --git a/transaction/pom.xml b/transaction/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-transaction</artifactId>
diff --git a/web/core/pom.xml b/web/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-core</artifactId>
diff --git a/web/pom.xml b/web/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web</artifactId>
diff --git a/web/security/pom.xml b/web/security/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-security</artifactId>
diff --git a/web/specs/pom.xml b/web/specs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-specs</artifactId>
diff --git a/web/undertow/pom.xml b/web/undertow/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.seed</groupId>
         <artifactId>seed-web</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>seed-web-undertow</artifactId>
