The Unified and Autonomous Development Platform
fix: Session not replaced upon login (OD-2626)
Robin Shenafb984e5de06
diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.javaindex bb95f7ee34..3512a26f64 100644--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java@@ -1,18 +1,17 @@package io.onedev.server.web;+import java.io.Serializable;import java.time.ZoneId;+import java.util.HashMap;+import java.util.HashSet;import java.util.Map;import java.util.Set;-import java.util.concurrent.ConcurrentHashMap;import javax.servlet.http.HttpSession;import org.apache.shiro.SecurityUtils;-import org.apache.shiro.authc.AuthenticationToken;-import org.apache.shiro.subject.Subject;import org.apache.wicket.protocol.http.WicketServlet;import org.apache.wicket.request.Request;-import org.apache.wicket.util.collections.ConcurrentHashSet;import org.jspecify.annotations.Nullable;import io.onedev.server.OneDev;@@ -23,27 +22,27 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {private static final long serialVersionUID = 1L;- private volatile Cursor issueCursor;-- private volatile Cursor buildCursor;-- private volatile Cursor packCursor;+ private static final String ATTR_ISSUE_CURSOR = "issueCursor";- private volatile Cursor pullRequestCursor;+ private static final String ATTR_BUILD_CURSOR = "buildCursor";- private volatile ZoneId zoneId;-- private Map<Class<?>, String> redirectUrlsAfterDelete = new ConcurrentHashMap<>();-- private Set<Long> expandedProjectIds = new ConcurrentHashSet<>();+ private static final String ATTR_PACK_CURSOR = "packCursor";++ private static final String ATTR_PULL_REQUEST_CURSOR = "pullRequestCursor";++ private static final String ATTR_ZONE_ID = "zoneId";++ private static final String ATTR_REDIRECT_URLS_AFTER_DELETE = "redirectUrlsAfterDelete";++ private static final String ATTR_EXPANDED_PROJECT_IDS = "expandedProjectIds";- private volatile boolean chatVisible;-- private volatile Long activeChatId;+ private static final String ATTR_CHAT_VISIBLE = "chatVisible";- private volatile Map<Long, Chat> anonymousChats = new ConcurrentHashMap<>();+ private static final String ATTR_ACTIVE_CHAT_ID = "activeChatId";- private volatile String chatInput;+ private static final String ATTR_ANONYMOUS_CHATS = "anonymousChats";++ private static final String ATTR_CHAT_INPUT = "chatInput";public WebSession(Request request) {super(request);@@ -52,109 +51,121 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {public static WebSession get() {return (WebSession) org.apache.wicket.protocol.http.WebSession.get();}-- public void login(AuthenticationToken token) {- Subject subject = SecurityUtils.getSubject();-- // Force a new session to prevent session fixation attack.- // We have to invalidate via both Shiro and Wicket; otherwise it doesn't- // work.- subject.getSession().stop();- replaceSession();-- subject.login(token);- }public void logout() {- SecurityUtils.getSubject().logout();+ SecurityUtils.getSubject().logout();replaceSession();}@Nullablepublic Cursor getIssueCursor() {- return issueCursor;+ return (Cursor) getAttribute(ATTR_ISSUE_CURSOR);}@Nullablepublic Cursor getBuildCursor() {- return buildCursor;+ return (Cursor) getAttribute(ATTR_BUILD_CURSOR);}+ @Nullablepublic Cursor getPackCursor() {- return packCursor;+ return (Cursor) getAttribute(ATTR_PACK_CURSOR);}@Nullablepublic Cursor getPullRequestCursor() {- return pullRequestCursor;+ return (Cursor) getAttribute(ATTR_PULL_REQUEST_CURSOR);}public void setIssueCursor(@Nullable Cursor issueCursor) {- this.issueCursor = issueCursor;+ setAttribute(ATTR_ISSUE_CURSOR, issueCursor);}public void setBuildCursor(@Nullable Cursor buildCursor) {- this.buildCursor = buildCursor;+ setAttribute(ATTR_BUILD_CURSOR, buildCursor);}public void setPackCursor(@Nullable Cursor packCursor) {- this.packCursor = packCursor;+ setAttribute(ATTR_PACK_CURSOR, packCursor);}public void setPullRequestCursor(@Nullable Cursor pullRequestCursor) {- this.pullRequestCursor = pullRequestCursor;+ setAttribute(ATTR_PULL_REQUEST_CURSOR, pullRequestCursor);+ }++ @SuppressWarnings("unchecked")+ private Map<Class<?>, String> getRedirectUrlsAfterDelete() {+ Map<Class<?>, String> map = (Map<Class<?>, String>) getAttribute(ATTR_REDIRECT_URLS_AFTER_DELETE);+ if (map == null) {+ map = new HashMap<>();+ setAttribute(ATTR_REDIRECT_URLS_AFTER_DELETE, (Serializable) map);+ }+ return map;}@Nullablepublic String getRedirectUrlAfterDelete(Class<?> clazz) {- return redirectUrlsAfterDelete.get(clazz);+ return getRedirectUrlsAfterDelete().get(clazz);}public void setRedirectUrlAfterDelete(Class<?> clazz, String redirectUrlAfterDelete) {- redirectUrlsAfterDelete.put(clazz, redirectUrlAfterDelete);+ getRedirectUrlsAfterDelete().put(clazz, redirectUrlAfterDelete);}+ @SuppressWarnings("unchecked")public Set<Long> getExpandedProjectIds() {- return expandedProjectIds;+ Set<Long> set = (Set<Long>) getAttribute(ATTR_EXPANDED_PROJECT_IDS);+ if (set == null) {+ set = new HashSet<>();+ setAttribute(ATTR_EXPANDED_PROJECT_IDS, (Serializable) set);+ }+ return set;}@Nullablepublic ZoneId getZoneId() {- return zoneId;+ return (ZoneId) getAttribute(ATTR_ZONE_ID);}public void setZoneId(@Nullable ZoneId zoneId) {- this.zoneId = zoneId;+ setAttribute(ATTR_ZONE_ID, zoneId);}public boolean isChatVisible() {- return chatVisible;+ Boolean visible = (Boolean) getAttribute(ATTR_CHAT_VISIBLE);+ return visible != null && visible;}public void setChatVisible(boolean chatVisible) {- this.chatVisible = chatVisible;+ setAttribute(ATTR_CHAT_VISIBLE, chatVisible);}@Nullablepublic Long getActiveChatId() {- return activeChatId;+ return (Long) getAttribute(ATTR_ACTIVE_CHAT_ID);}public void setActiveChatId(Long activeChatId) {- this.activeChatId = activeChatId;+ setAttribute(ATTR_ACTIVE_CHAT_ID, activeChatId);}+ @SuppressWarnings("unchecked")public Map<Long, Chat> getAnonymousChats() {- return anonymousChats;+ Map<Long, Chat> map = (Map<Long, Chat>) getAttribute(ATTR_ANONYMOUS_CHATS);+ if (map == null) {+ map = new HashMap<>();+ setAttribute(ATTR_ANONYMOUS_CHATS, (Serializable) map);+ }+ return map;}@Nullablepublic String getChatInput() {- return chatInput;+ return (String) getAttribute(ATTR_CHAT_INPUT);}public void setChatInput(String chatInput) {- this.chatInput = chatInput;+ setAttribute(ATTR_CHAT_INPUT, chatInput);}public static WebSession from(HttpSession session) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.javaindex 86f6bea14c..c0dbd00901 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java@@ -37,8 +37,9 @@ public abstract class UserDeleteLink extends Link<Void> {if (getUser().equals(SecurityUtils.getAuthUser())) {userService.delete(getUser());auditService.audit(null, "deleted account \"" + getUser().getName() + "\"", oldAuditContent, null);- WebSession.get().success("Account removed");- WebSession.get().logout();+ var session = WebSession.get();+ session.logout();+ session.success("Account removed");throw new RestartResponseException(getApplication().getHomePage());} else {userService.delete(getUser());diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.javaindex 7fe63124ec..592f810f7c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LoginPage.java@@ -32,13 +32,13 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.service.SettingService;-import io.onedev.server.service.SsoProviderService;-import io.onedev.server.service.UserService;import io.onedev.server.model.SsoProvider;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.realm.PasswordAuthenticatingRealm;+import io.onedev.server.service.SettingService;+import io.onedev.server.service.SsoProviderService;+import io.onedev.server.service.UserService;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.twofactorauthentication.TwoFactorAuthenticationSetupPanel;import io.onedev.server.web.page.simple.SimpleCssResourceReference;@@ -75,7 +75,10 @@ public class LoginPage extends SimplePage {@Overrideprotected void onInitialize() {super.onInitialize();-++ // replace session to avoid session fixation attack+ getSession().replaceSession();+Fragment fragment = new Fragment("content", "passwordCheckFrag", this);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.javaindex 99ad5397cc..84446e2880 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java@@ -12,8 +12,9 @@ public class LogoutPage extends BasePage {public LogoutPage(PageParameters params) {super(params);- WebSession.get().logout();- getSession().warn(_T("You've been logged out"));+ var session = WebSession.get();+ session.logout();+ session.warn(_T("You've been logged out"));throw new RestartResponseException(getApplication().getHomePage());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.javaindex 613afe1237..95eae550ee 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/SsoProcessPage.java@@ -201,7 +201,7 @@ public class SsoProcessPage extends SimplePage {}private void afterLogin(User user) {- String redirectUrlAfterLogin = (String) Session.get().getAttribute(SESSION_ATTR_REDIRECT_URL);+ String redirectUrlAfterLogin = (String) getSession().getAttribute(SESSION_ATTR_REDIRECT_URL);if (StringUtils.isBlank(redirectUrlAfterLogin))throw new AuthenticationException(_T("Unsolicited OIDC authentication response"));