Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-27 09:47:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-6455: Check to make sure we aren't unzipping theme zip files to

Browse Source 
outside the user settings directory
This commit is contained in:
Ryan Kurtz
2026-02-17 19:56:47 -05:00
parent 8c707e5ed3
commit d691787776
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Gui/src/main/java/generic/theme/ThemeReader.java
+6 -2
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +24,7 @@ import org.apache.commons.io.FileUtils;
import ghidra.framework.Application; import ghidra.framework.Application;
import ghidra.util.Msg; import ghidra.util.Msg;
import utilities.util.FileUtilities;
/** /**
* Reads Themes from a file or {@link Reader} * Reads Themes from a file or {@link Reader}
@@ -138,6 +139,9 @@ class ThemeReader extends AbstractThemeReader {
String relativePath = path.substring(indexOf, path.length()); String relativePath = path.substring(indexOf, path.length());
File dir = Application.getUserSettingsDirectory(); File dir = Application.getUserSettingsDirectory();
File iconFile = new File(dir, relativePath); File iconFile = new File(dir, relativePath);
if (!FileUtilities.isPathContainedWithin(dir, iconFile)) {
throw new IOException("Zip entry escapes target directory: " + relativePath);
}
FileUtils.copyInputStreamToFile(is, iconFile); FileUtils.copyInputStreamToFile(is, iconFile);
} }