-
-
Notifications
You must be signed in to change notification settings - Fork 81
Reject invalid usernames from Votifier votes #1533
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
VotingPlugin/src/main/java/com/bencodez/votingplugin/util/MinecraftUsernameValidator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package com.bencodez.votingplugin.util; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Validates Java Edition player names received from external vote sources. | ||
| */ | ||
| public final class MinecraftUsernameValidator { | ||
| private static final int MAX_LENGTH = 16; | ||
| private static final int MAX_LOG_LENGTH = 32; | ||
| private static final Pattern VALID_USERNAME = Pattern.compile("[A-Za-z0-9_]{1," + MAX_LENGTH + "}"); | ||
|
|
||
| private MinecraftUsernameValidator() { | ||
| } | ||
|
|
||
| /** | ||
| * Tests whether a value uses the Minecraft Java username syntax. | ||
| * | ||
| * @param username username supplied by an external source | ||
| * @return {@code true} for a 1-16 character ASCII letter, digit, or underscore | ||
| */ | ||
| public static boolean isValid(String username) { | ||
| return username != null && VALID_USERNAME.matcher(username).matches(); | ||
| } | ||
|
|
||
| /** | ||
| * Produces a bounded, single-line representation safe to include in logs. | ||
| * | ||
| * @param value untrusted external value | ||
| * @return sanitized value | ||
| */ | ||
| public static String sanitizeForLog(String value) { | ||
| if (value == null) { | ||
| return "<null>"; | ||
| } | ||
|
|
||
| StringBuilder sanitized = new StringBuilder(Math.min(value.length(), MAX_LOG_LENGTH)); | ||
| int length = Math.min(value.length(), MAX_LOG_LENGTH); | ||
| for (int i = 0; i < length; i++) { | ||
| char character = value.charAt(i); | ||
| if ((character >= 'A' && character <= 'Z') || (character >= 'a' && character <= 'z') | ||
| || (character >= '0' && character <= '9') || character == '_') { | ||
| sanitized.append(character); | ||
| } else { | ||
| sanitized.append('?'); | ||
| } | ||
| } | ||
| if (value.length() > MAX_LOG_LENGTH) { | ||
| sanitized.append("..."); | ||
| } | ||
| return sanitized.toString(); | ||
| } | ||
| } | ||
27 changes: 27 additions & 0 deletions
27
...gPlugin/src/test/java/com/bencodez/votingplugin/tests/MinecraftUsernameValidatorTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package com.bencodez.votingplugin.tests; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import com.bencodez.votingplugin.util.MinecraftUsernameValidator; | ||
|
|
||
| class MinecraftUsernameValidatorTest { | ||
|
|
||
| @Test | ||
| void acceptsValidMinecraftUsernames() { | ||
| for (String username : new String[] { "MchtName15Chars", "MchtNameOver16xx", "Player_123" }) { | ||
| assertTrue(MinecraftUsernameValidator.isValid(username), username); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| void rejectsInvalidMinecraftUsernames() { | ||
| for (String username : new String[] { "MchtNameOver16xxx", "../MchtTraversal", "Mcht/Slash", "Mcht\\Slash", | ||
| "Mcht Space", "Mcht\tTab", "Mcht\nLine", "Mcht\u0000Control", "Mcht- punctuation", | ||
| "Mcht\u00E9Unicode", "\uD800" }) { | ||
| assertFalse(MinecraftUsernameValidator.isValid(username), username); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the documented default
BedrockPlayerPrefix: '.'is used, a valid Bedrock vote such as.Playerfails this Java-only pattern, so both new ingress checks reject it before the existing Bedrock-aware resolution runs; proxy cache or multi-proxy replays containing the resolved prefixed name are rejected as well. Recognize and validate the configured prefix plus base name, or delegate validation to the existing Bedrock-aware validation path.Useful? React with 👍 / 👎.