development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-16 07:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

clarify and discourage access to compiled scripts

Browse source
This commit is contained in:
Jason P. Leasure 2020-03-26 10:45:19 -04:00
parent c106e0e02b
commit c660a12ab3
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Ghidra/Features/Base/src/main/java/ghidra/app/script/GhidraScriptUtil.java
View file

@ -25,7 +25,6 @@ import org.apache.commons.collections4.map.LazyMap;
import docking.widgets.bundlemanager.BundlePath;
import generic.jar.ResourceFile;
import ghidra.app.script.osgi.SourceBundleInfo;
import ghidra.framework.Application;
import ghidra.program.model.listing.Program;
import ghidra.util.Msg;
@ -193,16 +192,6 @@ public class GhidraScriptUtil {
return null;
}
/**
* Returns the output directory to which the given script file's generated .class file should
* be written
* @param scriptFile the script file
* @return the directory
*/
public static ResourceFile getScriptCompileOutputDirectory(ResourceFile scriptFile) {
return new ResourceFile(SourceBundleInfo.getBindirFromScriptFile(scriptFile).toFile());
}
public static Path getOsgiDir() {
Path usersettings = Application.getUserSettingsDirectory().toPath();
return usersettings.resolve("osgi");
@ -213,15 +202,13 @@ public class GhidraScriptUtil {
}
/**
* Returns the list of directories to which scripts are compiled.
* Returns the list of exploded bundle directories
* @return the list
*
* @see #getScriptCompileOutputDirectory(ResourceFile)
*
* @deprecated class files shouldn't be accessed directly
* @deprecated accessing class file directly precludes OSGi wiring according to requirements and capabilities
*/
@Deprecated
public static List<ResourceFile> getScriptBinDirectories() {
public static List<ResourceFile> getExplodedBundlePaths() {
try {
return Files.list(getOsgiDir()).filter(Files::isDirectory).map(
x -> new ResourceFile(x.toFile())).collect(Collectors.toList());

2
Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java
View file

@ -138,7 +138,7 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter {
systemState.path.append(Py.newString(resourceFile.getFile(false).getAbsolutePath()));
}
for (ResourceFile resourceFile : GhidraScriptUtil.getScriptBinDirectories()) {
for (ResourceFile resourceFile : GhidraScriptUtil.getExplodedBundlePaths()) {
systemState.path.append(Py.newString(resourceFile.getFile(false).getAbsolutePath()));
}