admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

logs 优化

Browse Source
This commit is contained in:
Crystal.Sea 2021-10-06 10:37:12 +08:00
parent aed80b59fd
commit fe8c89a459
16 changed files with 255 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gradle.properties
View File

@ -77,8 +77,8 @@ knife4jVersion =3.0.3
#database #database
postgresqlVersion =42.2.20 postgresqlVersion =42.2.20
mysqlconnectorjavaVersion =8.0.26 mysqlconnectorjavaVersion =8.0.26
druidVersion =1.2.6 druidVersion =1.2.8
druidspringbootstarterVersion =1.2.6 druidspringbootstarterVersion =1.2.8
jedisVersion =3.7.0 jedisVersion =3.7.0
ehcacheVersion =3.9.6 ehcacheVersion =3.9.6
mybatisVersion =3.5.7 mybatisVersion =3.5.7
@ -121,9 +121,9 @@ javaxtransactionapiVersion =1.3
validationapiVersion =2.0.1.Final validationapiVersion =2.0.1.Final
jsr173Version =1.0 jsr173Version =1.0
jaxbapiVersion =2.3.1 jaxbapiVersion =2.3.1
jaxbcoreVersion =2.3.0.1 jaxbcoreVersion =3.0.2
jaxbimplVersion =2.3.2 jaxbimplVersion =3.0.2
jaxbxjcVersion =2.3.2 jaxbxjcVersion =3.0.2
classmateVersion =1.5.0 classmateVersion =1.5.0
fastjsonVersion =1.2.78 fastjsonVersion =1.2.78
reactivestreamsVersion =1.0.3 reactivestreamsVersion =1.0.3

6
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java
View File

@ -102,8 +102,8 @@ public abstract class AbstractAuthenticationProvider {
WebContext.setAttribute( WebContext.setAttribute(
WebConstants.LOGIN_ERROR_SESSION_MESSAGE, e.getMessage()); WebConstants.LOGIN_ERROR_SESSION_MESSAGE, e.getMessage());
} catch (Exception e) { } catch (Exception e) {
String message = "Unexpected exception in " + getProviderName() + " authentication:"; _logger.error("Login error Unexpected exception in {} authentication:\n{}" ,
_logger.error("Login error " + message, e); getProviderName(), e.getMessage());
} }
if (authentication== null || !authentication.isAuthenticated()) { if (authentication== null || !authentication.isAuthenticated()) {
@ -186,7 +186,7 @@ public abstract class AbstractAuthenticationProvider {
} }
final String message = WebContext.getI18nValue("login.error.authtype"); final String message = WebContext.getI18nValue("login.error.authtype");
_logger.debug("Login AuthN type must eq basic or tfa ， Error message is " + message); _logger.debug("Login AuthN type must eq basic or tfa ， Error message is {}" , message);
throw new BadCredentialsException(message); throw new BadCredentialsException(message);
} }

10
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java
View File

@ -160,7 +160,8 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider
return authentication; return authentication;
}else { }else {
String i18nMessage = WebContext.getI18nValue("login.error.username"); String i18nMessage = WebContext.getI18nValue("login.error.username");
_logger.debug("login user " + loginCredential.getUsername() + " not in this System ." + i18nMessage); _logger.debug("login user {} not in this System . {}" ,
loginCredential.getUsername(),i18nMessage);
throw new BadCredentialsException(WebContext.getI18nValue("login.error.username")); throw new BadCredentialsException(WebContext.getI18nValue("login.error.username"));
} }
} }
@ -169,7 +170,10 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider
String currentUserSessionId = WebContext.genId(); String currentUserSessionId = WebContext.genId();
//Online Tickit Id //Online Tickit Id
String onlineTickitId = WebConstants.ONLINE_TICKET_PREFIX + "-" + currentUserSessionId; String onlineTickitId = WebConstants.ONLINE_TICKET_PREFIX + "-" + currentUserSessionId;
_logger.debug("set online Tickit Cookie " + onlineTickitId + " on domain "+ this.applicationConfig.getBaseDomainName()); _logger.debug("set online Tickit Cookie {} on domain {}",
onlineTickitId,
this.applicationConfig.getBaseDomainName()
);
OnlineTicket onlineTicket = new OnlineTicket(onlineTickitId); OnlineTicket onlineTicket = new OnlineTicket(onlineTickitId);
@ -191,7 +195,7 @@ public class RealmAuthenticationProvider extends AbstractAuthenticationProvider
_logger.trace("ROLE ADMINISTRATORS Authentication ."); _logger.trace("ROLE ADMINISTRATORS Authentication .");
} }
} }
_logger.debug("Granted Authority " + grantedAuthoritys); _logger.debug("Granted Authority {}" , grantedAuthoritys);
signinPrincipal.setGrantedAuthorityApps(authenticationRealm.queryAuthorizedApps(grantedAuthoritys)); signinPrincipal.setGrantedAuthorityApps(authenticationRealm.queryAuthorizedApps(grantedAuthoritys));

