Skip to content

Fix URL whitelist bypass and server-side validation issues #87

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
pau101 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix URL whitelist bypass and server-side validation issues #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19c1afb
fix: use exact base URL matching for whitelist check
pau101 Mar 7, 2026
2e850de
fix: reject URLs with missing host
pau101 Mar 7, 2026
0010249
fix: clamp duration to prevent arbitrary values
pau101 Mar 7, 2026
a7392df
fix: prevent locked disc modification bypass
pau101 Mar 7, 2026
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
19 changes: 16 additions & 3 deletions src/main/java/com/vinurl/net/ClientEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,23 @@ public static void register() {
BlockPos pos = message.pos();
String url = message.url();
boolean loop = message.loop();
String fileName = SoundManager.getFileName(url);

if (client.player == null || url.isEmpty()) {return;}

URI uri;

try {
uri = new URI(url);
} catch (Exception ignored) {
return;
}

String scheme = uri.getScheme();
String host = uri.getHost();
if (scheme == null || host == null) {return;}

String fileName = SoundManager.getFileName(url);

SoundManager.addSound(fileName, pos, loop);

if (Executable.YT_DLP.isProcessRunning(fileName + "/download")) {
Expand All @@ -41,9 +54,9 @@ public static void register() {
}

if (CONFIG.downloadEnabled()) {
String baseURL = URI.create(url).getScheme() + "://" + URI.create(url).getHost();
String baseURL = scheme + "://" + host;

if (CONFIG.urlWhitelist().stream().anyMatch(url::startsWith)) {
if (CONFIG.urlWhitelist().contains(baseURL)) {
SoundManager.downloadSound(url, fileName);
SoundManager.queueSound(fileName, pos);
return;
Expand Down
16 changes: 14 additions & 2 deletions src/main/java/com/vinurl/net/ServerEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

public class ServerEvent {
public static final int MAX_URL_LENGTH = 400;
public static final int MIN_DURATION = 0;
public static final int MAX_DURATION = 3600;

public static void register() {
NETWORK_CHANNEL.registerClientboundDeferred(ClientEvent.GUIRecord.class);
Expand All @@ -39,10 +41,20 @@ public static void register() {
return;
}

CompoundTag existingTag = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY).copyTag();
if (existingTag.get(LOCK_KEY)) {
player.displayClientMessage(Component.translatable("item.vinurl.custom_record.message.locked"), true);
return;
}

String url;

try {
url = new URI(message.url()).toURL().toString();
URI uri = new URI(message.url());
if (uri.getHost() == null) {
throw new IllegalArgumentException("Missing host");
}
url = uri.toURL().toString();
} catch (Exception e) {
player.displayClientMessage(Component.translatable("message.vinurl.custom_record.url.invalid"), true);
return;
Expand All @@ -55,7 +67,7 @@ public static void register() {

CompoundTag tag = new CompoundTag();
tag.put(URL_KEY, url);
tag.put(DURATION_KEY, message.duration());
tag.put(DURATION_KEY, Math.clamp(message.duration(), MIN_DURATION, MAX_DURATION));
tag.put(LOOP_KEY, message.loop());
tag.put(LOCK_KEY, message.lock());
stack.set(DataComponents.CUSTOM_DATA, CustomData.of(tag));
Expand Down