v2.9.0 & SessionListenerAdapter
v2.9.0 & SessionListenerAdapter
This commit is contained in:
@@ -26,15 +26,19 @@ import org.maxkey.authn.support.rememberme.AbstractRemeberMeService;
|
||||
import org.maxkey.authn.support.rememberme.HttpRemeberMeEntryPoint;
|
||||
import org.maxkey.configuration.ApplicationConfig;
|
||||
import org.maxkey.constants.ConstantsProperties;
|
||||
import org.maxkey.persistence.db.LoginHistoryService;
|
||||
import org.maxkey.persistence.db.LoginService;
|
||||
import org.maxkey.web.interceptor.HistoryLoginAppAdapter;
|
||||
import org.maxkey.web.interceptor.HistoryLogsAdapter;
|
||||
import org.maxkey.web.interceptor.PermissionAdapter;
|
||||
import org.maxkey.web.interceptor.PreLoginAppAdapter;
|
||||
import org.maxkey.web.interceptor.SessionListenerAdapter;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.PropertySource;
|
||||
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
||||
@@ -227,5 +231,17 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer {
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Bean(name = "sessionListenerAdapter")
|
||||
public SessionListenerAdapter sessionListenerAdapter(
|
||||
LoginService loginService,
|
||||
LoginHistoryService loginHistoryService
|
||||
) {
|
||||
SessionListenerAdapter sessionListenerAdapter =new SessionListenerAdapter();
|
||||
sessionListenerAdapter.setLoginService(loginService);
|
||||
sessionListenerAdapter.setLoginHistoryService(loginHistoryService);
|
||||
return sessionListenerAdapter;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ public class PermissionAdapter implements AsyncHandlerInterceptor {
|
||||
HttpServletResponse response, Object handler)
|
||||
throws Exception {
|
||||
_logger.trace("PermissionAdapter preHandle");
|
||||
|
||||
_logger.trace("PermissionAdapter " + request.getSession().getId());
|
||||
Object passwordSetTypeAttribute=WebContext.getSession().getAttribute(WebConstants.CURRENT_LOGIN_USER_PASSWORD_SET_TYPE);
|
||||
|
||||
if(passwordSetTypeAttribute != null) {
|
||||
@@ -140,10 +140,12 @@ public class PermissionAdapter implements AsyncHandlerInterceptor {
|
||||
try {
|
||||
if(authentication.getPrincipal() instanceof SigninPrincipal) {
|
||||
SigninPrincipal signinPrincipal = (SigninPrincipal)authentication.getPrincipal();
|
||||
//if onlineTicket refresh is removed or timeout then Exception
|
||||
OnlineTicket onlineTicket = signinPrincipal.getOnlineTicket();
|
||||
onlineTicketServices.refresh(onlineTicket.getTicketId());
|
||||
}
|
||||
}catch(Exception e) {
|
||||
_logger.debug("Online Ticket timeout ... forward to /login");
|
||||
RequestDispatcher dispatcher = request.getRequestDispatcher("/logout");
|
||||
dispatcher.forward(request, response);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
/*
|
||||
* Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.maxkey.web.interceptor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import javax.servlet.annotation.WebListener;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import javax.servlet.http.HttpSessionEvent;
|
||||
import javax.servlet.http.HttpSessionListener;
|
||||
|
||||
import org.apache.mybatis.jpa.util.WebContext;
|
||||
import org.maxkey.entity.UserInfo;
|
||||
import org.maxkey.persistence.db.LoginHistoryService;
|
||||
import org.maxkey.persistence.db.LoginService;
|
||||
import org.maxkey.util.DateUtils;
|
||||
import org.maxkey.web.WebConstants;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@WebListener
|
||||
public class SessionListenerAdapter implements HttpSessionListener {
|
||||
|
||||
private static final Logger _logger = LoggerFactory.getLogger(SessionListenerAdapter.class);
|
||||
|
||||
LoginService loginService;
|
||||
|
||||
LoginHistoryService loginHistoryService;
|
||||
|
||||
public SessionListenerAdapter() {
|
||||
super();
|
||||
_logger.debug("SessionListenerAdapter inited . ");
|
||||
}
|
||||
|
||||
public void init() {
|
||||
if(loginService == null ) {
|
||||
loginService = (LoginService)WebContext.getBean("loginService");
|
||||
loginHistoryService = (LoginHistoryService)WebContext.getBean("loginHistoryService");
|
||||
_logger.debug("SessionListenerAdapter function inited . ");
|
||||
}
|
||||
}
|
||||
/**
|
||||
* session Created
|
||||
*/
|
||||
@Override
|
||||
public void sessionCreated(HttpSessionEvent sessionEvent) {
|
||||
_logger.trace("new session Created :" + sessionEvent.getSession().getId());
|
||||
}
|
||||
|
||||
/**
|
||||
* session Destroyed
|
||||
*/
|
||||
@Override
|
||||
public void sessionDestroyed(HttpSessionEvent sessionEvent) {
|
||||
HttpSession session = sessionEvent.getSession();
|
||||
Object sessionIdAttribute = session.getAttribute(WebConstants.CURRENT_USER_SESSION_ID);
|
||||
_logger.trace("session Id : " + session.getId());
|
||||
if(sessionIdAttribute != null) {
|
||||
init();
|
||||
UserInfo userInfo = (UserInfo)session.getAttribute(WebConstants.CURRENT_USER);
|
||||
userInfo.setLastLogoffTime(DateUtils.formatDateTime(new Date()));
|
||||
loginService.setLastLogoffInfo(userInfo);
|
||||
loginHistoryService.logoff(userInfo.getLastLogoffTime(), sessionIdAttribute.toString());
|
||||
|
||||
_logger.debug(
|
||||
"session {} Destroyed as {} userId : {} , username : {}" ,
|
||||
sessionIdAttribute,
|
||||
userInfo.getLastLogoffTime(),
|
||||
userInfo.getId(),
|
||||
userInfo.getUsername());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void setLoginService(LoginService loginService) {
|
||||
this.loginService = loginService;
|
||||
}
|
||||
|
||||
public void setLoginHistoryService(LoginHistoryService loginHistoryService) {
|
||||
this.loginHistoryService = loginHistoryService;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user