2
maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java
View File

@ -116,7 +116,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm {
} }
} }
_logger.debug("passwordvalid : " + passwordMatches); _logger.debug("passwordvalid : {}" , passwordMatches);
if (!passwordMatches) { if (!passwordMatches) {
passwordPolicyValidator.plusBadPasswordCount(userInfo); passwordPolicyValidator.plusBadPasswordCount(userInfo);
insertLoginHistory(userInfo, ConstantsLoginType.LOCAL, "", "xe00000004", "password error"); insertLoginHistory(userInfo, ConstantsLoginType.LOCAL, "", "xe00000004", "password error");

42
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java
View File

@ -48,9 +48,9 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
final static Logger _logger = LoggerFactory.getLogger(SocialSignOnEndpoint.class); final static Logger _logger = LoggerFactory.getLogger(SocialSignOnEndpoint.class);
public ModelAndView socialSignOnAuthorize(HttpServletRequest request,String provider){ public ModelAndView socialSignOnAuthorize(HttpServletRequest request,String provider){
_logger.trace("SocialSignOn provider : "+provider); _logger.trace("SocialSignOn provider : " + provider);
String authorizationUrl=buildAuthRequest(provider).authorize(request.getSession().getId()); String authorizationUrl=buildAuthRequest(provider).authorize(request.getSession().getId());
_logger.trace("authorize SocialSignOn : "+authorizationUrl); _logger.trace("authorize SocialSignOn : " + authorizationUrl);
return WebContext.redirect(authorizationUrl); return WebContext.redirect(authorizationUrl);
} }
@ -77,12 +77,16 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
socialSignOnUser.setProvider(provider); socialSignOnUser.setProvider(provider);
socialSignOnUser.setUserId(WebContext.getUserInfo().getId()); socialSignOnUser.setUserId(WebContext.getUserInfo().getId());
socialSignOnUser.setUsername(WebContext.getUserInfo().getUsername()); socialSignOnUser.setUsername(WebContext.getUserInfo().getUsername());
_logger.debug("Social Sign On unbind "+provider+" from user "+WebContext.getUserInfo().getUsername()); _logger.debug("Social Sign On unbind {} from user {}",
provider,
WebContext.getUserInfo().getUsername()
);
socialsAssociateService.delete(socialSignOnUser); socialsAssociateService.delete(socialSignOnUser);
if(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI)!=null){ Object redirect_uri = WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI);
return WebContext.redirect(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI).toString()); if(redirect_uri != null){
return WebContext.redirect(redirect_uri.toString());
}else{ }else{
return WebContext.forward("/socialsignon/list"); return WebContext.forward("/socialsignon/list");
} }
@ -105,7 +109,8 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
socialSignOnAuthorize(request,provider); socialSignOnAuthorize(request,provider);
SocialSignOnProvider socialSignOnProvider = socialSignOnProviderService.get(provider); SocialSignOnProvider socialSignOnProvider = socialSignOnProviderService.get(provider);
socialSignOnProvider.setState(request.getSession().getId()); socialSignOnProvider.setState(request.getSession().getId());
socialSignOnProvider.setRedirectUri(applicationConfig.getServerPrefix()+ "/logon/oauth20/callback/"+provider); socialSignOnProvider.setRedirectUri(applicationConfig.getServerPrefix()+
"/logon/oauth20/callback/"+provider);
return socialSignOnProvider; return socialSignOnProvider;
} }
@ -123,20 +128,21 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
socialsAssociate.setSocialUserId(this.accountId); socialsAssociate.setSocialUserId(this.accountId);
//for login //for login
String socialSignOnType= ""; String socialSignOnType=
if(WebContext.getAttribute(SOCIALSIGNON_TYPE_SESSION)!=null){ (WebContext.getAttribute(SOCIALSIGNON_TYPE_SESSION)!=null) ?
socialSignOnType=WebContext.getAttribute(SOCIALSIGNON_TYPE_SESSION).toString(); (WebContext.getAttribute(SOCIALSIGNON_TYPE_SESSION).toString()) : "";
}
if(socialSignOnType.equals(SOCIALSIGNON_TYPE.SOCIALSIGNON_TYPE_LOGON)||socialSignOnType.equals("")){
if(socialSignOnType.equals(SOCIALSIGNON_TYPE.SOCIALSIGNON_TYPE_LOGON)
||socialSignOnType.equals("")){
socialSignOn(socialsAssociate); socialSignOn(socialsAssociate);
return WebContext.redirect("/index"); return WebContext.redirect("/index");
}else{ }else{
socialBind(socialsAssociate); socialBind(socialsAssociate);
} }
Object redirect_uri = WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI);
if(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI)!=null){ if(redirect_uri != null){
return WebContext.redirect(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI).toString()); return WebContext.redirect(redirect_uri.toString());
}else{ }else{
return WebContext.forward("/socialsignon/list"); return WebContext.forward("/socialsignon/list");
} }
@ -171,11 +177,15 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
_logger.debug("Loaded SocialSignOn Socials Associate : "+socialsAssociate); _logger.debug("Loaded SocialSignOn Socials Associate : "+socialsAssociate);
if(null == socialsAssociate) { if(null == socialsAssociate) {
WebContext.getRequest().getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, new BadCredentialsException(WebContext.getI18nValue("login.error.social"))); WebContext.getRequest().getSession().setAttribute(
WebAttributes.AUTHENTICATION_EXCEPTION,
new BadCredentialsException(WebContext.getI18nValue("login.error.social"))
);
return false; return false;
} }
_logger.debug("Social Sign On from "+socialsAssociate.getProvider()+" mapping to user "+socialsAssociate.getUsername()); _logger.debug("Social Sign On from {} mapping to user {}",
socialsAssociate.getProvider(),socialsAssociate.getUsername());
LoginCredential loginCredential =new LoginCredential( LoginCredential loginCredential =new LoginCredential(
socialsAssociate.getUsername(),"",ConstantsLoginType.SOCIALSIGNON); socialsAssociate.getUsername(),"",ConstantsLoginType.SOCIALSIGNON);

