passwordpolicy_message.properties

passwordpolicy_message.properties

maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java

@@ -78,10 +78,11 @@ public class MvcAutoConfiguration implements InitializingBean {
             @Value("${spring.messages.basename:classpath:messages/message}")
             String messagesBasename)  {
         _logger.debug("Basename " + messagesBasename);
+        String passwordPolicyMessagesBasename="classpath:messages/passwordpolicy_message";
         
         ReloadableResourceBundleMessageSource messageSource = 
                 new ReloadableResourceBundleMessageSource();
-        messageSource.setBasename(messagesBasename);
+        messageSource.setBasenames(messagesBasename,passwordPolicyMessagesBasename);
         messageSource.setUseCodeAsDefaultMessage(false);
         return messageSource;
     }

maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyMessageResolver.java

@@ -47,7 +47,7 @@ public class PasswordPolicyMessageResolver  implements MessageResolver{
     public String resolve(final RuleResultDetail detail)
     {
       try {
-        return this.messageSourceAccessor.getMessage(detail.getErrorCode().toLowerCase(), detail.getValues());
+        return this.messageSourceAccessor.getMessage("PasswordPolicy."+detail.getErrorCode(), detail.getValues());
       } catch (NoSuchMessageException e) {
         return this.fallbackMessageResolver.resolve(detail);
       }

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

@@ -43,7 +43,7 @@ public class PasswordPolicyValidator {
     private static Logger _logger = LoggerFactory.getLogger(PasswordPolicyValidator.class);
 
     public static final String topWeakPasswordPropertySource      = 
-            "classpath:/org/maxkey/persistence/db/top_weak_password.txt";
+            "classpath:/top_weak_password.txt";
     protected static final UserManagedCache<String, PasswordPolicy> passwordPolicyStore = 
             UserManagedCacheBuilder.newUserManagedCacheBuilder(String.class, PasswordPolicy.class)
                 .withExpiry(

maxkey-core/src/main/resources/messages/passwordpolicy_message.properties

@@ -0,0 +1,30 @@
+#password
+PasswordPolicy.HISTORY_VIOLATION=Password matches one of %1$s previous passwords.
+PasswordPolicy.ILLEGAL_WORD=Password contains the dictionary word '%1$s'.
+PasswordPolicy.ILLEGAL_WORD_REVERSED=Password contains the reversed dictionary word '%1$s'.
+PasswordPolicy.ILLEGAL_DIGEST_WORD=Password contains a dictionary word.
+PasswordPolicy.ILLEGAL_DIGEST_WORD_REVERSED=Password contains a reversed dictionary word.
+PasswordPolicy.ILLEGAL_MATCH=Password matches the illegal pattern '%1$s'.
+PasswordPolicy.ALLOWED_MATCH=Password must match pattern '%1$s'.
+PasswordPolicy.ILLEGAL_CHAR=Password %2$s the illegal character '%1$s'.
+PasswordPolicy.ALLOWED_CHAR=Password %2$s the illegal character '%1$s'.
+PasswordPolicy.ILLEGAL_QWERTY_SEQUENCE=Password contains the illegal QWERTY sequence '%1$s'.
+PasswordPolicy.ILLEGAL_ALPHABETICAL_SEQUENCE=Password contains the illegal alphabetical sequence '%1$s'.
+PasswordPolicy.ILLEGAL_NUMERICAL_SEQUENCE=Password contains the illegal numerical sequence '%1$s'.
+PasswordPolicy.ILLEGAL_USERNAME=Password %2$s the user id '%1$s'.
+PasswordPolicy.ILLEGAL_USERNAME_REVERSED=Password %2$s the user id '%1$s' in reverse.
+PasswordPolicy.ILLEGAL_WHITESPACE=Password %2$s a whitespace character.
+PasswordPolicy.ILLEGAL_NUMBER_RANGE=Password %2$s the number '%1$s'.
+PasswordPolicy.ILLEGAL_REPEATED_CHARS=Password contains %3$s sequences of %1$s or more repeated characters, but only %2$s allowed: %4$s.
+PasswordPolicy.INSUFFICIENT_UPPERCASE=Password must contain %1$s or more uppercase characters.
+PasswordPolicy.INSUFFICIENT_LOWERCASE=Password must contain %1$s or more lowercase characters.
+PasswordPolicy.INSUFFICIENT_ALPHABETICAL=Password must contain %1$s or more alphabetical characters.
+PasswordPolicy.INSUFFICIENT_DIGIT=Password must contain %1$s or more digit characters.
+PasswordPolicy.INSUFFICIENT_SPECIAL=Password must contain %1$s or more special characters.
+PasswordPolicy.INSUFFICIENT_CHARACTERISTICS=Password matches %1$s of %3$s character rules, but %2$s are required.
+PasswordPolicy.INSUFFICIENT_COMPLEXITY=Password meets %2$s complexity rules, but %3$s are required.
+PasswordPolicy.INSUFFICIENT_COMPLEXITY_RULES=No rules have been configured for a password of length %1$s.
+PasswordPolicy.SOURCE_VIOLATION=Password cannot be the same as your %1$s password.
+PasswordPolicy.TOO_LONG=Password must be no more than %2$s characters in length.
+PasswordPolicy.TOO_SHORT=Password must be %1$s or more characters in length \u592A\u77ED.
+PasswordPolicy.TOO_MANY_OCCURRENCES=Password contains %2$s occurrences of the character '%1$s', but at most %3$s are allowed.

maxkey-core/src/main/resources/messages/passwordpolicy_message_en.properties

@@ -0,0 +1,30 @@
+#password
+PasswordPolicy.HISTORY_VIOLATION=Password matches one of %1$s previous passwords.
+PasswordPolicy.ILLEGAL_WORD=Password contains the dictionary word '%1$s'.
+PasswordPolicy.ILLEGAL_WORD_REVERSED=Password contains the reversed dictionary word '%1$s'.
+PasswordPolicy.ILLEGAL_DIGEST_WORD=Password contains a dictionary word.
+PasswordPolicy.ILLEGAL_DIGEST_WORD_REVERSED=Password contains a reversed dictionary word.
+PasswordPolicy.ILLEGAL_MATCH=Password matches the illegal pattern '%1$s'.
+PasswordPolicy.ALLOWED_MATCH=Password must match pattern '%1$s'.
+PasswordPolicy.ILLEGAL_CHAR=Password %2$s the illegal character '%1$s'.
+PasswordPolicy.ALLOWED_CHAR=Password %2$s the illegal character '%1$s'.
+PasswordPolicy.ILLEGAL_QWERTY_SEQUENCE=Password contains the illegal QWERTY sequence '%1$s'.
+PasswordPolicy.ILLEGAL_ALPHABETICAL_SEQUENCE=Password contains the illegal alphabetical sequence '%1$s'.
+PasswordPolicy.ILLEGAL_NUMERICAL_SEQUENCE=Password contains the illegal numerical sequence '%1$s'.
+PasswordPolicy.ILLEGAL_USERNAME=Password %2$s the user id '%1$s'.
+PasswordPolicy.ILLEGAL_USERNAME_REVERSED=Password %2$s the user id '%1$s' in reverse.
+PasswordPolicy.ILLEGAL_WHITESPACE=Password %2$s a whitespace character.
+PasswordPolicy.ILLEGAL_NUMBER_RANGE=Password %2$s the number '%1$s'.
+PasswordPolicy.ILLEGAL_REPEATED_CHARS=Password contains %3$s sequences of %1$s or more repeated characters, but only %2$s allowed: %4$s.
+PasswordPolicy.INSUFFICIENT_UPPERCASE=Password must contain %1$s or more uppercase characters.
+PasswordPolicy.INSUFFICIENT_LOWERCASE=Password must contain %1$s or more lowercase characters.
+PasswordPolicy.INSUFFICIENT_ALPHABETICAL=Password must contain %1$s or more alphabetical characters.
+PasswordPolicy.INSUFFICIENT_DIGIT=Password must contain %1$s or more digit characters.
+PasswordPolicy.INSUFFICIENT_SPECIAL=Password must contain %1$s or more special characters.
+PasswordPolicy.INSUFFICIENT_CHARACTERISTICS=Password matches %1$s of %3$s character rules, but %2$s are required.
+PasswordPolicy.INSUFFICIENT_COMPLEXITY=Password meets %2$s complexity rules, but %3$s are required.
+PasswordPolicy.INSUFFICIENT_COMPLEXITY_RULES=No rules have been configured for a password of length %1$s.
+PasswordPolicy.SOURCE_VIOLATION=Password cannot be the same as your %1$s password.
+PasswordPolicy.TOO_LONG=Password must be no more than %2$s characters in length.
+PasswordPolicy.TOO_SHORT=Password must be %1$s or more characters in length EN .
+PasswordPolicy.TOO_MANY_OCCURRENCES=Password contains %2$s occurrences of the character '%1$s', but at most %3$s are allowed.

maxkey-core/src/main/resources/messages/passwordpolicy_message_zh_CN.properties

@@ -0,0 +1,30 @@
+#password
+PasswordPolicy.HISTORY_VIOLATION=Password matches one of %1$s previous passwords.
+PasswordPolicy.ILLEGAL_WORD=Password contains the dictionary word '%1$s'.
+PasswordPolicy.ILLEGAL_WORD_REVERSED=Password contains the reversed dictionary word '%1$s'.
+PasswordPolicy.ILLEGAL_DIGEST_WORD=Password contains a dictionary word.
+PasswordPolicy.ILLEGAL_DIGEST_WORD_REVERSED=Password contains a reversed dictionary word.
+PasswordPolicy.ILLEGAL_MATCH=Password matches the illegal pattern '%1$s'.
+PasswordPolicy.ALLOWED_MATCH=Password must match pattern '%1$s'.
+PasswordPolicy.ILLEGAL_CHAR=Password %2$s the illegal character '%1$s'.
+PasswordPolicy.ALLOWED_CHAR=Password %2$s the illegal character '%1$s'.
+PasswordPolicy.ILLEGAL_QWERTY_SEQUENCE=Password contains the illegal QWERTY sequence '%1$s'.
+PasswordPolicy.ILLEGAL_ALPHABETICAL_SEQUENCE=Password contains the illegal alphabetical sequence '%1$s'.
+PasswordPolicy.ILLEGAL_NUMERICAL_SEQUENCE=Password contains the illegal numerical sequence '%1$s'.
+PasswordPolicy.ILLEGAL_USERNAME=Password %2$s the user id '%1$s'.
+PasswordPolicy.ILLEGAL_USERNAME_REVERSED=Password %2$s the user id '%1$s' in reverse.
+PasswordPolicy.ILLEGAL_WHITESPACE=Password %2$s a whitespace character.
+PasswordPolicy.ILLEGAL_NUMBER_RANGE=Password %2$s the number '%1$s'.
+PasswordPolicy.ILLEGAL_REPEATED_CHARS=Password contains %3$s sequences of %1$s or more repeated characters, but only %2$s allowed: %4$s.
+PasswordPolicy.INSUFFICIENT_UPPERCASE=Password must contain %1$s or more uppercase characters.
+PasswordPolicy.INSUFFICIENT_LOWERCASE=Password must contain %1$s or more lowercase characters.
+PasswordPolicy.INSUFFICIENT_ALPHABETICAL=Password must contain %1$s or more alphabetical characters.
+PasswordPolicy.INSUFFICIENT_DIGIT=Password must contain %1$s or more digit characters.
+PasswordPolicy.INSUFFICIENT_SPECIAL=Password must contain %1$s or more special characters.
+PasswordPolicy.INSUFFICIENT_CHARACTERISTICS=Password matches %1$s of %3$s character rules, but %2$s are required.
+PasswordPolicy.INSUFFICIENT_COMPLEXITY=Password meets %2$s complexity rules, but %3$s are required.
+PasswordPolicy.INSUFFICIENT_COMPLEXITY_RULES=No rules have been configured for a password of length %1$s.
+PasswordPolicy.SOURCE_VIOLATION=Password cannot be the same as your %1$s password.
+PasswordPolicy.TOO_LONG=Password must be no more than %2$s characters in length.
+PasswordPolicy.TOO_SHORT=Password must be %1$s {0} or more characters in length \u592A\u77ED ZH.
+PasswordPolicy.TOO_MANY_OCCURRENCES=Password contains %2$s occurrences of the character '%1$s', but at most %3$s are allowed.

maxkey-web-maxkey/src/main/resources/messages/message.properties

@@ -258,34 +258,3 @@ navs.audit=\u5BA1\u8BA1
 navs.audit.login=\u767B\u5F55\u65E5\u5FD7
 navs.audit.signon=\u8BBF\u95EE\u65E5\u5FD7
 navs.audit.operation=\u64CD\u4F5C\u65E5\u5FD7
-
-#password
-HISTORY_VIOLATION=Password matches one of %1$s previous passwords.
-ILLEGAL_WORD=Password contains the dictionary word '%1$s'.
-ILLEGAL_WORD_REVERSED=Password contains the reversed dictionary word '%1$s'.
-ILLEGAL_DIGEST_WORD=Password contains a dictionary word.
-ILLEGAL_DIGEST_WORD_REVERSED=Password contains a reversed dictionary word.
-ILLEGAL_MATCH=Password matches the illegal pattern '%1$s'.
-ALLOWED_MATCH=Password must match pattern '%1$s'.
-ILLEGAL_CHAR=Password %2$s the illegal character '%1$s'.
-ALLOWED_CHAR=Password %2$s the illegal character '%1$s'.
-ILLEGAL_QWERTY_SEQUENCE=Password contains the illegal QWERTY sequence '%1$s'.
-ILLEGAL_ALPHABETICAL_SEQUENCE=Password contains the illegal alphabetical sequence '%1$s'.
-ILLEGAL_NUMERICAL_SEQUENCE=Password contains the illegal numerical sequence '%1$s'.
-ILLEGAL_USERNAME=Password %2$s the user id '%1$s'.
-ILLEGAL_USERNAME_REVERSED=Password %2$s the user id '%1$s' in reverse.
-ILLEGAL_WHITESPACE=Password %2$s a whitespace character.
-ILLEGAL_NUMBER_RANGE=Password %2$s the number '%1$s'.
-ILLEGAL_REPEATED_CHARS=Password contains %3$s sequences of %1$s or more repeated characters, but only %2$s allowed: %4$s.
-INSUFFICIENT_UPPERCASE=Password must contain %1$s or more uppercase characters.
-INSUFFICIENT_LOWERCASE=Password must contain %1$s or more lowercase characters.
-INSUFFICIENT_ALPHABETICAL=Password must contain %1$s or more alphabetical characters.
-INSUFFICIENT_DIGIT=Password must contain %1$s or more digit characters.
-INSUFFICIENT_SPECIAL=Password must contain %1$s or more special characters.
-INSUFFICIENT_CHARACTERISTICS=Password matches %1$s of %3$s character rules, but %2$s are required.
-INSUFFICIENT_COMPLEXITY=Password meets %2$s complexity rules, but %3$s are required.
-INSUFFICIENT_COMPLEXITY_RULES=No rules have been configured for a password of length %1$s.
-SOURCE_VIOLATION=Password cannot be the same as your %1$s password.
-TOO_LONG=Password must be no more than %2$s characters in length.
-TOO_SHORT=Password must be %1$s or more characters in length \u592A\u77ED.
-TOO_MANY_OCCURRENCES=Password contains %2$s occurrences of the character '%1$s', but at most %3$s are allowed.

maxkey-web-maxkey/src/main/resources/messages/message_en.properties

@@ -260,34 +260,3 @@ navs.audit=Audit
 navs.audit.login=Login
 navs.audit.signon=Sign-on
 navs.audit.operation=Operation
-
-#password
-HISTORY_VIOLATION=Password matches one of %1$s previous passwords.
-ILLEGAL_WORD=Password contains the dictionary word '%1$s'.
-ILLEGAL_WORD_REVERSED=Password contains the reversed dictionary word '%1$s'.
-ILLEGAL_DIGEST_WORD=Password contains a dictionary word.
-ILLEGAL_DIGEST_WORD_REVERSED=Password contains a reversed dictionary word.
-ILLEGAL_MATCH=Password matches the illegal pattern '%1$s'.
-ALLOWED_MATCH=Password must match pattern '%1$s'.
-ILLEGAL_CHAR=Password %2$s the illegal character '%1$s'.
-ALLOWED_CHAR=Password %2$s the illegal character '%1$s'.
-ILLEGAL_QWERTY_SEQUENCE=Password contains the illegal QWERTY sequence '%1$s'.
-ILLEGAL_ALPHABETICAL_SEQUENCE=Password contains the illegal alphabetical sequence '%1$s'.
-ILLEGAL_NUMERICAL_SEQUENCE=Password contains the illegal numerical sequence '%1$s'.
-ILLEGAL_USERNAME=Password %2$s the user id '%1$s'.
-ILLEGAL_USERNAME_REVERSED=Password %2$s the user id '%1$s' in reverse.
-ILLEGAL_WHITESPACE=Password %2$s a whitespace character.
-ILLEGAL_NUMBER_RANGE=Password %2$s the number '%1$s'.
-ILLEGAL_REPEATED_CHARS=Password contains %3$s sequences of %1$s or more repeated characters, but only %2$s allowed: %4$s.
-INSUFFICIENT_UPPERCASE=Password must contain %1$s or more uppercase characters.
-INSUFFICIENT_LOWERCASE=Password must contain %1$s or more lowercase characters.
-INSUFFICIENT_ALPHABETICAL=Password must contain %1$s or more alphabetical characters.
-INSUFFICIENT_DIGIT=Password must contain %1$s or more digit characters.
-INSUFFICIENT_SPECIAL=Password must contain %1$s or more special characters.
-INSUFFICIENT_CHARACTERISTICS=Password matches %1$s of %3$s character rules, but %2$s are required.
-INSUFFICIENT_COMPLEXITY=Password meets %2$s complexity rules, but %3$s are required.
-INSUFFICIENT_COMPLEXITY_RULES=No rules have been configured for a password of length %1$s.
-SOURCE_VIOLATION=Password cannot be the same as your %1$s password.
-TOO_LONG=Password must be no more than %2$s characters in length.
-TOO_SHORT=Password must be %1$s or more characters in length.
-TOO_MANY_OCCURRENCES=Password contains %2$s occurrences of the character '%1$s', but at most %3$s are allowed.

maxkey-web-maxkey/src/main/resources/messages/message_zh_CN.properties

@@ -258,34 +258,3 @@ navs.audit=\u5BA1\u8BA1
 navs.audit.login=\u767B\u5F55\u65E5\u5FD7
 navs.audit.signon=\u8BBF\u95EE\u65E5\u5FD7
 navs.audit.operation=\u64CD\u4F5C\u65E5\u5FD7
-
-#password
-HISTORY_VIOLATION=Password matches one of %1$s previous passwords.
-ILLEGAL_WORD=Password contains the dictionary word '%1$s'.
-ILLEGAL_WORD_REVERSED=Password contains the reversed dictionary word '%1$s'.
-ILLEGAL_DIGEST_WORD=Password contains a dictionary word.
-ILLEGAL_DIGEST_WORD_REVERSED=Password contains a reversed dictionary word.
-ILLEGAL_MATCH=Password matches the illegal pattern '%1$s'.
-ALLOWED_MATCH=Password must match pattern '%1$s'.
-ILLEGAL_CHAR=Password %2$s the illegal character '%1$s'.
-ALLOWED_CHAR=Password %2$s the illegal character '%1$s'.
-ILLEGAL_QWERTY_SEQUENCE=Password contains the illegal QWERTY sequence '%1$s'.
-ILLEGAL_ALPHABETICAL_SEQUENCE=Password contains the illegal alphabetical sequence '%1$s'.
-ILLEGAL_NUMERICAL_SEQUENCE=Password contains the illegal numerical sequence '%1$s'.
-ILLEGAL_USERNAME=Password %2$s the user id '%1$s'.
-ILLEGAL_USERNAME_REVERSED=Password %2$s the user id '%1$s' in reverse.
-ILLEGAL_WHITESPACE=Password %2$s a whitespace character.
-ILLEGAL_NUMBER_RANGE=Password %2$s the number '%1$s'.
-ILLEGAL_REPEATED_CHARS=Password contains %3$s sequences of %1$s or more repeated characters, but only %2$s allowed: %4$s.
-INSUFFICIENT_UPPERCASE=Password must contain %1$s or more uppercase characters.
-INSUFFICIENT_LOWERCASE=Password must contain %1$s or more lowercase characters.
-INSUFFICIENT_ALPHABETICAL=Password must contain %1$s or more alphabetical characters.
-INSUFFICIENT_DIGIT=Password must contain %1$s or more digit characters.
-INSUFFICIENT_SPECIAL=Password must contain %1$s or more special characters.
-INSUFFICIENT_CHARACTERISTICS=Password matches %1$s of %3$s character rules, but %2$s are required.
-INSUFFICIENT_COMPLEXITY=Password meets %2$s complexity rules, but %3$s are required.
-INSUFFICIENT_COMPLEXITY_RULES=No rules have been configured for a password of length %1$s.
-SOURCE_VIOLATION=Password cannot be the same as your %1$s password.
-TOO_LONG=Password must be no more than %2$s characters in length.
-TOO_SHORT=Password must be %1$s or more characters in length \u592A\u77ED.
-TOO_MANY_OCCURRENCES=Password contains %2$s occurrences of the character '%1$s', but at most %3$s are allowed.