Skip to content

prevent profile imports overwriting other profiles #6502

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

Merged
Wide-Cat merged 2 commits into from
Jul 2, 2026
+28 −8
Merged

prevent profile imports overwriting other profiles #6502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5b003b
prevent profile imports overwriting other profiles
noramibu Jul 2, 2026
4bb1a09
prevent profile path escape
noramibu Jul 2, 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
13 changes: 8 additions & 5 deletions src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/ProfilesTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,17 @@ private Profile importProfile() throws IOException {
CompoundTag nbt = NbtIo.read(profileFile.toPath());

Profile p = new Profile();
p.name.set(nbt.getStringOr("name", profileFile.getName()));
if (!p.name.set(nbt.getStringOr("name", profileFile.getName()))) return null;
File profileFolder = p.getSafeFile();
if (profileFolder == null) return null;
//noinspection ResultOfMethodCallIgnored
p.getFile().mkdirs();
profileFolder.mkdirs();

nbt.remove("name");
for (var entry : nbt.entrySet()) {
String filename = entry.getKey();
if (!filename.endsWith(".nbt")) continue;
if (filename.contains("/") || filename.contains("\\") || new File(filename).isAbsolute()) continue;

switch (filename) {
case "hud.nbt" -> p.hud.set(true);
Expand All @@ -166,8 +169,8 @@ private Profile importProfile() throws IOException {
}
}

File f = new File(p.getFile(), filename).getCanonicalFile();
if (!f.toPath().startsWith(Profiles.FOLDER.getCanonicalFile().toPath())) continue;
File f = new File(profileFolder, filename).getCanonicalFile();
if (!f.toPath().startsWith(profileFolder.toPath())) continue;

NbtIo.writeUnnamedTagWithFallback(entry.getValue(), new DataOutputStream(new FileOutputStream(f)));
}
Expand Down Expand Up @@ -212,7 +215,7 @@ public void initWidgets() {

WButton save = add(theme.button(isNew ? "Create" : "Save")).expandX().widget();
save.action = () -> {
if (profile.name.get().isEmpty()) return;
if (profile.getSafeFile() == null) return;

if (isNew) {
for (Profile p : Profiles.get()) {
Expand Down
23 changes: 20 additions & 3 deletions src/main/java/meteordevelopment/meteorclient/systems/profiles/Profile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ public Profile(Tag tag) {
}

public void load() {
File folder = getFile();
File folder = getSafeFile();
if (folder == null) return;

if (hud.get()) Hud.get().load(folder);
if (macros.get()) Macros.get().load(folder);
Expand All @@ -87,7 +88,8 @@ public void load() {
}

public void save() {
File folder = getFile();
File folder = getSafeFile();
if (folder == null) return;

if (hud.get()) Hud.get().save(folder);
if (macros.get()) Macros.get().save(folder);
Expand All @@ -97,7 +99,8 @@ public void save() {

public void delete() {
try {
FileUtils.deleteDirectory(getFile());
File folder = getSafeFile();
if (folder != null) FileUtils.deleteDirectory(folder);
} catch (IOException e) {
MeteorClient.LOG.error("Error deleting profile {}", name.get(), e);
}
Expand All @@ -107,6 +110,20 @@ public File getFile() {
return new File(Profiles.FOLDER, name.get());
}

public File getSafeFile() {
try {
File folder = getFile().getCanonicalFile();
File profilesFolder = Profiles.FOLDER.getCanonicalFile();

if (name.get().isEmpty() || !profilesFolder.equals(folder.getParentFile())) return null;

return folder;
} catch (IOException e) {
MeteorClient.LOG.error("Error resolving profile {}", name.get(), e);
return null;
}
}

@Override
public CompoundTag toTag() {
CompoundTag tag = new CompoundTag();
Expand Down
Loading