26
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java
View File

@ -23,6 +23,7 @@ import java.sql.Types;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.maxkey.constants.ConstantsDatabase;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
@ -45,22 +46,16 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
private final JdbcTemplate jdbcTemplate; private final JdbcTemplate jdbcTemplate;
private String jdbcType;
public JdbcSocialsAssociateService(JdbcTemplate jdbcTemplate) { public JdbcSocialsAssociateService(JdbcTemplate jdbcTemplate) {
this.jdbcTemplate=jdbcTemplate; this.jdbcTemplate=jdbcTemplate;
try {
jdbcType = jdbcTemplate.getDataSource().getConnection().getMetaData().getDatabaseProductName();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
} }
@Override @Override
public boolean insert(SocialsAssociate socialsAssociate) { public boolean insert(SocialsAssociate socialsAssociate) {
socialsAssociate.setId(socialsAssociate.generateId()); socialsAssociate.setId(socialsAssociate.generateId());
jdbcTemplate.update("Oracle".equals(jdbcType)?DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE:DEFAULT_DEFAULT_INSERT_STATEMENT, jdbcTemplate.update(
ConstantsDatabase.compare(ConstantsDatabase.ORACLE)?
DEFAULT_DEFAULT_INSERT_STATEMENT_ORACLE:DEFAULT_DEFAULT_INSERT_STATEMENT,
new Object[] { new Object[] {
socialsAssociate.getId(), socialsAssociate.getId(),
socialsAssociate.getUserId(), socialsAssociate.getUserId(),
@ -70,7 +65,10 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
socialsAssociate.getAccessToken(), socialsAssociate.getAccessToken(),
socialsAssociate.getSocialUserInfo(), socialsAssociate.getSocialUserInfo(),
socialsAssociate.getExAttribute()}, socialsAssociate.getExAttribute()},
new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR }); new int[] {
Types.VARCHAR, Types.VARCHAR,Types.VARCHAR,Types.VARCHAR,
Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR
});
return true; return true;
} }
@ -111,7 +109,13 @@ public class JdbcSocialsAssociateService implements SocialsAssociateService{
@Override @Override
public boolean update(SocialsAssociate socialsAssociate) { public boolean update(SocialsAssociate socialsAssociate) {
jdbcTemplate.update(DEFAULT_DEFAULT_UPDATE_STATEMENT, jdbcTemplate.update(DEFAULT_DEFAULT_UPDATE_STATEMENT,
new Object[] {socialsAssociate.getAccessToken(),socialsAssociate.getSocialUserInfo(),socialsAssociate.getExAttribute(),new Date(),socialsAssociate.getId()}, new Object[] {
socialsAssociate.getAccessToken(),
socialsAssociate.getSocialUserInfo(),
socialsAssociate.getExAttribute(),
new Date(),
socialsAssociate.getId()
},
new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.TIMESTAMP,Types.VARCHAR }); new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.TIMESTAMP,Types.VARCHAR });
return false; return false;
} }

2
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java
View File

@ -146,7 +146,7 @@ public class SocialSignOnProviderService{
} }
} }
_logger.debug(""+this.socialSignOnProviders); _logger.debug("social SignOn Providers {}" , this.socialSignOnProviders);
} }
} }

5
maxkey-common/src/main/java/org/maxkey/crypto/ReciprocalUtils.java
View File

