Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 12:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_10.4'

Browse Source
This commit is contained in:
Ryan Kurtz 2023-09-21 11:36:39 -04:00
commit 326cd78031
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/extensions/ExtensionTableProvider.java
View File

@ -166,6 +166,16 @@ public class ExtensionTableProvider extends DialogComponentProvider {
private boolean installExtensions(List<File> files) {
boolean didInstall = false;
for (File file : files) {
// A sanity check for users that try to install an extension from a source folder
// instead of a fully built extension.
if (new File(file, "build.gradle").isFile()) {
Msg.showWarn(this, null, "Invalid Extension", "The selected extension " +
"contains a 'build.gradle' file.\nGhidra does not support installing " +
"extensions in source form.\nPlease build the extension and try again.");
continue;
}
boolean success = ExtensionUtils.install(file);
didInstall |= success;
}
@ -200,7 +210,7 @@ public class ExtensionTableProvider extends DialogComponentProvider {
}
/**
* Filter for a {@link GhidraFileChooser} that restricts selection to those files that are
* Filter for a {@link GhidraFileChooser} that restricts selection to those files that are
* Ghidra Extensions (zip files with an extension.properties file) or folders.
*/
private class ExtensionFileFilter implements GhidraFileFilter {

26
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/extensions/ExtensionUtils.java
View File

@ -54,9 +54,9 @@ import utility.application.ApplicationLayout;
* </ul>
*
* <p>
* Extensions may be installed/uninstalled by users at runtime, using the
* {@link ExtensionTableProvider}. Installation consists of unzipping the extension archive to an
* installation folder, currently <code>{ghidra user settings dir}/Extensions</code>. To uninstall,
* Extensions may be installed/uninstalled by users at runtime, using the
* {@link ExtensionTableProvider}. Installation consists of unzipping the extension archive to an
* installation folder, currently <code>{ghidra user settings dir}/Extensions</code>. To uninstall,
* the unpacked folder is simply removed.
*/
public class ExtensionUtils {
@ -71,7 +71,7 @@ public class ExtensionUtils {
private static final Logger log = LogManager.getLogger(ExtensionUtils.class);
/**
* Performs extension maintenance. This should be called at startup, before any plugins or
* Performs extension maintenance. This should be called at startup, before any plugins or
* extension points are loaded.
*/
public static void initializeExtensions() {
@ -87,7 +87,7 @@ public class ExtensionUtils {
/**
* Gets all known extensions that have not been marked for removal.
*
*
* @return set of installed extensions
*/
public static Set<ExtensionDetails> getActiveInstalledExtensions() {
@ -148,8 +148,8 @@ public class ExtensionUtils {
/**
* Returns all archive extensions. These are all the extensions found in
* {@link ApplicationLayout#getExtensionArchiveDir}. This are added to an installation as
* part of the build processes.
* {@link ApplicationLayout#getExtensionArchiveDir}. This are added to an installation as
* part of the build processes.
* <p>
* Archived extensions may be zip files and directories.
*
@ -221,7 +221,7 @@ public class ExtensionUtils {
}
/**
* Installs the given extension file. This can be either an archive (zip) or a directory that
* Installs the given extension file. This can be either an archive (zip) or a directory that
* contains an extension.properties file.
*
* @param file the extension to install
@ -513,9 +513,9 @@ public class ExtensionUtils {
}
if (file.isDirectory() && file.canRead()) {
File[] files = file.listFiles(f -> f.getName().equals(PROPERTIES_FILE_NAME));
if (files != null && files.length == 1) {
return tryToLoadExtensionFromProperties(files[0]);
File propertyFile = new File(file, PROPERTIES_FILE_NAME);
if (propertyFile.isFile()) {
return tryToLoadExtensionFromProperties(propertyFile);
}
}
@ -576,7 +576,7 @@ public class ExtensionUtils {
* Searching the child directories of a directory allows clients to pick an extension parent
* directory that contains multiple extension directories.
*
* @param installDir the directory that contains extension subdirectories
* @param installDir the directory that contains extension subdirectories
* @return list of extension.properties files
*/
private static List<File> findExtensionPropertyFiles(File installDir) {
@ -597,7 +597,7 @@ public class ExtensionUtils {
}
/**
* Returns an extension.properties or extension.properties.uninstalled file if the given
* Returns an extension.properties or extension.properties.uninstalled file if the given
* directory contains one.
*
* @param dir the directory to search