浏览代码

HttpSessionListenerAdapter UserInfo null fix

MaxKey 2 年之前
父节点
当前提交
e6458bf9aa

+ 29 - 15
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SignPrincipal.java

@@ -184,21 +184,35 @@ public class SignPrincipal implements  UserDetails {
     }
     }
 
 
     @Override
     @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("SigninPrincipal [userInfo=");
-        builder.append(userInfo);
-        builder.append(", onlineTicket=");
-        builder.append(session);
-        builder.append(", grantedAuthority=");
-        builder.append(grantedAuthority);
-        builder.append(", authenticated=");
-        builder.append(authenticated);
-        builder.append(", roleAdministrators=");
-        builder.append(roleAdministrators);
-        builder.append("]");
-        return builder.toString();
-    }
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("Principal [username=");
+		builder.append(getUsername());
+		builder.append(", userInfo=");
+		builder.append(userInfo);
+		builder.append(", userDetails=");
+		builder.append(userDetails);
+		builder.append(", session=");
+		builder.append(session);
+		builder.append(", grantedAuthority=");
+		builder.append(grantedAuthority);
+		builder.append(", grantedAuthorityApps=");
+		builder.append(grantedAuthorityApps);
+		builder.append(", authenticated=");
+		builder.append(authenticated);
+		builder.append(", roleAdministrators=");
+		builder.append(roleAdministrators);
+		builder.append(", accountNonExpired=");
+		builder.append(accountNonExpired);
+		builder.append(", accountNonLocked=");
+		builder.append(accountNonLocked);
+		builder.append(", credentialsNonExpired=");
+		builder.append(credentialsNonExpired);
+		builder.append(", enabled=");
+		builder.append(enabled);
+		builder.append("]");
+		return builder.toString();
+	}
 
 
 
 
 
 

+ 2 - 2
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/web/HttpSessionListenerAdapter.java

@@ -55,9 +55,9 @@ public class HttpSessionListenerAdapter implements HttpSessionListener {
         HttpSession session = sessionEvent.getSession();
         HttpSession session = sessionEvent.getSession();
         Authentication  authentication  = (Authentication ) session.getAttribute(WebConstants.AUTHENTICATION);
         Authentication  authentication  = (Authentication ) session.getAttribute(WebConstants.AUTHENTICATION);
         Object principal  = authentication == null ? null : authentication.getPrincipal();
         Object principal  = authentication == null ? null : authentication.getPrincipal();
-        
+        _logger.trace("principal {}",principal);
         if(principal != null ) {
         if(principal != null ) {
-        	if(principal instanceof SignPrincipal) {
+        	if(principal instanceof SignPrincipal && ((SignPrincipal)principal).getUserInfo()!=null) {
         		SignPrincipal signPrincipal = (SignPrincipal)principal;
         		SignPrincipal signPrincipal = (SignPrincipal)principal;
         		_logger.trace("{} HttpSession Id  {} for userId  {} , username {} @Ticket {} Destroyed" ,
         		_logger.trace("{} HttpSession Id  {} for userId  {} , username {} @Ticket {} Destroyed" ,
         			DateUtils.formatDateTime(new Date()),
         			DateUtils.formatDateTime(new Date()),