@ -21,6 +21,7 @@
package org.maxkey.crypto; package org.maxkey.crypto;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.Provider;
import java.security.Security; import java.security.Security;
import javax.crypto.Cipher; import javax.crypto.Cipher;
@ -28,6 +29,7 @@ import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.maxkey.util.Instance;
import org.maxkey.util.StringGenerator; import org.maxkey.util.StringGenerator;
/** /**
@ -56,11 +58,12 @@ public final class ReciprocalUtils {
static { static {
if(System.getProperty("java.version").startsWith("1.8")) { if(System.getProperty("java.version").startsWith("1.8")) {
try { try {
Security.addProvider(new com.sun.crypto.provider.SunJCE()); Security.addProvider((Provider)Instance.newInstance("com.sun.crypto.provider.SunJCE"));
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
//else not need to add see jdk-17\conf\security\java.security,SunJCE
} }
public static byte[] encode(byte[] simpleBytes, SecretKey secretKey, String algorithm) { public static byte[] encode(byte[] simpleBytes, SecretKey secretKey, String algorithm) {

23
maxkey-common/src/test/java/org/maxkey/util/InstanceTest.java Normal file
View File

@ -0,0 +1,23 @@
package org.maxkey.util;
import java.security.Provider;
import java.security.Security;
import org.maxkey.client.crypto.ReciprocalUtils;
public class InstanceTest {
public static void main(String[] args) {
if(System.getProperty("java.version").startsWith("1.8")) {
System.out.println("1.8");
Security.addProvider((Provider)Instance.newInstance("com.sun.crypto.provider.SunJCE"));
System.out.println(ReciprocalUtils.encode("ddddd"));
System.out.println(ReciprocalUtils.encode("ddfs"));
}else {
System.out.println("other");
}
}
}

2
maxkey-core/src/main/java/org/maxkey/configuration/ApplicationConfig.java
View File

@ -78,6 +78,8 @@ public class ApplicationConfig {
@Value("${maxkey.notices.visible:false}") @Value("${maxkey.notices.visible:false}")
private boolean noticesVisible; private boolean noticesVisible;
public static String databaseProduct = "MySQL";
public int getPort() { public int getPort() {
return port; return port;

41
maxkey-core/src/main/java/org/maxkey/constants/ConstantsDatabase.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Copyright [2020] [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.constants;
import org.maxkey.configuration.ApplicationConfig;
public class ConstantsDatabase {
public static String MYSQL = "MySQL";
public static String POSTGRESQL = "PostgreSQL";
public static String ORACLE = "Oracle";
public static String MSSQLSERVER = "SQL Server";
public static String DB2 = "db2";
public static boolean compare(String databaseProduct) {
if(databaseProduct.equalsIgnoreCase(ApplicationConfig.databaseProduct)) {
return true;
}
return false;
}
}

6
maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java
View File

@ -77,14 +77,16 @@ public class LoginHistoryService {
public void logoff(String lastLogoffTime,String sessionId) { public void logoff(String lastLogoffTime,String sessionId) {
_logger.debug(" sessionId " +sessionId +" , lastlogofftime " + lastLogoffTime); _logger.debug(" sessionId {} , lastlogofftime {}" ,sessionId, lastLogoffTime);
jdbcTemplate.update(HISTORY_LOGOUT_UPDATE_STATEMENT, jdbcTemplate.update(HISTORY_LOGOUT_UPDATE_STATEMENT,
new Object[] { lastLogoffTime, sessionId }, new Object[] { lastLogoffTime, sessionId },
new int[] { Types.VARCHAR, Types.VARCHAR }); new int[] { Types.VARCHAR, Types.VARCHAR });
} }
public void logoff(HistoryLogin historyLogin) { public void logoff(HistoryLogin historyLogin) {
_logger.debug(" sessionId " +historyLogin.getSessionId() +" , LogoutTime " + historyLogin.getLogoutTime()); _logger.debug(" sessionId {} , LogoutTime {}" ,
historyLogin.getSessionId(), historyLogin.getLogoutTime()
);
jdbcTemplate.update(HISTORY_LOGOUT_UPDATE_STATEMENT, jdbcTemplate.update(HISTORY_LOGOUT_UPDATE_STATEMENT,
new Object[] { historyLogin.getLogoutTime(), historyLogin.getSessionId() }, new Object[] { historyLogin.getLogoutTime(), historyLogin.getSessionId() },
new int[] { Types.VARCHAR, Types.VARCHAR }); new int[] { Types.VARCHAR, Types.VARCHAR });

10
maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java
View File

@ -121,9 +121,10 @@ public class LoginService {
jdbcTemplate.update(LOCK_USER_UPDATE_STATEMENT, jdbcTemplate.update(LOCK_USER_UPDATE_STATEMENT,
new Object[] { ConstantsStatus.LOCK, new Date(), userInfo.getId() }, new Object[] { ConstantsStatus.LOCK, new Date(), userInfo.getId() },
new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstantsStatus.LOCK);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("lockUser Exception",e);
} }
} }
@ -138,9 +139,10 @@ public class LoginService {
jdbcTemplate.update(UNLOCK_USER_UPDATE_STATEMENT, jdbcTemplate.update(UNLOCK_USER_UPDATE_STATEMENT,
new Object[] { ConstantsStatus.ACTIVE, new Date(), userInfo.getId() }, new Object[] { ConstantsStatus.ACTIVE, new Date(), userInfo.getId() },
new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstantsStatus.ACTIVE);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("unlockUser Exception",e);
} }
} }
@ -155,10 +157,10 @@ public class LoginService {
jdbcTemplate.update(BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT, jdbcTemplate.update(BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT,
new Object[] { 0, ConstantsStatus.ACTIVE, new Date(), userInfo.getId() }, new Object[] { 0, ConstantsStatus.ACTIVE, new Date(), userInfo.getId() },
new int[] { Types.INTEGER, Types.INTEGER, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.INTEGER, Types.INTEGER, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstantsStatus.ACTIVE);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("resetBadPasswordCountAndLockout Exception",e);
_logger.error(e.getMessage());
} }
} }

37
maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java
View File

@ -219,7 +219,7 @@ public class PasswordPolicyValidator {
String passwordPolicyMessage = ""; String passwordPolicyMessage = "";
for (String msg : validator.getMessages(result)) { for (String msg : validator.getMessages(result)) {
passwordPolicyMessage = passwordPolicyMessage + msg + "<br>"; passwordPolicyMessage = passwordPolicyMessage + msg + "<br>";
_logger.debug("Rule Message " + msg); _logger.debug("Rule Message {}" , msg);
} }
WebContext.setAttribute(PasswordPolicyValidator.PASSWORD_POLICY_VALIDATE_RESULT, passwordPolicyMessage); WebContext.setAttribute(PasswordPolicyValidator.PASSWORD_POLICY_VALIDATE_RESULT, passwordPolicyMessage);
return false; return false;
@ -250,9 +250,13 @@ public class PasswordPolicyValidator {
DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"));
Duration duration = new Duration(badPasswordTime, currentdateTime); Duration duration = new Duration(badPasswordTime, currentdateTime);
int intDuration = Integer.parseInt(duration.getStandardHours() + ""); int intDuration = Integer.parseInt(duration.getStandardHours() + "");
_logger.debug("bad Password duration " + intDuration _logger.debug("bad Password duration {} , " +
+ " , password policy Duration "+passwordPolicy.getDuration() "password policy Duration {} , "+
+ " , validate result " + (intDuration > passwordPolicy.getDuration())); "validate result {}" ,
intDuration,
passwordPolicy.getDuration(),
(intDuration > passwordPolicy.getDuration())
);
//auto unlock attempts when intDuration > set Duration //auto unlock attempts when intDuration > set Duration
if(intDuration > passwordPolicy.getDuration()) { if(intDuration > passwordPolicy.getDuration()) {
_logger.debug("resetAttempts ..."); _logger.debug("resetAttempts ...");
@ -310,15 +314,19 @@ public class PasswordPolicyValidator {
*/ */
if (passwordPolicy.getExpiration() > 0) { if (passwordPolicy.getExpiration() > 0) {
String passwordLastSetTimeString = userInfo.getPasswordLastSetTime().substring(0, 19); String passwordLastSetTimeString = userInfo.getPasswordLastSetTime().substring(0, 19);
_logger.info("last password set date " + passwordLastSetTimeString); _logger.info("last password set date {}" , passwordLastSetTimeString);
DateTime changePwdDateTime = DateTime.parse(passwordLastSetTimeString, DateTime changePwdDateTime = DateTime.parse(passwordLastSetTimeString,
DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"));
Duration duration = new Duration(changePwdDateTime, currentdateTime); Duration duration = new Duration(changePwdDateTime, currentdateTime);
int intDuration = Integer.parseInt(duration.getStandardDays() + ""); int intDuration = Integer.parseInt(duration.getStandardDays() + "");
_logger.debug("password Last Set duration day " + intDuration _logger.debug("password Last Set duration day {} , " +
+ " , password policy Expiration " +passwordPolicy.getExpiration() "password policy Expiration {} , " +
+" , validate result " + (intDuration <= passwordPolicy.getExpiration())); "validate result {}",
intDuration,
passwordPolicy.getExpiration(),
intDuration <= passwordPolicy.getExpiration()
);
if (intDuration > passwordPolicy.getExpiration()) { if (intDuration > passwordPolicy.getExpiration()) {
WebContext.getSession().setAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE, WebContext.getSession().setAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE,
ConstantsPasswordSetType.PASSWORD_EXPIRED); ConstantsPasswordSetType.PASSWORD_EXPIRED);
@ -339,9 +347,10 @@ public class PasswordPolicyValidator {
jdbcTemplate.update(LOCK_USER_UPDATE_STATEMENT, jdbcTemplate.update(LOCK_USER_UPDATE_STATEMENT,
new Object[] { ConstantsStatus.LOCK, new Date(), userInfo.getId() }, new Object[] { ConstantsStatus.LOCK, new Date(), userInfo.getId() },
new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstantsStatus.LOCK);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("lockUser Exception",e);
} }
} }
@ -357,9 +366,10 @@ public class PasswordPolicyValidator {
jdbcTemplate.update(UNLOCK_USER_UPDATE_STATEMENT, jdbcTemplate.update(UNLOCK_USER_UPDATE_STATEMENT,
new Object[] { ConstantsStatus.ACTIVE, new Date(), userInfo.getId() }, new Object[] { ConstantsStatus.ACTIVE, new Date(), userInfo.getId() },
new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstantsStatus.ACTIVE);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("unlockUser Exception",e);
} }
} }
@ -374,10 +384,10 @@ public class PasswordPolicyValidator {
jdbcTemplate.update(BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT, jdbcTemplate.update(BADPASSWORDCOUNT_RESET_UPDATE_STATEMENT,
new Object[] { 0, ConstantsStatus.ACTIVE, new Date(), userInfo.getId() }, new Object[] { 0, ConstantsStatus.ACTIVE, new Date(), userInfo.getId() },
new int[] { Types.INTEGER, Types.INTEGER, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.INTEGER, Types.INTEGER, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstantsStatus.ACTIVE);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("resetAttempts Exception",e);
_logger.error(e.getMessage());
} }
} }
@ -392,8 +402,7 @@ public class PasswordPolicyValidator {
new Object[] { badPasswordCount, new Date(), userId }, new Object[] { badPasswordCount, new Date(), userId },
new int[] { Types.INTEGER, Types.TIMESTAMP, Types.VARCHAR }); new int[] { Types.INTEGER, Types.TIMESTAMP, Types.VARCHAR });
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); _logger.error("setBadPasswordCount Exception",e);
_logger.error(e.getMessage());
} }
} }

