yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 02:09:44 +02:00
Code Issues Releases Wiki Activity

GT-3547 - Patch dir fix to allow loading of extension points

Browse source
This commit is contained in:
dragonmacher 2020-02-14 17:08:21 -05:00
parent 3c8f2bdeff
commit 3dced733df
9 changed files with 175 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraClassLoader.java
View file

@ -31,7 +31,7 @@ import ghidra.util.Msg;
*
*/
public class GhidraClassLoader extends URLClassLoader {
private static final String CP = "java.class.path";
/**
@ -45,7 +45,7 @@ public class GhidraClassLoader extends URLClassLoader {
}
@Override
public void addURL(URL url) {
public void addURL(URL url) {
super.addURL(url);
try {
System.setProperty(CP,
@ -56,6 +56,23 @@ public class GhidraClassLoader extends URLClassLoader {
}
}
/**
* Places the given path first in the classpath
* @param path the path
*/
void prependPath(String path) {
try {
URL url = new File(path).toURI().toURL();
super.addURL(url);
File file = new File(url.toURI());
System.setProperty(CP, file + File.pathSeparator + System.getProperty(CP));
}
catch (MalformedURLException | URISyntaxException e) {
Msg.debug(this, "Invalid path: " + path, e);
}
}
/**
* Converts the specified path to a {@link URL} and adds it to the classpath.
*

43
Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
View file

@ -50,6 +50,7 @@ public class GhidraLauncher {
// Get application layout
GhidraApplicationLayout layout = new GhidraApplicationLayout();
GhidraClassLoader loader = (GhidraClassLoader) ClassLoader.getSystemClassLoader();
// Build the classpath
List<String> classpathList = new ArrayList<String>();
@ -60,13 +61,12 @@ public class GhidraLauncher {
addExternalJarPaths(classpathList, layout.getApplicationRootDirs());
}
else {
addPatchPaths(classpathList, layout.getApplicationInstallationDir());
addPatchJarPaths(loader, layout.getApplicationInstallationDir());
addModuleJarPaths(classpathList, modules);
}
classpathList = orderClasspath(classpathList, modules);
// Add the classpath to the class loader
GhidraClassLoader loader = (GhidraClassLoader) ClassLoader.getSystemClassLoader();
classpathList.forEach(entry -> loader.addPath(entry));
// Make sure the thing to launch is a GhidraLaunchable
@ -83,17 +83,28 @@ public class GhidraLauncher {
}
/**
* Add patch jars to the given path list. This should be done first so they take precedence in
* the classpath.
* Add patch dir and jars to the given path list. This should be done first so they take
* precedence in the classpath.
*
* @param pathList The list of paths to add to.
* @param loader The loader to which paths will be added.
* @param installDir The application installation directory.
*/
private static void addPatchPaths(List<String> pathList, ResourceFile installDir) {
private static void addPatchJarPaths(GhidraClassLoader loader, ResourceFile installDir) {
ResourceFile patchDir = new ResourceFile(installDir, "Ghidra/patch");
if (patchDir.exists()) {
pathList.addAll(findJarsInDir(patchDir));
if (!patchDir.exists()) {
return;
}
List<String> patchJars = findJarsInDir(patchDir);
Collections.sort(patchJars);
// add in reverse order, since we are prepending
for (int i = patchJars.size() - 1; i >= 0; i--) {
loader.prependPath(patchJars.get(i));
}
// put last; paths are prepended in list order
loader.prependPath(patchDir.getAbsolutePath());
}
/**
@ -103,8 +114,8 @@ public class GhidraLauncher {
* @param modules The modules to get the bin directories of.
*/
private static void addModuleBinPaths(List<String> pathList, Map<String, GModule> modules) {
ModuleUtilities.getModuleBinDirectories(modules).forEach(
d -> pathList.add(d.getAbsolutePath()));
Collection<ResourceFile> dirs = ModuleUtilities.getModuleBinDirectories(modules);
dirs.forEach(d -> pathList.add(d.getAbsolutePath()));
}
/**
@ -114,8 +125,8 @@ public class GhidraLauncher {
* @param modules The modules to get the jars of.
*/
private static void addModuleJarPaths(List<String> pathList, Map<String, GModule> modules) {
ModuleUtilities.getModuleLibDirectories(modules).forEach(
d -> pathList.addAll(findJarsInDir(d)));
Collection<ResourceFile> dirs = ModuleUtilities.getModuleLibDirectories(modules);
dirs.forEach(d -> pathList.addAll(findJarsInDir(d)));
}
/**
@ -260,10 +271,10 @@ public class GhidraLauncher {
Map<String, GModule> modules) {
Set<String> fatJars = modules
.values()
.stream()
.flatMap(m -> m.getFatJars().stream())
.collect(Collectors.toSet());
.values()
.stream()
.flatMap(m -> m.getFatJars().stream())
.collect(Collectors.toSet());
List<String> orderedList = new ArrayList<String>(pathList);