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

move weird static call into GhidraScriptAnalyzer class

Browse source
This commit is contained in:
Jason P. Leasure 2020-04-29 13:45:40 -04:00
parent 5f11c9cf7d
commit d79b193d20
2 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,10 +24,8 @@ import generic.jar.ResourceFile;
import ghidra.app.plugin.core.osgi.BundleHost; import ghidra.app.plugin.core.osgi.BundleHost;
import ghidra.app.plugin.core.osgi.OSGiException; import ghidra.app.plugin.core.osgi.OSGiException;
import ghidra.framework.Application; import ghidra.framework.Application;
import ghidra.program.model.listing.Program;
import ghidra.util.Msg; import ghidra.util.Msg;
import ghidra.util.classfinder.ClassSearcher; import ghidra.util.classfinder.ClassSearcher;
import ghidra.util.task.TaskMonitor;
/** /**
* A utility class for managing script directories and ScriptInfo objects. * A utility class for managing script directories and ScriptInfo objects.
@ -357,40 +355,4 @@ public class GhidraScriptUtil {
return null; return null;
} }
/* only used by GhidraScriptAnalyzerAdapter */
/**
* Runs the specified script with the specified state
*
* @param scriptState state representing environment variables that the script is able to access
* @param script Script to be run
* @param writer the writer to which warning and error messages will be written
* @param originator the client class requesting the script run; used for logging
* @param monitor the task monitor
* @return whether the script successfully completed running
*/
@Deprecated
public static boolean runScript(GhidraState scriptState, GhidraScript script,
PrintWriter writer, Object originator, TaskMonitor monitor) {
ResourceFile srcFile = script.getSourceFile();
String scriptName =
srcFile != null ? srcFile.getAbsolutePath() : (script.getClass().getName() + ".class");
try {
Msg.info(originator, "SCRIPT: " + scriptName);
script.execute(scriptState, monitor, writer);
writer.flush();
}
catch (Exception exc) {
Program prog = scriptState.getCurrentProgram();
String path = (prog != null ? prog.getExecutablePath() : "Current program is null.");
String logErrorMsg =
path + "\nREPORT SCRIPT ERROR: " + scriptName + " : " + exc.getMessage();
Msg.error(originator, logErrorMsg, exc);
return false;
}
return true;
}
} }

25
Ghidra/Features/Base/src/main/java/ghidra/framework/analysis/GhidraScriptAnalyzerAdapter.java
View file

@ -70,7 +70,30 @@ public class GhidraScriptAnalyzerAdapter extends AbstractAnalyzer {
Project project = null; Project project = null;
GhidraState scriptState = new GhidraState(null, project, program, loc, selection, null); GhidraState scriptState = new GhidraState(null, project, program, loc, selection, null);
return GhidraScriptUtil.runScript(scriptState, script, writer, this, monitor); return runScript(scriptState, monitor);
}
private boolean runScript(GhidraState scriptState, TaskMonitor monitor) {
ResourceFile srcFile = script.getSourceFile();
String scriptName =
srcFile != null ? srcFile.getAbsolutePath() : (script.getClass().getName() + ".class");
try {
Msg.info(this, "SCRIPT: " + scriptName);
script.execute(scriptState, monitor, writer);
writer.flush();
}
catch (Exception exc) {
Program prog = scriptState.getCurrentProgram();
String path = (prog != null ? prog.getExecutablePath() : "Current program is null.");
String logErrorMsg =
path + "\nREPORT SCRIPT ERROR: " + scriptName + " : " + exc.getMessage();
Msg.error(this, logErrorMsg, exc);
return false;
}
return true;
} }
private GhidraScript getGhidraScript() { private GhidraScript getGhidraScript() {