From 6d607f8f35189a3596713d8be98a4b8ccb2f1166 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Wed, 1 Apr 2020 15:47:52 +0800 Subject: [PATCH] v1.3 RC --- .../support/rememberme/AbstractRemeberMeService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java b/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java index affb47a1b..9be6efc76 100644 --- a/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java +++ b/maxkey-core/src/main/java/org/maxkey/authn/support/rememberme/AbstractRemeberMeService.java @@ -86,12 +86,15 @@ public abstract class AbstractRemeberMeService { remeberMeCookie = (RemeberMe) JsonUtils.json2Object(remeberMe, remeberMeCookie); _logger.debug("Remeber Me Cookie : " + remeberMeCookie); - RemeberMe jdbcRemeberMe = read(remeberMeCookie); - DateTime loginDate = new DateTime(jdbcRemeberMe.getLastLogin()); + RemeberMe storeRemeberMe = read(remeberMeCookie); + if (storeRemeberMe == null) { + return false; + } + DateTime loginDate = new DateTime(storeRemeberMe.getLastLogin()); DateTime expiryDate = loginDate.plusSeconds(getRemeberMeValidity()); DateTime now = new DateTime(); if (now.isBefore(expiryDate)) { - if (WebContext.setAuthentication(jdbcRemeberMe.getUsername(), LOGINTYPE.REMEBER_ME, "", "", "success")) { + if (WebContext.setAuthentication(storeRemeberMe.getUsername(), LOGINTYPE.REMEBER_ME, "", "", "success")) { return updateRemeberMe(remeberMeCookie, response); } }