99
maxkey-core/src/main/java/org/maxkey/web/InitializeContext.java
View File

@ -31,6 +31,7 @@ import org.apache.commons.lang.SystemUtils;
import org.apache.commons.lang3.ArchUtils; import org.apache.commons.lang3.ArchUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.maxkey.cache.CacheFactory; import org.maxkey.cache.CacheFactory;
import org.maxkey.configuration.ApplicationConfig;
import org.maxkey.util.PathUtils; import org.maxkey.util.PathUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -130,34 +131,36 @@ public class InitializeContext extends HttpServlet {
.getConnection(); .getConnection();
java.sql.DatabaseMetaData databaseMetaData = connection.getMetaData(); java.sql.DatabaseMetaData databaseMetaData = connection.getMetaData();
_logger.debug("DatabaseProductName : " ApplicationConfig.databaseProduct = databaseMetaData.getDatabaseProductName();
+ databaseMetaData.getDatabaseProductName());
_logger.debug("DatabaseProductVersion: " _logger.debug("DatabaseProductName : {}",
+ databaseMetaData.getDatabaseProductVersion()); databaseMetaData.getDatabaseProductName());
_logger.trace("DatabaseMajorVersion : " _logger.debug("DatabaseProductVersion: {}" ,
+ databaseMetaData.getDatabaseMajorVersion()); databaseMetaData.getDatabaseProductVersion());
_logger.trace("DatabaseMinorVersion : " _logger.trace("DatabaseMajorVersion : {}" ,
+ databaseMetaData.getDatabaseMinorVersion()); databaseMetaData.getDatabaseMajorVersion());
_logger.trace("supportsTransactions : " _logger.trace("DatabaseMinorVersion : {}" ,
+ databaseMetaData.supportsTransactions()); databaseMetaData.getDatabaseMinorVersion());
_logger.trace("DefaultTransaction : " _logger.trace("supportsTransactions : {}" ,
+ databaseMetaData.getDefaultTransactionIsolation()); databaseMetaData.supportsTransactions());
_logger.trace("MaxConnections : " _logger.trace("DefaultTransaction : {}" ,
+ databaseMetaData.getMaxConnections()); databaseMetaData.getDefaultTransactionIsolation());
_logger.trace("MaxConnections : {}" ,
databaseMetaData.getMaxConnections());
_logger.trace(""); _logger.trace("");
_logger.trace("JDBCMajorVersion : " _logger.trace("JDBCMajorVersion : {}" ,
+ databaseMetaData.getJDBCMajorVersion()); databaseMetaData.getJDBCMajorVersion());
_logger.trace("JDBCMinorVersion : " _logger.trace("JDBCMinorVersion : {}" ,
+ databaseMetaData.getJDBCMinorVersion()); databaseMetaData.getJDBCMinorVersion());
_logger.trace("DriverName : " _logger.trace("DriverName : {}" ,
+ databaseMetaData.getDriverName()); databaseMetaData.getDriverName());
_logger.trace("DriverVersion : " _logger.trace("DriverVersion : {}" ,
+ databaseMetaData.getDriverVersion()); databaseMetaData.getDriverVersion());
_logger.debug(""); _logger.debug("");
_logger.debug("DBMS URL : " _logger.debug("DBMS URL : {}" ,
+ databaseMetaData.getURL()); databaseMetaData.getURL());
_logger.debug("UserName : " _logger.debug("UserName : {}" ,
+ databaseMetaData.getUserName()); databaseMetaData.getUserName());
_logger.debug("-----------------------------------------------------------"); _logger.debug("-----------------------------------------------------------");
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
@ -184,7 +187,7 @@ public class InitializeContext extends HttpServlet {
Iterator<PropertySource<?>> it =WebContext.properties.getPropertySources().iterator(); Iterator<PropertySource<?>> it =WebContext.properties.getPropertySources().iterator();
while(it.hasNext()) { while(it.hasNext()) {
_logger.debug("propertySource " + it.next()); _logger.debug("propertySource {}" , it.next());
} }
_logger.trace("-----------------------------------------------------------"); _logger.trace("-----------------------------------------------------------");
} }
@ -205,21 +208,31 @@ public class InitializeContext extends HttpServlet {
// out // out
for (Iterator<String> it = keyValueSet.iterator(); it.hasNext();) { for (Iterator<String> it = keyValueSet.iterator(); it.hasNext();) {
String key = (String) it.next(); String key = (String) it.next();
_logger.trace(key + " = " + map.get(key)); _logger.trace(key + " = {}" , map.get(key));
} }
_logger.debug("APP_HOME" + " = " + PathUtils.getInstance().getAppPath()); _logger.debug("APP_HOME" + " = {}" , PathUtils.getInstance().getAppPath());
_logger.debug("OS : "+SystemUtils.OS_NAME + _logger.debug("OS : {}({} {}), version {}",
"("+SystemUtils.OS_ARCH+" " +ArchUtils.getProcessor().getType()+"),"+ SystemUtils.OS_NAME,
" version " +SystemUtils.OS_VERSION+"" SystemUtils.OS_ARCH,
ArchUtils.getProcessor().getType(),
SystemUtils.OS_VERSION
); );
_logger.debug("COMPUTER: "+map.get("COMPUTERNAME") +", "+ _logger.debug("COMPUTER: {}, USERNAME : {}",
"USERNAME : "+map.get("USERNAME") map.get("COMPUTERNAME") ,
map.get("USERNAME")
); );
_logger.debug("JAVA :"); _logger.debug("JAVA :");
_logger.debug(SystemUtils.JAVA_VENDOR+ _logger.debug("{} java version {}, class {}",
" java version "+SystemUtils.JAVA_VERSION +", class "+SystemUtils.JAVA_CLASS_VERSION); SystemUtils.JAVA_VENDOR,
_logger.debug(SystemUtils.JAVA_VM_NAME+ SystemUtils.JAVA_VERSION,
" (build "+SystemUtils.JAVA_VM_VERSION +", "+ SystemUtils.JAVA_VM_INFO+")"); SystemUtils.JAVA_CLASS_VERSION
);
_logger.debug("{} (build {}, {})",
SystemUtils.JAVA_VM_NAME,
SystemUtils.JAVA_VM_VERSION,
SystemUtils.JAVA_VM_INFO
);
_logger.debug("-----------------------------------------------------------"); _logger.debug("-----------------------------------------------------------");
@ -232,12 +245,12 @@ public class InitializeContext extends HttpServlet {
_logger.info("-----------------------------------------------------------"); _logger.info("-----------------------------------------------------------");
_logger.info("+ MaxKey "); _logger.info("+ MaxKey ");
_logger.info("+ Single Sign On ( SSO ) "); _logger.info("+ Single Sign On ( SSO ) ");
_logger.info("+ Version " _logger.info("+ Version {}",
+ WebContext.properties.getProperty("application.formatted-version")); WebContext.properties.getProperty("application.formatted-version"));
_logger.info("+"); _logger.info("+");
_logger.info("+ "+ ((char)0xA9) + "Copyright 2018-" _logger.info("+ {}Copyright 2018-{} https://www.maxkey.top/",
+ (new DateTime().getYear()) (char)0xA9 , new DateTime().getYear()
+ " https://www.maxkey.top/"); );
_logger.info("+ Licensed under the Apache License, Version 2.0 "); _logger.info("+ Licensed under the Apache License, Version 2.0 ");
_logger.info("-----------------------------------------------------------"); _logger.info("-----------------------------------------------------------");
} }

