Skip to content

Allow users to configure the allowed characters regular expression. #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfoucher wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −1
Open

Allow users to configure the allowed characters regular expression. #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/lenis0012/bukkit/loginsecurity/LoginSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.lenis0012.pluginutils.config.mapping.ConfigKey;
import com.lenis0012.pluginutils.config.mapping.ConfigMapper;
import lombok.Getter;
import org.bukkit.Bukkit;

@Getter
@ConfigMapper(fileName = "config.yml", header = {
Expand Down Expand Up @@ -70,6 +71,8 @@ public class LoginSecurityConfig extends AbstractConfig {
})
@ConfigKey(path="username.filter-special-chars")
private boolean filterSpecialChars = true;
@ConfigKey(path="username.filter-regex")
private String filterRegex = "[^a-zA-Z0-9_]";
@ConfigKey(path="username.min-length")
private int usernameMinLength = 3;
@ConfigKey(path="username.max-length")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/lenis0012/bukkit/loginsecurity/modules/general/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
// Verify name
final String name = event.getName();
final LoginSecurityConfig config = LoginSecurity.getConfiguration();
if(config.isFilterSpecialChars() && !name.replaceAll("[^a-zA-Z0-9_]", "").equals(name)) {
if(config.isFilterSpecialChars() && !name.replaceAll(config.getFilterRegex(), "").equals(name)) {
event.setLoginResult(Result.KICK_OTHER);
event.setKickMessage("[LoginSecurity] " + translate(KICK_USERNAME_CHARS));
return;
Expand Down