From 7c48cf59c7bb23b7c4cd23b82acc6c976d5ac4ac Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sat, 15 Jul 2017 19:38:05 +0200 Subject: [PATCH] Make default regex for password characters more user-friendly (#1285) - Change regex pattern per input of @sgdc3 - Add clarifying comments --- docs/config.md | 10 ++++++---- .../settings/properties/RestrictionSettings.java | 8 ++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/config.md b/docs/config.md index 554eb5f85..47744c22e 100644 --- a/docs/config.md +++ b/docs/config.md @@ -1,5 +1,5 @@ - + ## AuthMe Configuration The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder, @@ -197,8 +197,10 @@ settings: maxJoinPerIp: 0 # AuthMe will NEVER teleport players if set to true! noTeleport: false - # Regex syntax for allowed chars in passwords - allowedPasswordCharacters: '[\x21-\x7E]*' + # Regex syntax for allowed chars in passwords. The default [!-~] allows all visible ASCII + # characters, which is what we recommend. See also http://asciitable.com + # You can test your regex with https://regex101.com + allowedPasswordCharacters: '[!-~]*' # Threshold of the other accounts command, a value less than 2 means disabled. otherAccountsCmdThreshold: 0 # Command to run when a user has more accounts than the configured threshold. @@ -532,4 +534,4 @@ To change settings on a running server, save your changes to config.yml and use --- -This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Mon Jul 10 21:39:00 CEST 2017 +This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Jul 15 19:32:28 CEST 2017 diff --git a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java index 1a3de299d..e2c1265da 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/RestrictionSettings.java @@ -156,9 +156,13 @@ public final class RestrictionSettings implements SettingsHolder { public static final Property NO_TELEPORT = newProperty("settings.restrictions.noTeleport", false); - @Comment("Regex syntax for allowed chars in passwords") + @Comment({ + "Regex syntax for allowed chars in passwords. The default [!-~] allows all visible ASCII", + "characters, which is what we recommend. See also http://asciitable.com", + "You can test your regex with https://regex101.com" + }) public static final Property ALLOWED_PASSWORD_REGEX = - newProperty("settings.restrictions.allowedPasswordCharacters", "[\\x21-\\x7E]*"); + newProperty("settings.restrictions.allowedPasswordCharacters", "[!-~]*"); @Comment("Force survival gamemode when player joins?") public static final Property FORCE_SURVIVAL_MODE =