You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/06/29 16:54:21 UTC
[1/6] shiro git commit: SHIRO-518 Updating cas-client-core version to 3.2.2 Submitted by: Jérôme Leleu
Repository: shiro
Updated Branches:
refs/heads/master e109f816f -> 235209e42
SHIRO-518 Updating cas-client-core version to 3.2.2
Submitted by: J�r�me Leleu
git-svn-id: https://svn.apache.org/repos/asf/shiro/branches/1.2.x@1666343 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/f47ced33
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/f47ced33
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/f47ced33
Branch: refs/heads/master
Commit: f47ced33952b1a8e3b45fb843efe1522ec4c519b
Parents: e109f81
Author: Brian Demers <bd...@apache.org>
Authored: Fri Mar 13 01:17:26 2015 +0000
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 21 10:25:49 2016 -0700
----------------------------------------------------------------------
support/cas/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/f47ced33/support/cas/pom.xml
----------------------------------------------------------------------
diff --git a/support/cas/pom.xml b/support/cas/pom.xml
index ddc183d..659f97a 100644
--- a/support/cas/pom.xml
+++ b/support/cas/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.jasig.cas.client</groupId>
<artifactId>cas-client-core</artifactId>
- <version>3.2.1</version>
+ <version>3.2.2</version>
</dependency>
<dependency>
<!-- for Optional SAML ticket validation: -->
[2/6] shiro git commit: Disabled javadoc lint when using java 1.8
Posted by bd...@apache.org.
Disabled javadoc lint when using java 1.8
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/eae601b9
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/eae601b9
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/eae601b9
Branch: refs/heads/master
Commit: eae601b90aff7f06cc177d6c3aa4f68fb6f03952
Parents: 23afbb6
Author: Brian Demers <bd...@stormpath.com>
Authored: Mon Jun 27 11:52:50 2016 -0700
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:58:37 2016 -0700
----------------------------------------------------------------------
pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/eae601b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1102aa2..9c003eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1100,6 +1100,16 @@
<profiles>
<profile>
+ <id>jdk8</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <!-- Needed for the javadoc plugin when using JDK 1.8 -->
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </properties>
+ </profile>
+ <profile>
<id>docs</id>
<build>
<plugins>
[6/6] shiro git commit: Make the apache-rat-plugin ONLY run against
the root project.
Posted by bd...@apache.org.
Make the apache-rat-plugin ONLY run against the root project.
The apache-rat-plugin will cover all files in the project when
run from the root.
Previously the samples.pom disabled the site plugin execution to
work around this issue.
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/235209e4
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/235209e4
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/235209e4
Branch: refs/heads/master
Commit: 235209e42545a95e93a999e6272c69d72260ecc7
Parents: eae601b
Author: Brian Demers <bd...@stormpath.com>
Authored: Fri Jun 24 16:26:06 2016 -0700
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:58:38 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 ++
samples/pom.xml | 16 ----------------
2 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/235209e4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c003eb..dd8762b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1037,6 +1037,8 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.11</version>
+ <!-- only run at the root -->
+ <inherited>false</inherited>
<configuration>
<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
<excludes>
http://git-wip-us.apache.org/repos/asf/shiro/blob/235209e4/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 22245e3..7ce6803 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -43,22 +43,6 @@
<module>quickstart-guice</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <!-- Turn off this plugin - it often fails with the example projects:
- http://shiro-developer.582600.n2.nabble.com/Failed-releases-and-Apache-Rat-tp7577605.html -->
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<reporting>
<plugins>
<plugin>
[5/6] shiro git commit: FIXED - SHIRO-496: Update shior.guice
dependency - apply Kevin Sweeney's patch to remove Guava with changes. The
original patch has a bug in ShiroWebModule.setupFilterChainConfig,
add a rudimentary fix
Posted by bd...@apache.org.
FIXED - SHIRO-496: Update shior.guice dependency
- apply Kevin Sweeney's patch to remove Guava with changes. The original patch has a bug in ShiroWebModule.setupFilterChainConfig, add a rudimentary fix
git-svn-id: https://svn.apache.org/repos/asf/shiro/branches/1.2.x@1667165 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/fba5bd4d
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/fba5bd4d
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/fba5bd4d
Branch: refs/heads/master
Commit: fba5bd4d2d95d370045750f533f60e8370419500
Parents: 73fb973
Author: Kalle Korhonen <ka...@apache.org>
Authored: Tue Mar 17 02:43:00 2015 +0000
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:58:37 2016 -0700
----------------------------------------------------------------------
pom.xml | 6 ---
support/guice/pom.xml | 4 --
.../apache/shiro/guice/BeanTypeListener.java | 40 +++++++++++----
.../org/apache/shiro/guice/ShiroModule.java | 29 +++++------
.../guice/web/AbstractInjectionProvider.java | 13 ++---
.../guice/web/FilterChainResolverProvider.java | 17 ++++---
.../apache/shiro/guice/web/ShiroWebModule.java | 53 ++++++++++++--------
.../guice/web/SimpleFilterChainResolver.java | 38 ++++++++------
.../shiro/guice/web/SimpleFilterChainTest.java | 17 ++++---
9 files changed, 129 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e2eabd8..1102aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,6 @@
<slf4j.version>1.6.4</slf4j.version>
<spring.version>3.1.0.RELEASE</spring.version>
<guice.version>3.0</guice.version>
- <guava.version>r09</guava.version>
<!-- Test 3rd-party dependencies: -->
<easymock.version>3.1</easymock.version>
@@ -919,11 +918,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/pom.xml
----------------------------------------------------------------------
diff --git a/support/guice/pom.xml b/support/guice/pom.xml
index e7bdb5d..cec3c67 100644
--- a/support/guice/pom.xml
+++ b/support/guice/pom.xml
@@ -46,10 +46,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/main/java/org/apache/shiro/guice/BeanTypeListener.java
----------------------------------------------------------------------
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/BeanTypeListener.java b/support/guice/src/main/java/org/apache/shiro/guice/BeanTypeListener.java
index 6570f38..7cc4521 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/BeanTypeListener.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/BeanTypeListener.java
@@ -18,8 +18,23 @@
*/
package org.apache.shiro.guice;
-import com.google.common.primitives.Primitives;
-import com.google.inject.*;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.inject.Binder;
+import com.google.inject.ConfigurationException;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.MembersInjector;
+import com.google.inject.Provider;
+import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matcher;
import com.google.inject.matcher.Matchers;
import com.google.inject.multibindings.MapBinder;
@@ -27,16 +42,10 @@ import com.google.inject.name.Names;
import com.google.inject.spi.TypeEncounter;
import com.google.inject.spi.TypeListener;
import com.google.inject.util.Types;
+
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.shiro.SecurityUtils;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* TypeListener that injects setter methods on Shiro objects.
*/
@@ -54,6 +63,17 @@ class BeanTypeListener implements TypeListener {
private static final String BEAN_TYPE_MAP_NAME = "__SHIRO_BEAN_TYPES__";
static final Key<?> MAP_KEY = Key.get(Types.mapOf(TypeLiteral.class, BeanTypeKey.class), Names.named(BEAN_TYPE_MAP_NAME));
+ private static final Set<Class<?>> WRAPPER_TYPES = new HashSet<Class<?>>(Arrays.asList(
+ Byte.class,
+ Boolean.class,
+ Character.class,
+ Double.class,
+ Float.class,
+ Integer.class,
+ Long.class,
+ Short.class,
+ Void.class));
+
public <I> void hear(TypeLiteral<I> type, final TypeEncounter<I> encounter) {
PropertyDescriptor propertyDescriptors[] = PropertyUtils.getPropertyDescriptors(type.getRawType());
final Map<PropertyDescriptor, Key<?>> propertyDependencies = new HashMap<PropertyDescriptor, Key<?>>(propertyDescriptors.length);
@@ -112,7 +132,7 @@ class BeanTypeListener implements TypeListener {
private static boolean requiresName(Type propertyType) {
if (propertyType instanceof Class) {
Class<?> aClass = (Class<?>) propertyType;
- return aClass.isPrimitive() || aClass.isEnum() || Primitives.isWrapperType(aClass) || CharSequence.class.isAssignableFrom(aClass);
+ return aClass.isPrimitive() || aClass.isEnum() || WRAPPER_TYPES.contains(aClass) || CharSequence.class.isAssignableFrom(aClass);
} else {
return false;
}
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
----------------------------------------------------------------------
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java b/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
index f032be2..a2714ad 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/ShiroModule.java
@@ -18,14 +18,13 @@
*/
package org.apache.shiro.guice;
-import com.google.common.collect.Sets;
-import com.google.inject.Key;
-import com.google.inject.PrivateModule;
-import com.google.inject.TypeLiteral;
-import com.google.inject.binder.AnnotatedBindingBuilder;
-import com.google.inject.binder.LinkedBindingBuilder;
-import com.google.inject.multibindings.Multibinder;
-import com.google.inject.util.Types;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+import javax.annotation.PreDestroy;
+
import org.apache.shiro.config.ConfigurationException;
import org.apache.shiro.env.Environment;
import org.apache.shiro.mgt.DefaultSecurityManager;
@@ -35,10 +34,13 @@ import org.apache.shiro.session.mgt.DefaultSessionManager;
import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.util.Destroyable;
-import javax.annotation.PreDestroy;
-import java.util.Collection;
-import java.util.Set;
-import java.util.WeakHashMap;
+import com.google.inject.Key;
+import com.google.inject.PrivateModule;
+import com.google.inject.TypeLiteral;
+import com.google.inject.binder.AnnotatedBindingBuilder;
+import com.google.inject.binder.LinkedBindingBuilder;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.util.Types;
/**
@@ -48,8 +50,7 @@ import java.util.WeakHashMap;
*/
public abstract class ShiroModule extends PrivateModule implements Destroyable {
- private Set<Destroyable> destroyables = Sets.newSetFromMap(new WeakHashMap<Destroyable, Boolean>());
-
+ private Set<Destroyable> destroyables = Collections.newSetFromMap(new WeakHashMap<Destroyable, Boolean>());
public void configure() {
this.binder().requireExplicitBindings();
// setup security manager
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/main/java/org/apache/shiro/guice/web/AbstractInjectionProvider.java
----------------------------------------------------------------------
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/web/AbstractInjectionProvider.java b/support/guice/src/main/java/org/apache/shiro/guice/web/AbstractInjectionProvider.java
index 8c8e564..5564448 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/web/AbstractInjectionProvider.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/web/AbstractInjectionProvider.java
@@ -18,7 +18,11 @@
*/
package org.apache.shiro.guice.web;
-import com.google.common.collect.ImmutableSet;
+import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -27,9 +31,6 @@ import com.google.inject.spi.Dependency;
import com.google.inject.spi.InjectionPoint;
import com.google.inject.spi.ProviderWithDependencies;
-import java.lang.reflect.Constructor;
-import java.util.Set;
-
class AbstractInjectionProvider<T> implements ProviderWithDependencies<T> {
private Key<T> key;
@@ -43,12 +44,12 @@ class AbstractInjectionProvider<T> implements ProviderWithDependencies<T> {
this.key = key;
constructorInjectionPoint = InjectionPoint.forConstructorOf(key.getTypeLiteral());
- ImmutableSet.Builder<Dependency<?>> dependencyBuilder = ImmutableSet.builder();
+ Set<Dependency<?>> dependencyBuilder = new HashSet<Dependency<?>>();
dependencyBuilder.addAll(constructorInjectionPoint.getDependencies());
for (InjectionPoint injectionPoint : InjectionPoint.forInstanceMethodsAndFields(key.getTypeLiteral())) {
dependencyBuilder.addAll(injectionPoint.getDependencies());
}
- this.dependencies = dependencyBuilder.build();
+ this.dependencies = Collections.unmodifiableSet(dependencyBuilder);
}
public T get() {
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/main/java/org/apache/shiro/guice/web/FilterChainResolverProvider.java
----------------------------------------------------------------------
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/web/FilterChainResolverProvider.java b/support/guice/src/main/java/org/apache/shiro/guice/web/FilterChainResolverProvider.java
index 474c263..4eb5b27 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/web/FilterChainResolverProvider.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/web/FilterChainResolverProvider.java
@@ -18,21 +18,24 @@
*/
package org.apache.shiro.guice.web;
-import com.google.common.collect.ImmutableSet;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.Filter;
+
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.Singleton;
import com.google.inject.spi.Dependency;
import com.google.inject.spi.ProviderWithDependencies;
+
import org.apache.shiro.util.AntPathMatcher;
import org.apache.shiro.util.PatternMatcher;
import org.apache.shiro.web.filter.mgt.FilterChainResolver;
-import javax.servlet.Filter;
-import java.util.Map;
-import java.util.Set;
-
@Singleton
class FilterChainResolverProvider implements ProviderWithDependencies<FilterChainResolver> {
@Inject
@@ -46,13 +49,13 @@ class FilterChainResolverProvider implements ProviderWithDependencies<FilterChai
public FilterChainResolverProvider(Map<String, Key<? extends Filter>[]> chains) {
this.chains = chains;
- ImmutableSet.Builder<Dependency<?>> dependenciesBuilder = ImmutableSet.builder();
+ Set<Dependency<?>> dependenciesBuilder = new HashSet<Dependency<?>>();
for (String chain : chains.keySet()) {
for (Key<? extends Filter> filterKey : chains.get(chain)) {
dependenciesBuilder.add(Dependency.get(filterKey));
}
}
- this.dependencies = dependenciesBuilder.build();
+ this.dependencies = Collections.unmodifiableSet(dependenciesBuilder);
}
@Inject(optional = true)
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
----------------------------------------------------------------------
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java b/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
index 1334320..316958e 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/web/ShiroWebModule.java
@@ -18,34 +18,43 @@
*/
package org.apache.shiro.guice.web;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
-import com.google.inject.Binder;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
-import com.google.inject.binder.AnnotatedBindingBuilder;
-import com.google.inject.name.Names;
-import com.google.inject.servlet.ServletModule;
-import org.apache.shiro.guice.ShiroModule;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.ServletContext;
+
import org.apache.shiro.config.ConfigurationException;
import org.apache.shiro.env.Environment;
+import org.apache.shiro.guice.ShiroModule;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.web.env.WebEnvironment;
import org.apache.shiro.web.filter.PathMatchingFilter;
-import org.apache.shiro.web.filter.authc.*;
-import org.apache.shiro.web.filter.authz.*;
+import org.apache.shiro.web.filter.authc.AnonymousFilter;
+import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
+import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
+import org.apache.shiro.web.filter.authc.LogoutFilter;
+import org.apache.shiro.web.filter.authc.UserFilter;
+import org.apache.shiro.web.filter.authz.HttpMethodPermissionFilter;
+import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;
+import org.apache.shiro.web.filter.authz.PortFilter;
+import org.apache.shiro.web.filter.authz.RolesAuthorizationFilter;
+import org.apache.shiro.web.filter.authz.SslFilter;
import org.apache.shiro.web.filter.mgt.FilterChainResolver;
import org.apache.shiro.web.filter.session.NoSessionCreationFilter;
import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.apache.shiro.web.mgt.WebSecurityManager;
import org.apache.shiro.web.session.mgt.ServletContainerSessionManager;
-import javax.servlet.Filter;
-import javax.servlet.ServletContext;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import com.google.inject.Binder;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
+import com.google.inject.binder.AnnotatedBindingBuilder;
+import com.google.inject.name.Names;
+import com.google.inject.servlet.ServletModule;
/**
* Sets up Shiro lifecycles within Guice, enables the injecting of Shiro objects, and binds a default
@@ -131,7 +140,7 @@ public abstract class ShiroWebModule extends ShiroModule {
}
private void setupFilterChainConfigs() {
- Table<Key<? extends PathMatchingFilter>, String, String> configs = HashBasedTable.create();
+ Map<Key<? extends PathMatchingFilter>, Map<String, String>> configs = new HashMap<Key<? extends PathMatchingFilter>, Map<String, String>>();
for (Map.Entry<String, Key<? extends Filter>[]> filterChain : filterChains.entrySet()) {
for (int i = 0; i < filterChain.getValue().length; i++) {
@@ -143,14 +152,16 @@ public abstract class ShiroWebModule extends ShiroModule {
if (!PathMatchingFilter.class.isAssignableFrom(key.getTypeLiteral().getRawType())) {
throw new ConfigurationException("Config information requires a PathMatchingFilter - can't apply to " + key.getTypeLiteral().getRawType());
}
- configs.put(castToPathMatching(key), filterChain.getKey(), configKey.getConfigValue());
+ if (configs.get(castToPathMatching(key)) == null) configs.put(castToPathMatching(key), new HashMap<String, String>());
+ configs.get(castToPathMatching(key)).put(filterChain.getKey(), configKey.getConfigValue());
} else if (PathMatchingFilter.class.isAssignableFrom(key.getTypeLiteral().getRawType())) {
- configs.put(castToPathMatching(key), filterChain.getKey(), "");
+ if (configs.get(castToPathMatching(key)) == null) configs.put(castToPathMatching(key), new HashMap<String, String>());
+ configs.get(castToPathMatching(key)).put(filterChain.getKey(), "");
}
}
}
- for (Key<? extends PathMatchingFilter> filterKey : configs.rowKeySet()) {
- bindPathMatchingFilter(filterKey, configs.row(filterKey));
+ for (Key<? extends PathMatchingFilter> filterKey : configs.keySet()) {
+ bindPathMatchingFilter(filterKey, configs.get(filterKey));
}
}
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/main/java/org/apache/shiro/guice/web/SimpleFilterChainResolver.java
----------------------------------------------------------------------
diff --git a/support/guice/src/main/java/org/apache/shiro/guice/web/SimpleFilterChainResolver.java b/support/guice/src/main/java/org/apache/shiro/guice/web/SimpleFilterChainResolver.java
index 526012c..e0d29c4 100644
--- a/support/guice/src/main/java/org/apache/shiro/guice/web/SimpleFilterChainResolver.java
+++ b/support/guice/src/main/java/org/apache/shiro/guice/web/SimpleFilterChainResolver.java
@@ -18,19 +18,21 @@
*/
package org.apache.shiro.guice.web;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterators;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import org.apache.shiro.util.PatternMatcher;
-import org.apache.shiro.web.filter.mgt.FilterChainResolver;
-import org.apache.shiro.web.util.WebUtils;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import java.util.Map;
+
+import com.google.inject.Injector;
+import com.google.inject.Key;
+
+import org.apache.shiro.util.PatternMatcher;
+import org.apache.shiro.web.filter.mgt.FilterChainResolver;
+import org.apache.shiro.web.util.WebUtils;
class SimpleFilterChainResolver implements FilterChainResolver {
private final Map<String, Key<? extends Filter>[]> chains;
@@ -47,12 +49,20 @@ class SimpleFilterChainResolver implements FilterChainResolver {
String path = WebUtils.getPathWithinApplication(WebUtils.toHttp(request));
for (final String pathPattern : chains.keySet()) {
if (patternMatcher.matches(pathPattern, path)) {
- return new SimpleFilterChain(originalChain, Iterators.transform(Iterators.forArray(chains.get(pathPattern)),
- new Function<Key<? extends Filter>, Filter>() {
- public Filter apply(Key<? extends Filter> input) {
- return injector.getInstance(input);
- }
- }));
+ final Iterator<Key<? extends Filter>> chain = Arrays.asList(chains.get(pathPattern)).iterator();
+ return new SimpleFilterChain(originalChain, new Iterator<Filter>() {
+ public boolean hasNext() {
+ return chain.hasNext();
+ }
+
+ public Filter next() {
+ return injector.getInstance(chain.next());
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ });
}
}
return null;
http://git-wip-us.apache.org/repos/asf/shiro/blob/fba5bd4d/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainTest.java
----------------------------------------------------------------------
diff --git a/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainTest.java b/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainTest.java
index 5938550..77bea50 100644
--- a/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainTest.java
+++ b/support/guice/src/test/java/org/apache/shiro/guice/web/SimpleFilterChainTest.java
@@ -18,17 +18,22 @@
*/
package org.apache.shiro.guice.web;
-import com.google.common.collect.Iterators;
-import org.easymock.Capture;
-import org.easymock.IMocksControl;
-import org.junit.Test;
+import java.util.Arrays;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import static org.easymock.EasyMock.*;
+import org.easymock.Capture;
+import org.easymock.IMocksControl;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.and;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createStrictControl;
+import static org.easymock.EasyMock.same;
public class SimpleFilterChainTest {
@Test
@@ -50,7 +55,7 @@ public class SimpleFilterChainTest {
ctrl.replay();
- SimpleFilterChain underTest = new SimpleFilterChain(originalChain, Iterators.forArray(filter1, filter2));
+ SimpleFilterChain underTest = new SimpleFilterChain(originalChain, Arrays.asList(filter1, filter2).iterator());
// all we actually care about is that, if we keep calling the filter chain, everything is called in the right
// order - we don't care what fc actually contains
[4/6] shiro git commit: Removing log spam when no cache manager is
enabled.
Posted by bd...@apache.org.
Removing log spam when no cache manager is enabled.
Previously when the cache manager was not configured, the log would be spammed with:
"No cache or cacheManager properties have been set. Authorization cache cannot be obtained. "
Fixes: SHIRO-428
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/73fb9737
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/73fb9737
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/73fb9737
Branch: refs/heads/master
Commit: 73fb97373ff0f32604e70fc4037df8cb22eb3462
Parents: f47ced3
Author: Brian Demers <bd...@stormpath.com>
Authored: Tue Jun 21 11:46:09 2016 -0700
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:58:37 2016 -0700
----------------------------------------------------------------------
core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/73fb9737/core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java b/core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java
index 594644e..7891527 100644
--- a/core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java
+++ b/core/src/main/java/org/apache/shiro/realm/AuthorizingRealm.java
@@ -244,8 +244,8 @@ public abstract class AuthorizingRealm extends AuthenticatingRealm
}
this.authorizationCache = cacheManager.getCache(cacheName);
} else {
- if (log.isInfoEnabled()) {
- log.info("No cache or cacheManager properties have been set. Authorization cache cannot " +
+ if (log.isDebugEnabled()) {
+ log.debug("No cache or cacheManager properties have been set. Authorization cache cannot " +
"be obtained.");
}
}
[3/6] shiro git commit: Add java 1.8 to JavaEnvironment
Posted by bd...@apache.org.
Add java 1.8 to JavaEnvironment
Without this the java version is detected as 1.3.
Fixes: SHIRO-545
Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/23afbb69
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/23afbb69
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/23afbb69
Branch: refs/heads/master
Commit: 23afbb69048ca1128d57765d2f58dcfda72657be
Parents: fba5bd4
Author: Brian Demers <bd...@stormpath.com>
Authored: Tue Jun 21 09:48:45 2016 -0700
Committer: Brian Demers <bd...@stormpath.com>
Committed: Tue Jun 28 14:58:37 2016 -0700
----------------------------------------------------------------------
.../org/apache/shiro/util/JavaEnvironment.java | 23 ++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/23afbb69/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java b/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
index 455d168..1dcb79b 100644
--- a/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
+++ b/core/src/main/java/org/apache/shiro/util/JavaEnvironment.java
@@ -59,6 +59,11 @@ public abstract class JavaEnvironment {
*/
public static final int JAVA_17 = 4;
+ /**
+ * Constant identifying the 1.8 JVM.
+ */
+ public static final int JAVA_18 = 5;
+
/** The virtual machine version, i.e. <code>System.getProperty("java.version");</code>. */
private static final String version;
@@ -76,13 +81,19 @@ public abstract class JavaEnvironment {
static {
version = System.getProperty("java.version");
// version String should look like "1.4.2_10"
- if (version.indexOf("1.7.") != -1) {
+
+// NOTE: JDK 1.9 will be versioned differently '9' and/or 9.x.x
+// https://blogs.oracle.com/java-platform-group/entry/a_new_jdk_9_version
+
+ if (version.contains("1.8.")) {
+ majorVersion = JAVA_18;
+ } else if (version.contains("1.7.")) {
majorVersion = JAVA_17;
- } else if (version.indexOf("1.6.") != -1) {
+ } else if (version.contains("1.6.")) {
majorVersion = JAVA_16;
- } else if (version.indexOf("1.5.") != -1) {
+ } else if (version.contains("1.5.")) {
majorVersion = JAVA_15;
- } else if (version.indexOf("1.4.") != -1) {
+ } else if (version.contains("1.4.")) {
majorVersion = JAVA_14;
} else {
// else leave 1.3 as default (it's either 1.3 or unknown)
@@ -112,6 +123,7 @@ public abstract class JavaEnvironment {
* @see #JAVA_15
* @see #JAVA_16
* @see #JAVA_17
+ * @see #JAVA_18
*/
public static int getMajorVersion() {
return majorVersion;
@@ -126,6 +138,7 @@ public abstract class JavaEnvironment {
* @see #JAVA_15
* @see #JAVA_16
* @see #JAVA_17
+ * @see #JAVA_18
*/
public static boolean isAtLeastVersion14() {
return getMajorVersion() >= JAVA_14;
@@ -140,6 +153,7 @@ public abstract class JavaEnvironment {
* @see #JAVA_15
* @see #JAVA_16
* @see #JAVA_17
+ * @see #JAVA_18
*/
public static boolean isAtLeastVersion15() {
return getMajorVersion() >= JAVA_15;
@@ -154,6 +168,7 @@ public abstract class JavaEnvironment {
* @see #JAVA_15
* @see #JAVA_16
* @see #JAVA_17
+ * @see #JAVA_18
*
* @since 1.2
*/