The Unified and Autonomous Development Platform
Remove HibernateFilter and apply SessionInView pattern case by case
robin shen04dbfbccdeb2
diff --git a/core/src/main/java/com/gitplex/server/git/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.javaindex bb6bd5d1ee..d6d4f8e188 100644--- a/core/src/main/java/com/gitplex/server/git/GitFilter.java+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java@@ -36,9 +36,11 @@ import com.gitplex.server.manager.ProjectManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.WorkExecutor;import com.gitplex.server.model.User;+import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.model.Project;import com.gitplex.server.util.concurrent.PrioritizedRunnable;+import com.gitplex.server.util.facade.ProjectFacade;import com.gitplex.server.util.serverconfig.ServerConfig;@Singleton@@ -78,7 +80,8 @@ public class GitFilter implements Filter {return StringUtils.stripStart(pathInfo, "/");}- private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)+ @Sessional+ protected ProjectFacade getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)throws IOException {projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");@@ -98,7 +101,7 @@ public class GitFilter implements Filter {throw new GitException(String.format("Unable to find project %s", projectName));}- return project;+ return project.getFacade();}private void doNotCache(HttpServletResponse response) {@@ -114,7 +117,7 @@ public class GitFilter implements Filter {String service = StringUtils.substringAfterLast(pathInfo, "/");String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");- Project project = getProject(request, response, projectInfo);+ ProjectFacade project = getProject(request, response, projectInfo);doNotCache(response);response.setHeader("Content-Type", "application/x-" + service + "-result");@@ -133,9 +136,8 @@ public class GitFilter implements Filter {File gitDir = storageManager.getProjectGitDir(project.getId());if (GitSmartHttpTools.isUploadPack(request)) {- if (!SecurityUtils.canRead(project)) {+ if (!SecurityUtils.canRead(project))throw new UnauthorizedException("You do not have permission to pull from this project.");- }workExecutor.submit(new PrioritizedRunnable(PRIORITY) {@Override@@ -188,15 +190,14 @@ public class GitFilter implements Filter {pathInfo = StringUtils.stripStart(pathInfo, "/");String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());- Project project = getProject(request, response, projectInfo);+ ProjectFacade project = getProject(request, response, projectInfo);String service = request.getParameter("service");File gitDir = storageManager.getProjectGitDir(project.getId());if (service.contains("upload")) {- if (!SecurityUtils.canRead(project)) {+ if (!SecurityUtils.canRead(project))throw new UnauthorizedException("You do not have permission to pull from this project.");- }writeInitial(response, service);new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();} else {diff --git a/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java b/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.javaindex 28a88d81d2..11edb976fd 100644--- a/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java+++ b/core/src/main/java/com/gitplex/server/persistence/DefaultUnitOfWork.java@@ -9,6 +9,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.gitplex.server.util.ObjectReference;+import com.google.common.base.Throwables;import com.google.inject.Inject;import com.google.inject.Singleton;@@ -70,13 +71,21 @@ public class DefaultUnitOfWork implements UnitOfWork {@Overridepublic <T> T call(Callable<T> callable) {- begin();- try {- return callable.call();- } catch (Exception e) {- throw new RuntimeException(e);- } finally {- end();+ if (persistManager.getSessionFactory() != null) {+ begin();+ try {+ return callable.call();+ } catch (Exception e) {+ throw Throwables.propagate(e);+ } finally {+ end();+ }+ } else {+ try {+ return callable.call();+ } catch (Exception e) {+ throw Throwables.propagate(e);+ }}}@@ -86,13 +95,21 @@ public class DefaultUnitOfWork implements UnitOfWork {@Overridepublic void run() {- begin();- try {- runnable.run();- } catch (Exception e) {- logger.error("Error executing within unit of work.", e);- } finally {- end();+ if (persistManager.getSessionFactory() != null) {+ begin();+ try {+ runnable.run();+ } catch (Exception e) {+ logger.error("Error executing within unit of work.", e);+ } finally {+ end();+ }+ } else {+ try {+ runnable.run();+ } catch (Exception e) {+ logger.error("Error executing within unit of work.", e);+ }}}@@ -101,11 +118,15 @@ public class DefaultUnitOfWork implements UnitOfWork {@Overridepublic void run(Runnable runnable) {- begin();- try {+ if (persistManager.getSessionFactory() != null) {+ begin();+ try {+ runnable.run();+ } finally {+ end();+ }+ } else {runnable.run();- } finally {- end();}}diff --git a/core/src/main/java/com/gitplex/server/persistence/HibernateFilter.java b/core/src/main/java/com/gitplex/server/persistence/HibernateFilter.javadeleted file mode 100644index 9b725f0a91..0000000000--- a/core/src/main/java/com/gitplex/server/persistence/HibernateFilter.java+++ /dev/null@@ -1,48 +0,0 @@-package com.gitplex.server.persistence;--import java.io.IOException;--import javax.servlet.Filter;-import javax.servlet.FilterChain;-import javax.servlet.FilterConfig;-import javax.servlet.ServletException;-import javax.servlet.ServletRequest;-import javax.servlet.ServletResponse;--import com.google.inject.Inject;-import com.google.inject.Singleton;--@Singleton-public class HibernateFilter implements Filter {-- private final UnitOfWork unitOfWork;-- private final PersistManager persistManager;-- @Inject- public HibernateFilter(UnitOfWork unitOfWork, PersistManager persistManager) {- this.unitOfWork = unitOfWork;- this.persistManager = persistManager;- }-- public void destroy() {- }-- public void doFilter(ServletRequest request, ServletResponse response,- FilterChain chain) throws IOException, ServletException {- if (persistManager.getSessionFactory() != null) {- unitOfWork.begin();- try {- chain.doFilter(request, response);- } finally {- unitOfWork.end();- }- } else {- chain.doFilter(request, response);- }- }-- public void init(FilterConfig config) throws ServletException {- }--}diff --git a/core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.java b/core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.javaindex 3a12d61039..e64ab5ea64 100644--- a/core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.java+++ b/core/src/main/java/com/gitplex/server/persistence/SessionInterceptor.java@@ -7,15 +7,22 @@ import com.google.inject.Inject;public class SessionInterceptor implements MethodInterceptor {+ @Inject+ private PersistManager persistManager;+@Injectprivate UnitOfWork unitOfWork;public Object invoke(MethodInvocation mi) throws Throwable {- unitOfWork.begin();- try {+ if (persistManager.getSessionFactory() != null) {+ unitOfWork.begin();+ try {+ return mi.proceed();+ } finally {+ unitOfWork.end();+ }+ } else {return mi.proceed();- } finally {- unitOfWork.end();}}diff --git a/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java b/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.javaindex f8fe2b0a0c..559d046ba1 100644--- a/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java+++ b/core/src/main/java/com/gitplex/server/persistence/TransactionInterceptor.java@@ -11,36 +11,43 @@ import com.google.inject.Inject;public class TransactionInterceptor implements MethodInterceptor {+ @Inject+ private PersistManager persistManager;+@Injectprivate UnitOfWork unitOfWork;public Object invoke(MethodInvocation mi) throws Throwable {- unitOfWork.begin();- try {- Session session = unitOfWork.getSession();- if (session.getTransaction().getStatus() == TransactionStatus.ACTIVE) {- return mi.proceed();- } else {- Transaction tx = session.beginTransaction();- FlushMode previousMode = session.getFlushMode();- session.setFlushMode(FlushMode.COMMIT);- try {- Object result = mi.proceed();- tx.commit();- return result;- } catch (Throwable t) {+ if (persistManager.getSessionFactory() != null) {+ unitOfWork.begin();+ try {+ Session session = unitOfWork.getSession();+ if (session.getTransaction().getStatus() == TransactionStatus.ACTIVE) {+ return mi.proceed();+ } else {+ Transaction tx = session.beginTransaction();+ FlushMode previousMode = session.getFlushMode();+ session.setFlushMode(FlushMode.COMMIT);try {- tx.rollback();- } catch (Throwable t2) {+ Object result = mi.proceed();+ tx.commit();+ return result;+ } catch (Throwable t) {+ try {+ tx.rollback();+ } catch (Throwable t2) {+ }+ throw t;+ } finally {+ session.setFlushMode(previousMode);}- throw t;- } finally {- session.setFlushMode(previousMode);}++ } finally {+ unitOfWork.end();}-- } finally {- unitOfWork.end();+ } else {+ return mi.proceed();}}diff --git a/core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.java b/core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.javaindex a2b0b80682..b13668e187 100644--- a/core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.java+++ b/core/src/main/java/com/gitplex/server/security/GitPlexAuthorizingRealm.java@@ -30,6 +30,7 @@ import com.gitplex.server.manager.UserManager;import com.gitplex.server.model.Group;import com.gitplex.server.model.Membership;import com.gitplex.server.model.User;+import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.security.authenticator.Authenticated;import com.gitplex.server.security.authenticator.Authenticator;@@ -75,13 +76,54 @@ public class GitPlexAuthorizingRealm extends AuthorizingRealm {this.groupManager = groupManager;}- @SuppressWarnings("serial")+ @Sessional+ protected Collection<Permission> getObjectPermissionsInSession(Long userId) {+ Collection<Permission> permissions = new ArrayList<>();++ UserFacade user = null;+ if (userId != 0L)+ user = cacheManager.getUser(userId);+ if (user != null) {+ permissions.add(new PublicPermission());+ if (user.isRoot())+ permissions.add(new SystemAdministration());+ permissions.add(new UserAdministration(user));+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {+ if (membership.getUserId().equals(userId)) {+ GroupFacade group = cacheManager.getGroup(membership.getGroupId());+ if (group.isAdministrator())+ permissions.add(new SystemAdministration());+ if (group.isCanCreateProjects())+ permissions.add(new CreateProjects());+ for (GroupAuthorizationFacade authorization:+ cacheManager.getGroupAuthorizations().values()) {+ if (authorization.getGroupId().equals(group.getId())) {+ permissions.add(new ProjectPermission(+ cacheManager.getProject(authorization.getProjectId()),+ authorization.getPrivilege()));+ }+ }+ }+ }+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {+ if (authorization.getUserId().equals(userId)) {+ permissions.add(new ProjectPermission(+ cacheManager.getProject(authorization.getProjectId()),+ authorization.getPrivilege()));+ }+ }+ } else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {+ permissions.add(new PublicPermission());+ }+ return permissions;+ }+@Overrideprotected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {- Long userId = (Long) principals.getPrimaryPrincipal();-return new AuthorizationInfo() {+ private static final long serialVersionUID = 1L;+@Overridepublic Collection<String> getStringPermissions() {return new HashSet<>();@@ -94,51 +136,13 @@ public class GitPlexAuthorizingRealm extends AuthorizingRealm {@Overridepublic Collection<Permission> getObjectPermissions() {- Collection<Permission> permissions = new ArrayList<>();-- UserFacade user = null;- if (userId != 0L)- user = cacheManager.getUser(userId);- if (user != null) {- permissions.add(new PublicPermission());- if (user.isRoot())- permissions.add(new SystemAdministration());- permissions.add(new UserAdministration(user));- for (MembershipFacade membership: cacheManager.getMemberships().values()) {- if (membership.getUserId().equals(userId)) {- GroupFacade group = cacheManager.getGroup(membership.getGroupId());- if (group.isAdministrator())- permissions.add(new SystemAdministration());- if (group.isCanCreateProjects())- permissions.add(new CreateProjects());- for (GroupAuthorizationFacade authorization:- cacheManager.getGroupAuthorizations().values()) {- if (authorization.getGroupId().equals(group.getId())) {- permissions.add(new ProjectPermission(- cacheManager.getProject(authorization.getProjectId()),- authorization.getPrivilege()));- }- }- }- }- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {- if (authorization.getUserId().equals(userId)) {- permissions.add(new ProjectPermission(- cacheManager.getProject(authorization.getProjectId()),- authorization.getPrivilege()));- }- }- } else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {- permissions.add(new PublicPermission());- }- return permissions;+ return getObjectPermissionsInSession((Long) principals.getPrimaryPrincipal());}};}@Transactional- @Override- protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)+ protected AuthenticationInfo doGetAuthenticationInfoInTransaction(AuthenticationToken token)throws AuthenticationException {User user = userManager.findByName(((UsernamePasswordToken) token).getUsername());if (user != null && user.isRoot())@@ -224,7 +228,14 @@ public class GitPlexAuthorizingRealm extends AuthorizingRealm {}}- return user;+ return user;+ }++ @Override+ protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)+ throws AuthenticationException {+ // transaction annotation can not be applied to final method, so we relay to another method+ return doGetAuthenticationInfoInTransaction(token);}}diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.javaindex bf9232a9d5..2e205b1204 100644--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java@@ -177,7 +177,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canManage(User user) {- return getSubject().isPermitted(new UserAdministration(user.getFacade()));+ return canManage(user.getFacade());+ }++ public static boolean canManage(UserFacade user) {+ return getSubject().isPermitted(new UserAdministration(user));}public static boolean canCreateProjects() {@@ -189,15 +193,27 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}public static boolean canRead(Project project) {- return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.READ));+ return canRead(project.getFacade());+ }++ public static boolean canRead(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.READ));}public static boolean canWrite(Project project) {- return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.WRITE));+ return canWrite(project.getFacade());}+ public static boolean canWrite(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.WRITE));+ }+public static boolean canManage(Project project) {- return getSubject().isPermitted(new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN));+ return canManage(project.getFacade());+ }++ public static boolean canManage(ProjectFacade project) {+ return getSubject().isPermitted(new ProjectPermission(project, ProjectPrivilege.ADMIN));}public static boolean isAdministrator() {diff --git a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.javaindex 3f230eec6a..73c2e2d5cd 100644--- a/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java+++ b/product/src/main/java/com/gitplex/server/product/ProductServletConfigurator.java@@ -14,12 +14,12 @@ import org.apache.wicket.protocol.http.WicketServlet;import org.eclipse.jetty.servlet.FilterHolder;import org.eclipse.jetty.servlet.ServletContextHandler;import org.eclipse.jetty.servlet.ServletHolder;+import org.glassfish.jersey.servlet.ServletContainer;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.persistence.HibernateFilter;import com.gitplex.server.security.DefaultWebEnvironment;import com.gitplex.server.util.jetty.ClasspathAssetServlet;import com.gitplex.server.util.jetty.FileAssetServlet;@@ -33,8 +33,6 @@ public class ProductServletConfigurator implements ServletConfigurator {private final ServerConfig serverConfig;- private final HibernateFilter hibernateFilter;-private final ShiroFilter shiroFilter;private final GitFilter gitFilter;@@ -44,22 +42,23 @@ public class ProductServletConfigurator implements ServletConfigurator {private final GitPostReceiveCallback postReceiveServlet;private final WicketServlet wicketServlet;++ private final ServletContainer jerseyServlet;private final WebSocketManager webSocketManager;@Inject- public ProductServletConfigurator(ServerConfig serverConfig, HibernateFilter hibernateFilter,- ShiroFilter shiroFilter, GitFilter gitFilter, GitPreReceiveCallback preReceiveServlet,- GitPostReceiveCallback postReceiveServlet, WicketServlet wicketServlet,- WebSocketManager webSocketManager) {+ public ProductServletConfigurator(ServerConfig serverConfig, ShiroFilter shiroFilter, GitFilter gitFilter,+ GitPreReceiveCallback preReceiveServlet, GitPostReceiveCallback postReceiveServlet,+ WicketServlet wicketServlet, WebSocketManager webSocketManager, ServletContainer jerseyServlet) {this.serverConfig = serverConfig;- this.hibernateFilter = hibernateFilter;this.shiroFilter = shiroFilter;this.gitFilter = gitFilter;this.preReceiveServlet = preReceiveServlet;this.postReceiveServlet = postReceiveServlet;this.wicketServlet = wicketServlet;this.webSocketManager = webSocketManager;+ this.jerseyServlet = jerseyServlet;}@Override@@ -68,9 +67,6 @@ public class ProductServletConfigurator implements ServletConfigurator {context.getSessionHandler().getSessionManager().setMaxInactiveInterval(serverConfig.getSessionTimeout());- FilterHolder hibernateFilterHolder = new FilterHolder(hibernateFilter);- context.addFilter(hibernateFilterHolder, "/*", EnumSet.of(DispatcherType.REQUEST));-context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, DefaultWebEnvironment.class.getName());context.addEventListener(new EnvironmentLoaderListener());FilterHolder shiroFilterHolder = new FilterHolder(shiroFilter);@@ -119,6 +115,9 @@ public class ProductServletConfigurator implements ServletConfigurator {ServletHolder fileServletHolder = new ServletHolder(new FileAssetServlet(Bootstrap.getSiteDir()));context.addServlet(fileServletHolder, "/site/*");context.addServlet(fileServletHolder, "/robots.txt");++ ServletHolder jerseyServletHolder = new ServletHolder(jerseyServlet);+ context.addServlet(jerseyServletHolder, "/rest/*");}}diff --git a/rest/src/main/java/com/gitplex/server/rest/RestModule.java b/rest/src/main/java/com/gitplex/server/rest/RestModule.javaindex b9d96224a2..7031b14006 100644--- a/rest/src/main/java/com/gitplex/server/rest/RestModule.java+++ b/rest/src/main/java/com/gitplex/server/rest/RestModule.java@@ -4,13 +4,13 @@ import javax.inject.Singleton;import org.apache.shiro.web.filter.mgt.FilterChainManager;import org.glassfish.jersey.server.ResourceConfig;+import org.glassfish.jersey.servlet.ServletContainer;import com.gitplex.launcher.loader.AbstractPluginModule;import com.gitplex.server.rest.jersey.JerseyConfigurator;-import com.gitplex.server.rest.jersey.JerseyServletConfigurator;import com.gitplex.server.rest.jersey.ResourceConfigProvider;+import com.gitplex.server.rest.jersey.DefaultServletContainer;import com.gitplex.server.security.FilterChainConfigurator;-import com.gitplex.server.util.jetty.ServletConfigurator;/*** NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.@@ -23,9 +23,8 @@ public class RestModule extends AbstractPluginModule {super.configure();bind(ResourceConfig.class).toProvider(ResourceConfigProvider.class).in(Singleton.class);+ bind(ServletContainer.class).to(DefaultServletContainer.class);- contribute(ServletConfigurator.class, JerseyServletConfigurator.class);-contribute(FilterChainConfigurator.class, new FilterChainConfigurator() {@Overridediff --git a/rest/src/main/java/com/gitplex/server/rest/jersey/DefaultServletContainer.java b/rest/src/main/java/com/gitplex/server/rest/jersey/DefaultServletContainer.javanew file mode 100644index 0000000000..c0e79c7cb7--- /dev/null+++ b/rest/src/main/java/com/gitplex/server/rest/jersey/DefaultServletContainer.java@@ -0,0 +1,31 @@+package com.gitplex.server.rest.jersey;++import java.io.IOException;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.servlet.ServletException;+import javax.servlet.ServletRequest;+import javax.servlet.ServletResponse;++import org.glassfish.jersey.server.ResourceConfig;+import org.glassfish.jersey.servlet.ServletContainer;++import com.gitplex.server.persistence.annotation.Sessional;++@SuppressWarnings("serial")+@Singleton+public class DefaultServletContainer extends ServletContainer {++ @Inject+ public DefaultServletContainer(ResourceConfig resourceConfig) {+ super(resourceConfig);+ }++ @Sessional+ @Override+ public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {+ super.service(req, res);+ }++}diff --git a/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyServletConfigurator.java b/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyServletConfigurator.javadeleted file mode 100644index 60bb5dcfeb..0000000000--- a/rest/src/main/java/com/gitplex/server/rest/jersey/JerseyServletConfigurator.java+++ /dev/null@@ -1,28 +0,0 @@-package com.gitplex.server.rest.jersey;--import javax.inject.Inject;--import org.eclipse.jetty.servlet.ServletContextHandler;-import org.eclipse.jetty.servlet.ServletHolder;-import org.glassfish.jersey.server.ResourceConfig;-import org.glassfish.jersey.servlet.ServletContainer;--import com.gitplex.server.util.jetty.ServletConfigurator;--public class JerseyServletConfigurator implements ServletConfigurator {-- private final ResourceConfig resourceConfig;-- @Inject- public JerseyServletConfigurator(ResourceConfig resourceConfig) {- this.resourceConfig = resourceConfig;- }-- @Override- public void configure(ServletContextHandler context) {- ServletHolder servletHolder = new ServletHolder(new ServletContainer(resourceConfig));-- context.addServlet(servletHolder, "/rest/*");- }--}diff --git a/web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.java b/web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.javaindex a0a6360325..edddd3f3f0 100644--- a/web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.java+++ b/web/src/main/java/com/gitplex/server/web/DefaultWicketServlet.java@@ -1,16 +1,23 @@package com.gitplex.server.web;+import java.io.IOException;+import javax.inject.Inject;+import javax.servlet.ServletException;+import javax.servlet.ServletRequest;+import javax.servlet.ServletResponse;import org.apache.wicket.protocol.http.WicketFilter;import org.apache.wicket.protocol.http.WicketServlet;+import com.gitplex.server.persistence.annotation.Sessional;+public class DefaultWicketServlet extends WicketServlet {private static final long serialVersionUID = 1L;private final WicketFilter wicketFilter;-+@Overridepublic String getServletName() {return getClass().getSimpleName();@@ -26,4 +33,10 @@ public class DefaultWicketServlet extends WicketServlet {return wicketFilter;}+ @Sessional+ @Override+ public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {+ super.service(req, res);+ }+}diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.htmlindex 6b05f6b5a5..795b443f3a 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html@@ -1,4 +1,3 @@<wicket:extend>- <a wicket:id="save">save</a>- <a wicket:id="load">load</a>+ <a wicket:id="test">test</a></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.javaindex 5e2ce2e605..f94bb06738 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java@@ -1,13 +1,7 @@package com.gitplex.server.web.page.test;-import java.io.File;-import org.apache.wicket.markup.html.link.Link;-import com.gitplex.server.GitPlex;-import com.gitplex.server.manager.ConfigManager;-import com.gitplex.server.migration.VersionedDocument;-import com.gitplex.server.security.authenticator.ldap.LdapAuthenticator;import com.gitplex.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -17,30 +11,10 @@ public class TestPage extends BasePage {protected void onInitialize() {super.onInitialize();- add(new Link<Void>("save") {-- @Override- public void onClick() {- LdapAuthenticator authenticator = new LdapAuthenticator();- authenticator.setManagerPassword("12345");- authenticator.setManagerDN("robin");- authenticator.setLdapUrl("ldaps://localhost:389");- authenticator.setUserSearchFilter("&(ab)");- VersionedDocument dom = VersionedDocument.fromBean(authenticator);- dom.writeToFile(new File("w:\\temp\\authenticator.xml"), true);- GitPlex.getInstance(ConfigManager.class).saveAuthenticator(authenticator);- }-- });-- add(new Link<Void>("load") {+ add(new Link<Void>("test") {@Overridepublic void onClick() {- VersionedDocument dom = VersionedDocument.fromFile(new File("w:\\temp\\authenticator.xml"));- System.out.println(dom.asXML());- LdapAuthenticator authenticator = (LdapAuthenticator) dom.toBean();- System.out.println(authenticator.getUserSearchFilter());}});diff --git a/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java b/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.javaindex bd29933240..cf9c9398eb 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/OldPasswordValidator.java@@ -17,7 +17,7 @@ public class OldPasswordValidator implements ConstraintValidator<OldPassword, Stif (value != null) {UserPage page = (UserPage) WicketUtils.getPage();PasswordService passwordService = AppLoader.getInstance(PasswordService.class);- if (!passwordService.passwordsMatch(value, (String) page.getUser().getCredentials())) {+ if (!passwordService.passwordsMatch(value, (String) page.getUser().getPassword())) {constraintContext.disableDefaultConstraintViolation();constraintContext.buildConstraintViolationWithTemplate("Old password does not match").addConstraintViolation();return false;