This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit f75e5621b7e191010ee2c4ccb4e2798cd4cf2f28 Author: Juan Pablo Santos RodrÃguez <[email protected]> AuthorDate: Thu Jan 13 11:22:58 2022 +0100 remove unneeded escapes --- jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java index f2a33d3..acad13b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/InputValidator.java @@ -49,8 +49,8 @@ public final class InputValidator { * @since 2.4.82 */ static final Pattern ID_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"'<>;&\\xff{}]" ); - static final Pattern EMAIL_PATTERN = Pattern.compile( "^[0-9a-zA-Z-_\\.\\+]+@([0-9a-zA-Z-_]+\\.)+[a-zA-Z]+$" ); - static final Pattern UNSAFE_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"':<>\\[\\];#&@\\xff{}\\$%\\\\]" ); + static final Pattern EMAIL_PATTERN = Pattern.compile( "^[0-9a-zA-Z-_.+]+@([0-9a-zA-Z-_]+\\.)+[a-zA-Z]+$" ); + static final Pattern UNSAFE_PATTERN = Pattern.compile( "[\\x00\\r\\n\\x0f\"':<>\\[\\];#&@\\xff{}$%\\\\]" ); private final String m_form; private final Session m_session; @@ -125,7 +125,7 @@ public final class InputValidator { if ( !valid ) { // MessageTag already invokes replaceEntities() // Object[] args = { label, ""'<>;&[]#\\@{}%$" }; - final Object[] args = { label, "\'\"<>;&[]#\\@{}%$" }; + final Object[] args = { label, "'\"<>;&[]#\\@{}%$" }; m_session.addMessage( m_form, MessageFormat.format( rb.getString( "validate.unsafechars" ), args ) ); } return valid; @@ -143,7 +143,7 @@ public final class InputValidator { if ( !valid ) { // MessageTag already invokes replaceEntities() // Object[] args = { label, ""'<>;&{}" }; - final Object[] args = { label, "\'\"<>;&{}" }; + final Object[] args = { label, "'\"<>;&{}" }; m_session.addMessage( m_form, MessageFormat.format( rb.getString( "validate.unsafechars" ), args ) ); } return valid;