67
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/OAuth2Constants.java
View File

@ -23,85 +23,94 @@ public class OAuth2Constants {
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String CLIENT_ID = "client_id"; public static final String CLIENT_ID = "client_id";
public static final String CLIENT_SECRET = "client_secret"; public static final String CLIENT_SECRET = "client_secret";
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String STATE = "state"; public static final String STATE = "state";
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String SCOPE = "scope"; public static final String SCOPE = "scope";
public static final String CODE = "code"; public static final String CODE = "code";
public static final String TOKEN = "token"; public static final String TOKEN = "token";
public static final String TOKEN_TYPE = "token_type"; public static final String TOKEN_TYPE = "token_type";
public static final String EXPIRES_IN = "expires_in"; public static final String EXPIRES_IN = "expires_in";
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String REDIRECT_URI = "redirect_uri"; public static final String REDIRECT_URI = "redirect_uri";
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String RESPONSE_TYPE = "response_type"; public static final String RESPONSE_TYPE = "response_type";
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String USER_OAUTH_APPROVAL = "user_oauth_approval"; public static final String USER_OAUTH_APPROVAL = "user_oauth_approval";
/** /**
* Constant to use as a prefix for scope approval * Constant to use as a prefix for scope approval
*/ */
public static final String SCOPE_PREFIX = "scope."; public static final String SCOPE_PREFIX = "scope.";
/** /**
* Constant to use while parsing and formatting parameter maps for OAuth2 requests * Constant to use while parsing and formatting parameter maps for OAuth2 requests
*/ */
public static final String GRANT_TYPE = "grant_type"; public static final String GRANT_TYPE = "grant_type";
public static final String GRANT_TYPE_CODE = "code"; public static final String GRANT_TYPE_CODE = "code";
public static final String GRANT_TYPE_PASSWORD = "password"; public static final String GRANT_TYPE_PASSWORD = "password";
public static final String GRANT_TYPE_IMPLICIT = "implicit"; public static final String GRANT_TYPE_IMPLICIT = "implicit";
public static final String GRANT_TYPE_AUTHORIZATION_CODE = "authorization_code"; public static final String GRANT_TYPE_AUTHORIZATION_CODE = "authorization_code";
public static final String GRANT_TYPE_CLIENT_CREDENTIALS = "client_credentials"; public static final String GRANT_TYPE_CLIENT_CREDENTIALS = "client_credentials";
public static final String ACCESS_TOKEN = "access_token"; public static final String ACCESS_TOKEN = "access_token";
public static final String APPROVAL_PROMPT = "approval_prompt";
//https://datatracker.ietf.org/doc/html/rfc7636 PKCE
//Proof Key for Code Exchange by OAuth Public Clients
public static final String CODE_CHALLENGE = "code_challenge" ;
public static final String CODE_CHALLENGE_METHOD = "code_challenge_method" ;
public static final String CODE_VERIFIER = "code_verifier" ;
public static final String APPROVAL_PROMPT = "approval_prompt";
} }
public static class ENDPOINT{ public static class ENDPOINT{
public final static String ENDPOINT_BASE = "/authz/oauth/v20"; public final static String ENDPOINT_BASE = "/authz/oauth/v20";
public final static String ENDPOINT_AUTHORIZE = ENDPOINT_BASE + "/authorize"; public final static String ENDPOINT_AUTHORIZE = ENDPOINT_BASE + "/authorize";
public final static String ENDPOINT_TOKEN = ENDPOINT_BASE + "/token"; public final static String ENDPOINT_TOKEN = ENDPOINT_BASE + "/token";
public final static String ENDPOINT_CHECK_TOKEN = ENDPOINT_BASE + "/check_token"; public final static String ENDPOINT_CHECK_TOKEN = ENDPOINT_BASE + "/check_token";
public final static String ENDPOINT_TOKEN_KEY = ENDPOINT_BASE + "/token_key"; public final static String ENDPOINT_TOKEN_KEY = ENDPOINT_BASE + "/token_key";
public final static String ENDPOINT_APPROVAL_CONFIRM = ENDPOINT_BASE + "/approval_confirm"; public final static String ENDPOINT_APPROVAL_CONFIRM = ENDPOINT_BASE + "/approval_confirm";
public final static String ENDPOINT_ERROR = ENDPOINT_BASE + "/error"; public final static String ENDPOINT_ERROR = ENDPOINT_BASE + "/error";
public final static String ENDPOINT_USERINFO = "/api/oauth/v20/me"; public final static String ENDPOINT_USERINFO = "/api/oauth/v20/me";
public final static String ENDPOINT_OPENID_CONNECT_USERINFO = "/api/connect/v10/userinfo"; public final static String ENDPOINT_OPENID_CONNECT_USERINFO = "/api/connect/v10/userinfo";
} }
} }