manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正CAS中央认证服务退出后，没有退出客户端的问题

Browse Source
This commit is contained in:
thinkgem
2023-02-21 10:02:53 +08:00
parent d9f9b17ece
commit fa39e1f593
2 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/core/src/main/java/com/jeesite/common/shiro/filter/CasFilter.java
View File

@@ -4,19 +4,19 @@
*/ */
package com.jeesite.common.shiro.filter; package com.jeesite.common.shiro.filter;
import javax.servlet.ServletRequest; import com.jeesite.common.lang.ExceptionUtils;
import javax.servlet.ServletResponse; import com.jeesite.common.lang.StringUtils;
import javax.servlet.http.HttpServletRequest; import com.jeesite.common.shiro.realm.BaseAuthorizingRealm;
import javax.servlet.http.HttpServletResponse; import com.jeesite.modules.sys.utils.UserUtils;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.util.WebUtils; import org.apache.shiro.web.util.WebUtils;
import com.jeesite.common.lang.ExceptionUtils; import javax.servlet.ServletRequest;
import com.jeesite.common.lang.StringUtils; import javax.servlet.ServletResponse;
import com.jeesite.common.shiro.realm.BaseAuthorizingRealm; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/** /**
* CAS过滤器 * CAS过滤器
@@ -25,12 +25,15 @@ import com.jeesite.common.shiro.realm.BaseAuthorizingRealm;
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class CasFilter extends org.apache.shiro.cas.CasFilter { public class CasFilter extends org.apache.shiro.cas.CasFilter {
private BaseAuthorizingRealm authorizingRealm;
/** /**
* 登录成功调用事件 * 登录成功调用事件
*/ */
@Override @Override
protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, ServletRequest request, ServletResponse response) throws Exception { protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, ServletRequest request, ServletResponse response) throws Exception {
authorizingRealm.onLoginSuccess(UserUtils.getLoginInfo(), (HttpServletRequest)request);
return FormFilter.onLoginSuccess((HttpServletRequest)request, (HttpServletResponse)response); return FormFilter.onLoginSuccess((HttpServletRequest)request, (HttpServletResponse)response);
} }
@@ -66,7 +69,7 @@ public class CasFilter extends org.apache.shiro.cas.CasFilter {
} }
public void setAuthorizingRealm(BaseAuthorizingRealm authorizingRealm) { public void setAuthorizingRealm(BaseAuthorizingRealm authorizingRealm) {
this.authorizingRealm = authorizingRealm;
} }
} }

39
modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
View File

@@ -4,22 +4,6 @@
*/ */
package com.jeesite.common.shiro.realm; package com.jeesite.common.shiro.realm;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.validation.ValidationException;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.cas.CasToken;
import org.jasig.cas.client.authentication.AttributePrincipal;
import org.jasig.cas.client.validation.Assertion;
import org.jasig.cas.client.validation.Cas20ServiceTicketValidator;
import org.jasig.cas.client.validation.TicketValidationException;
import org.jasig.cas.client.validation.TicketValidator;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import com.jeesite.common.codec.EncodeUtils; import com.jeesite.common.codec.EncodeUtils;
import com.jeesite.common.collect.MapUtils; import com.jeesite.common.collect.MapUtils;
import com.jeesite.common.lang.ObjectUtils; import com.jeesite.common.lang.ObjectUtils;
@@ -35,6 +19,20 @@ import com.jeesite.modules.sys.service.EmpUserService;
import com.jeesite.modules.sys.service.UserService; import com.jeesite.modules.sys.service.UserService;
import com.jeesite.modules.sys.utils.LogUtils; import com.jeesite.modules.sys.utils.LogUtils;
import com.jeesite.modules.sys.utils.UserUtils; import com.jeesite.modules.sys.utils.UserUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.cas.CasToken;
import org.jasig.cas.client.authentication.AttributePrincipal;
import org.jasig.cas.client.validation.Assertion;
import org.jasig.cas.client.validation.Cas20ServiceTicketValidator;
import org.jasig.cas.client.validation.TicketValidationException;
import org.jasig.cas.client.validation.TicketValidator;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import javax.servlet.http.HttpServletRequest;
import javax.validation.ValidationException;
import java.util.Map;
/** /**
* 系统认证授权实现类 * 系统认证授权实现类
@@ -181,20 +179,11 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
@Override @Override
public void onLoginSuccess(LoginInfo loginInfo, HttpServletRequest request) { public void onLoginSuccess(LoginInfo loginInfo, HttpServletRequest request) {
super.onLoginSuccess(loginInfo, request);
// 单点登录登出句柄（登录时注入session），在这之前必须获取下授权信息 // 单点登录登出句柄（登录时注入session），在这之前必须获取下授权信息
String ticket = loginInfo.getParam("ticket"); String ticket = loginInfo.getParam("ticket");
casOutHandler.recordSession(request, ticket); casOutHandler.recordSession(request, ticket);
//System.out.print("__sid: "+request.getSession().getId()); //System.out.print("__sid: "+request.getSession().getId());
//System.out.println(" == "+UserUtils.getSession().getId()); //System.out.println(" == "+UserUtils.getSession().getId());
// 更新登录IP、时间、会话ID等
User user = UserUtils.get(loginInfo.getId());
getUserService().updateUserLoginInfo(user);
// 记录用户登录日志
LogUtils.saveLog(user, ServletUtils.getRequest(), "系统登录", Log.TYPE_LOGIN_LOGOUT);
} }
@Override @Override