Skip to content
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

Jump to bottom

Fix filename sanitization in ClientCacheManager #2339

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Fix filename sanitization in ClientCacheManager #2339

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
9 changes: 7 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/integration/map/ClientCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,16 @@ public class ClientCacheManager {
private static final Reference2ObjectMap<IClientCache, ClientCacheInfo> caches = new Reference2ObjectArrayMap<>();
private static boolean shouldInit = true;

private static String sanitizeFilename(String input) {
return input.replaceAll("(?U)[^\\w-]+", "_").trim();
}

public static void init(String worldId) {
if (shouldInit) {
final Player player = Minecraft.getInstance().player;
worldFolder = new File(clientCacheDir, player.getName().getString() + "_" + player.getUUID() +
File.separator + worldId);
worldFolder = new File(clientCacheDir,
sanitizeFilename(player.getName().getString()) + "_" + player.getUUID() +
File.separator + sanitizeFilename(worldId));
worldFolder.mkdirs();
// to ensure any cache data that might somehow be lying around gets dealt with
clearCaches();
Expand Down
Loading