Skip to content

The Unified and Autonomous Development Platform

Upgrade shiro to 1.4.0 to fix remember me security issue

dustin lee426bddba99e6
diff --git a/core/pom.xml b/core/pom.xml
index fbb009a2b5..5194f7265c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -269,7 +269,7 @@
<properties>
<moduleClass>com.gitplex.server.CoreModule</moduleClass>
<hibernate.version>5.2.10.Final</hibernate.version>
- <shiro.version>1.2.2</shiro.version>
+ <shiro.version>1.4.0</shiro.version>
<jgit.version>4.7.0.201704051617-r</jgit.version>
<flexmark.version>0.18.3</flexmark.version>
</properties>
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.java
index a8f0e5c525..5d1d3ba59f 100644
--- a/core/src/main/java/com/gitplex/server/CoreModule.java
+++ b/core/src/main/java/com/gitplex/server/CoreModule.java
@@ -19,7 +19,8 @@ import javax.validation.ValidatorFactory;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.shiro.guice.aop.ShiroAopModule;
-import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.mgt.RememberMeManager;
+import org.apache.shiro.realm.Realm;
import org.apache.shiro.web.filter.mgt.FilterChainManager;
import org.apache.shiro.web.filter.mgt.FilterChainResolver;
import org.apache.shiro.web.mgt.WebSecurityManager;
@@ -136,11 +137,12 @@ import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.DefaultDao;
import com.gitplex.server.security.BasicAuthenticationFilter;
-import com.gitplex.server.security.DefaultFilterChainResolver;
-import com.gitplex.server.security.DefaultPasswordService;
-import com.gitplex.server.security.DefaultWebSecurityManager;
-import com.gitplex.server.security.FilterChainConfigurator;
import com.gitplex.server.security.GitPlexAuthorizingRealm;
+import com.gitplex.server.security.GitPlexFilterChainResolver;
+import com.gitplex.server.security.GitPlexPasswordService;
+import com.gitplex.server.security.GitPlexRememberMeManager;
+import com.gitplex.server.security.GitPlexWebSecurityManager;
+import com.gitplex.server.security.FilterChainConfigurator;
import com.gitplex.server.security.authenticator.Authenticator;
import com.gitplex.server.util.jackson.ObjectMapperConfigurator;
import com.gitplex.server.util.jackson.ObjectMapperProvider;
@@ -241,11 +243,12 @@ public class CoreModule extends AbstractPluginModule {
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
- bind(AuthorizingRealm.class).to(GitPlexAuthorizingRealm.class);
- bind(WebSecurityManager.class).to(DefaultWebSecurityManager.class);
- bind(FilterChainResolver.class).to(DefaultFilterChainResolver.class);
+ bind(Realm.class).to(GitPlexAuthorizingRealm.class);
+ bind(RememberMeManager.class).to(GitPlexRememberMeManager.class);
+ bind(WebSecurityManager.class).to(GitPlexWebSecurityManager.class);
+ bind(FilterChainResolver.class).to(GitPlexFilterChainResolver.class);
bind(BasicAuthenticationFilter.class);
- bind(PasswordService.class).to(DefaultPasswordService.class);
+ bind(PasswordService.class).to(GitPlexPasswordService.class);
bind(ShiroFilter.class);
install(new ShiroAopModule());
contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {
diff --git a/core/src/main/java/com/gitplex/server/security/DefaultFilterChainResolver.java b/core/src/main/java/com/gitplex/server/security/GitPlexFilterChainResolver.java
similarity index 88%
rename from core/src/main/java/com/gitplex/server/security/DefaultFilterChainResolver.java
rename to core/src/main/java/com/gitplex/server/security/GitPlexFilterChainResolver.java
index 83b88d31f2..edd96542f7 100644
--- a/core/src/main/java/com/gitplex/server/security/DefaultFilterChainResolver.java
+++ b/core/src/main/java/com/gitplex/server/security/GitPlexFilterChainResolver.java
@@ -9,10 +9,10 @@ import org.apache.shiro.web.filter.mgt.FilterChainManager;
import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver;
@Singleton
-public class DefaultFilterChainResolver extends PathMatchingFilterChainResolver {
+public class GitPlexFilterChainResolver extends PathMatchingFilterChainResolver {
@Inject
- public DefaultFilterChainResolver(
+ public GitPlexFilterChainResolver(
Set<FilterChainConfigurator> filterChainConfigurators,
BasicAuthenticationFilter basicAuthenticationFilter) {
diff --git a/core/src/main/java/com/gitplex/server/security/DefaultPasswordService.java b/core/src/main/java/com/gitplex/server/security/GitPlexPasswordService.java
similarity index 92%
rename from core/src/main/java/com/gitplex/server/security/DefaultPasswordService.java
rename to core/src/main/java/com/gitplex/server/security/GitPlexPasswordService.java
index afd4b58ca4..b03b553683 100644
--- a/core/src/main/java/com/gitplex/server/security/DefaultPasswordService.java
+++ b/core/src/main/java/com/gitplex/server/security/GitPlexPasswordService.java
@@ -8,7 +8,7 @@ import com.gitplex.utils.StringUtils;
import com.pmease.security.shiro.bcrypt.BCryptPasswordService;
@Singleton
-public class DefaultPasswordService implements PasswordService {
+public class GitPlexPasswordService implements PasswordService {
private final PasswordService bcryptPasswordService = new BCryptPasswordService();
diff --git a/core/src/main/java/com/gitplex/server/security/GitPlexRememberMeManager.java b/core/src/main/java/com/gitplex/server/security/GitPlexRememberMeManager.java
new file mode 100644
index 0000000000..4e2158460c
--- /dev/null
+++ b/core/src/main/java/com/gitplex/server/security/GitPlexRememberMeManager.java
@@ -0,0 +1,35 @@
+package com.gitplex.server.security;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.shiro.web.mgt.CookieRememberMeManager;
+
+import com.gitplex.server.manager.UserManager;
+
+@Singleton
+public class GitPlexRememberMeManager extends CookieRememberMeManager {
+
+ private final UserManager userManager;
+
+ @Inject
+ public GitPlexRememberMeManager(UserManager userManager) {
+ this.userManager = userManager;
+ }
+
+ @Override
+ protected PrincipalCollection deserialize(byte[] serializedIdentity) {
+ PrincipalCollection principals = super.deserialize(serializedIdentity);
+ if (principals != null) {
+ Long userId = (Long) principals.getPrimaryPrincipal();
+ if (userManager.get(userId) != null)
+ return principals;
+ else
+ return null;
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/core/src/main/java/com/gitplex/server/security/DefaultWebEnvironment.java b/core/src/main/java/com/gitplex/server/security/GitPlexWebEnvironment.java
similarity index 51%
rename from core/src/main/java/com/gitplex/server/security/DefaultWebEnvironment.java
rename to core/src/main/java/com/gitplex/server/security/GitPlexWebEnvironment.java
index 9fc04dc741..17e40bc607 100644
--- a/core/src/main/java/com/gitplex/server/security/DefaultWebEnvironment.java
+++ b/core/src/main/java/com/gitplex/server/security/GitPlexWebEnvironment.java
@@ -3,18 +3,18 @@ package com.gitplex.server.security;
import org.apache.shiro.ShiroException;
import org.apache.shiro.util.Destroyable;
import org.apache.shiro.util.Initializable;
+import org.apache.shiro.web.env.DefaultWebEnvironment;
import org.apache.shiro.web.filter.mgt.FilterChainResolver;
import org.apache.shiro.web.mgt.WebSecurityManager;
-import com.gitplex.launcher.loader.AppLoader;
+import com.gitplex.server.GitPlex;
-public class DefaultWebEnvironment extends org.apache.shiro.web.env.DefaultWebEnvironment
- implements Initializable, Destroyable {
+public class GitPlexWebEnvironment extends DefaultWebEnvironment implements Initializable, Destroyable {
@Override
public void init() throws ShiroException {
- setWebSecurityManager(AppLoader.getInstance(WebSecurityManager.class));
- setFilterChainResolver(AppLoader.getInstance(FilterChainResolver.class));
+ setWebSecurityManager(GitPlex.getInstance(WebSecurityManager.class));
+ setFilterChainResolver(GitPlex.getInstance(FilterChainResolver.class));
}
}
diff --git a/core/src/main/java/com/gitplex/server/security/DefaultWebSecurityManager.java b/core/src/main/java/com/gitplex/server/security/GitPlexWebSecurityManager.java
similarity index 90%
rename from core/src/main/java/com/gitplex/server/security/DefaultWebSecurityManager.java
rename to core/src/main/java/com/gitplex/server/security/GitPlexWebSecurityManager.java
index 2f0480e03f..a71087e372 100644
--- a/core/src/main/java/com/gitplex/server/security/DefaultWebSecurityManager.java
+++ b/core/src/main/java/com/gitplex/server/security/GitPlexWebSecurityManager.java
@@ -5,8 +5,9 @@ import javax.inject.Singleton;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import org.apache.shiro.mgt.RememberMeManager;
import org.apache.shiro.mgt.SecurityManager;
-import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.realm.Realm;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection;
@@ -16,13 +17,11 @@ import org.apache.shiro.web.mgt.DefaultWebSubjectFactory;
import org.apache.shiro.web.subject.WebSubjectContext;
import org.apache.shiro.web.subject.support.WebDelegatingSubject;
-import com.gitplex.launcher.loader.PluginManager;
-
@Singleton
-public class DefaultWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager {
+public class GitPlexWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager {
@Inject
- public DefaultWebSecurityManager(PluginManager pluginManager, AuthorizingRealm authorizingRealm) {
+ public GitPlexWebSecurityManager(Realm realm, RememberMeManager rememberMeManager) {
setSubjectFactory(new DefaultWebSubjectFactory() {
@@ -68,7 +67,8 @@ public class DefaultWebSecurityManager extends org.apache.shiro.web.mgt.DefaultW
});
- setRealm(authorizingRealm);
+ setRealm(realm);
+ setRememberMeManager(rememberMeManager);
}
/**
diff --git a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
index e8a12c1d00..7b616eeb8b 100644
--- a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
+++ b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java
@@ -20,7 +20,7 @@ import com.gitplex.launcher.bootstrap.Bootstrap;
import com.gitplex.server.git.GitFilter;
import com.gitplex.server.git.GitPostReceiveCallback;
import com.gitplex.server.git.GitPreReceiveCallback;
-import com.gitplex.server.security.DefaultWebEnvironment;
+import com.gitplex.server.security.GitPlexWebEnvironment;
import com.gitplex.server.util.jetty.ClasspathAssetServlet;
import com.gitplex.server.util.jetty.FileAssetServlet;
import com.gitplex.server.util.jetty.ServletConfigurator;
@@ -67,7 +67,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.getSessionHandler().getSessionManager().setMaxInactiveInterval(serverConfig.getSessionTimeout());
- context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, DefaultWebEnvironment.class.getName());
+ context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, GitPlexWebEnvironment.class.getName());
context.addEventListener(new EnvironmentLoaderListener());
FilterHolder shiroFilterHolder = new FilterHolder(shiroFilter);
context.addFilter(shiroFilterHolder, "/*", EnumSet.allOf(DispatcherType.class));