mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-10-23 05:31:02 +00:00
GT-2949 - Scripting - removed old deprecated methods
This commit is contained in:
dragonmacher
parent
f94e451d6b
commit
d4bb3e945d
|
|
@ -220,9 +220,9 @@ public class BuildResultState extends GhidraScript {
|
|||
// }
|
||||
//
|
||||
Register[] regs = currentProgram.getLanguage().getRegisters();
|
||||
List<Register> registers = Arrays.asList(regs);
|
||||
try {
|
||||
Register reg =
|
||||
askChoice("Results Query", "Select Register:", Arrays.asList(regs), null);
|
||||
Register reg = askChoice("Results Query", "Select Register:", registers, null);
|
||||
while (reg != null) {
|
||||
boolean first = true;
|
||||
boolean preserved = true;
|
||||
|
|
@ -242,7 +242,7 @@ public class BuildResultState extends GhidraScript {
|
|||
System.out.println(reg.getName() + " value is preserved.");
|
||||
}
|
||||
|
||||
reg = askChoice("Results Query", "Select Register:", regs, null);
|
||||
reg = askChoice("Results Query", "Select Register:", registers, null);
|
||||
}
|
||||
}
|
||||
catch (CancelledException e) {
|
||||
|
|
|
|||
|
|
@ -13,11 +13,10 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.swing.SwingUtilities;
|
||||
|
|
@ -83,8 +82,8 @@ public class FixLangId extends GhidraScript {
|
|||
dbh.close();
|
||||
}
|
||||
|
||||
private boolean modifyLanguage(DomainFile df, DBHandle dbh) throws IOException,
|
||||
ImproperUseException {
|
||||
private boolean modifyLanguage(DomainFile df, DBHandle dbh)
|
||||
throws IOException, ImproperUseException {
|
||||
|
||||
// TODO: Check for address map and overlay entries which could break from
|
||||
// changing the memory model !!
|
||||
|
|
@ -104,9 +103,9 @@ public class FixLangId extends GhidraScript {
|
|||
LanguageDescription desc = null;
|
||||
List<LanguageDescription> descriptions =
|
||||
DefaultLanguageService.getLanguageService().getLanguageDescriptions(true);
|
||||
String[] choices = new String[descriptions.size()];
|
||||
for (int i = 0; i < choices.length; i++) {
|
||||
choices[i] = descriptions.get(i).getLanguageID().getIdAsString();
|
||||
List<String> choices = new ArrayList<>(descriptions.size());
|
||||
for (int i = 0; i < choices.size(); i++) {
|
||||
choices.add(descriptions.get(i).getLanguageID().getIdAsString());
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
@ -114,9 +113,8 @@ public class FixLangId extends GhidraScript {
|
|||
if (langId != null) {
|
||||
Msg.warn(this, "Changing language ID from '" + record.getString(0) + "' to '" +
|
||||
langId + "' for program: " + df.getName());
|
||||
desc =
|
||||
DefaultLanguageService.getLanguageService().getLanguageDescription(
|
||||
new LanguageID(langId));
|
||||
desc = DefaultLanguageService.getLanguageService().getLanguageDescription(
|
||||
new LanguageID(langId));
|
||||
long txId = dbh.startTransaction();
|
||||
try {
|
||||
record.setString(0, langId);
|
||||
|
|
@ -140,20 +138,12 @@ public class FixLangId extends GhidraScript {
|
|||
public DomainFile askProgramFile(String title) {
|
||||
final DomainFile[] domainFile = new DomainFile[] { null };
|
||||
final DataTreeDialog dtd = new DataTreeDialog(null, title, DataTreeDialog.OPEN);
|
||||
dtd.addOkActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
dtd.close();
|
||||
domainFile[0] = dtd.getDomainFile();
|
||||
}
|
||||
dtd.addOkActionListener(e -> {
|
||||
dtd.close();
|
||||
domainFile[0] = dtd.getDomainFile();
|
||||
});
|
||||
try {
|
||||
SwingUtilities.invokeAndWait(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
dtd.showComponent();
|
||||
}
|
||||
});
|
||||
SwingUtilities.invokeAndWait(() -> dtd.showComponent());
|
||||
}
|
||||
catch (Exception e) {
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -89,7 +89,8 @@ public class AskScript extends GhidraScript {
|
|||
println("You typed: " + myStr + " and " + myOtherStr);
|
||||
|
||||
String choice = askChoice("Choice", "Please choose one",
|
||||
new String[] { "grumpy", "dopey", "sleepy", "doc", "bashful" }, "bashful");
|
||||
Arrays.asList(new String[] { "grumpy", "dopey", "sleepy", "doc", "bashful" }),
|
||||
"bashful");
|
||||
println("Choice? " + choice);
|
||||
|
||||
List<Integer> choices1 = askChoices("Choices 1", "Please choose one or more numbers.",
|
||||
|
|
|
|||
|
|
@ -13,13 +13,12 @@
|
|||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
|
||||
import ghidra.app.script.GhidraScript;
|
||||
import ghidra.framework.*;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* Asks user for a single .pdb file or a directory that contains .pdb files (search for
|
||||
|
|
@ -46,10 +45,10 @@ public class CreatePdbXmlFilesScript extends GhidraScript {
|
|||
// Get appropriate pdb.exe file
|
||||
String pdbExeLocation = Application.getOSFile("pdb.exe").getAbsolutePath();
|
||||
|
||||
String[] choices = new String[] { "single file", "directory of files" };
|
||||
String fileOrDir =
|
||||
askChoice("PDB file or directory", "Would you like to operate on a single "
|
||||
+ ".pdb file or a directory of .pdb files?", choices, choices[1]);
|
||||
List<String> choices = Arrays.asList("single file", "directory of files");
|
||||
String fileOrDir = askChoice("PDB file or directory",
|
||||
"Would you like to operate on a single " + ".pdb file or a directory of .pdb files?",
|
||||
choices, choices.get(1));
|
||||
|
||||
File pdbParentDir;
|
||||
String pdbName;
|
||||
|
|
@ -57,7 +56,7 @@ public class CreatePdbXmlFilesScript extends GhidraScript {
|
|||
int filesCreated = 0;
|
||||
|
||||
try {
|
||||
if (fileOrDir.equals(choices[0])) {
|
||||
if (fileOrDir.equals(choices.get(0))) {
|
||||
File pdbFile = askFile("Choose a PDB file", "OK");
|
||||
|
||||
if (!pdbFile.exists()) {
|
||||
|
|
@ -82,12 +81,11 @@ public class CreatePdbXmlFilesScript extends GhidraScript {
|
|||
}
|
||||
else {
|
||||
// Do recursive processing
|
||||
File pdbDir =
|
||||
askDirectory(
|
||||
"Choose PDB root folder (performs recursive search for .pdb files)", "OK");
|
||||
File pdbDir = askDirectory(
|
||||
"Choose PDB root folder (performs recursive search for .pdb files)", "OK");
|
||||
|
||||
// Get list of files to process
|
||||
List<File> pdbFiles = new ArrayList<File>();
|
||||
List<File> pdbFiles = new ArrayList<>();
|
||||
getPDBFiles(pdbDir, pdbFiles);
|
||||
|
||||
int createdFilesCounter = 0;
|
||||
|
|
@ -157,8 +155,8 @@ public class CreatePdbXmlFilesScript extends GhidraScript {
|
|||
createdFile.delete();
|
||||
}
|
||||
|
||||
throw new IOException("At file '" + pdbName +
|
||||
"':\nAbnormal termination of 'pdb.exe' process.");
|
||||
throw new IOException(
|
||||
"At file '" + pdbName + "':\nAbnormal termination of 'pdb.exe' process.");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@ import static org.junit.Assert.*;
|
|||
|
||||
import java.io.*;
|
||||
import java.net.URL;
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
|
|
@ -30,7 +29,7 @@ import org.junit.*;
|
|||
|
||||
import docking.DialogComponentProvider;
|
||||
import docking.widgets.filechooser.GhidraFileChooser;
|
||||
import generic.test.AbstractGenericTest;
|
||||
import generic.test.AbstractGTest;
|
||||
import generic.test.TestUtils;
|
||||
import ghidra.app.plugin.core.codebrowser.CodeBrowserPlugin;
|
||||
import ghidra.app.plugin.core.script.GhidraScriptMgrPlugin;
|
||||
|
|
@ -43,7 +42,7 @@ import ghidra.program.model.listing.Program;
|
|||
import ghidra.program.util.ProgramLocation;
|
||||
import ghidra.test.AbstractGhidraHeadedIntegrationTest;
|
||||
import ghidra.test.TestEnv;
|
||||
import ghidra.util.task.TaskMonitorAdapter;
|
||||
import ghidra.util.task.TaskMonitor;
|
||||
import utilities.util.FileUtilities;
|
||||
|
||||
public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationTest {
|
||||
|
|
@ -123,7 +122,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
assertByteArrayEquals(expectedBytes, myBytes);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Calling askProgram() would stacktrace if the user 1) didn't select a program in the
|
||||
* tree and then 2) pressed the OK button.
|
||||
*/
|
||||
|
|
@ -141,7 +140,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
DataTreeDialog dtd = waitForDialogComponent(null, DataTreeDialog.class, 2000);
|
||||
DataTreeDialog dtd = waitForDialogComponent(DataTreeDialog.class);
|
||||
JButton okButton = (JButton) getInstanceField("okButton", dtd);
|
||||
|
||||
runSwing(() -> okButton.doClick());
|
||||
|
|
@ -152,7 +151,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
runSwing(() -> dtd.close());
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* For scripts with properties files in a different location (could be the case with subscripts),
|
||||
* tests that the .properties file is found in the default location and that the default value
|
||||
* for the input field is provided by the .properties file in the alternate location.
|
||||
|
|
@ -164,7 +163,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
|
||||
// Create a temporary .properties file and set the potentialPropertiesFileLocs to look
|
||||
// in that location
|
||||
String tempDirPath = AbstractGenericTest.getTestDirectoryPath();
|
||||
String tempDirPath = AbstractGTest.getTestDirectoryPath();
|
||||
File tempDir = new File(tempDirPath);
|
||||
File tempPropertiesFile = new File(tempDir, "GhidraScriptTest.properties");
|
||||
tempPropertiesFile.delete();
|
||||
|
|
@ -200,8 +199,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
AskDialog askDialog =
|
||||
waitForDialogComponent(env.getTool().getToolFrame(), AskDialog.class, TIMEOUT_MILLIS);
|
||||
AskDialog<?> askDialog = waitForDialogComponent(AskDialog.class);
|
||||
assertNotNull(askDialog);
|
||||
pressButtonByText(askDialog, "OK");
|
||||
waitForSwing();
|
||||
|
|
@ -216,7 +214,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
|
||||
// Create a temporary files, then create a temporary .properties file that contains
|
||||
// the path to one of the temporary file.
|
||||
String tempDirPath = AbstractGenericTest.getTestDirectoryPath();
|
||||
String tempDirPath = AbstractGTest.getTestDirectoryPath();
|
||||
File tempDir = new File(tempDirPath);
|
||||
File tempFile = new File(tempDir, "tempFile.exe");
|
||||
File anotherTempFile = new File(tempDir, "MyTempFile.txt");
|
||||
|
|
@ -258,8 +256,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
GhidraFileChooser fileChooser = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
GhidraFileChooser.class, TIMEOUT_MILLIS * 2);
|
||||
GhidraFileChooser fileChooser = waitForDialogComponent(GhidraFileChooser.class);
|
||||
|
||||
waitForUpdateOnDirectory(fileChooser);
|
||||
|
||||
|
|
@ -281,8 +278,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
fileChooser = waitForDialogComponent(env.getTool().getToolFrame(), GhidraFileChooser.class,
|
||||
TIMEOUT_MILLIS * 2);
|
||||
fileChooser = waitForDialogComponent(GhidraFileChooser.class);
|
||||
|
||||
fileChooser.setSelectedFile(anotherTempFile);
|
||||
waitForUpdateOnDirectory(fileChooser);
|
||||
|
|
@ -300,8 +296,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
fileChooser = waitForDialogComponent(env.getTool().getToolFrame(), GhidraFileChooser.class,
|
||||
TIMEOUT_MILLIS * 2);
|
||||
fileChooser = waitForDialogComponent(GhidraFileChooser.class);
|
||||
|
||||
fileChooser.setSelectedFile(anotherTempFile);
|
||||
waitForUpdateOnDirectory(fileChooser);
|
||||
|
|
@ -324,7 +319,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
|
||||
// Create temporary directories, then create a temporary .properties file that contains
|
||||
// the path to one of the temporary directory.
|
||||
String tempDirPath = AbstractGenericTest.getTestDirectoryPath();
|
||||
String tempDirPath = AbstractGTest.getTestDirectoryPath();
|
||||
File tempDir = new File(tempDirPath);
|
||||
File tempSubDir = new File(tempDir, TEMP_SUB_DIR);
|
||||
File anotherTempSubDir = new File(tempDir, "anotherTempDir");
|
||||
|
|
@ -368,8 +363,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
GhidraFileChooser fileChooser = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
GhidraFileChooser.class, TIMEOUT_MILLIS * 2);
|
||||
GhidraFileChooser fileChooser = waitForDialogComponent(GhidraFileChooser.class);
|
||||
waitForUpdateOnDirectory(fileChooser);
|
||||
|
||||
assertNotNull(fileChooser);
|
||||
|
|
@ -390,8 +384,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
fileChooser = waitForDialogComponent(env.getTool().getToolFrame(), GhidraFileChooser.class,
|
||||
TIMEOUT_MILLIS * 2);
|
||||
fileChooser = waitForDialogComponent(GhidraFileChooser.class);
|
||||
|
||||
fileChooser.setSelectedFile(anotherTempSubDir);
|
||||
waitForUpdateOnDirectory(fileChooser);
|
||||
|
|
@ -409,8 +402,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
});
|
||||
|
||||
fileChooser = waitForDialogComponent(env.getTool().getToolFrame(), GhidraFileChooser.class,
|
||||
TIMEOUT_MILLIS * 2);
|
||||
fileChooser = waitForDialogComponent(GhidraFileChooser.class);
|
||||
waitForUpdateOnDirectory(fileChooser);
|
||||
|
||||
pressButtonByText(fileChooser, "Choose!");
|
||||
|
|
@ -444,8 +436,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
SelectLanguageDialog langDialog = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
SelectLanguageDialog.class, TIMEOUT_MILLIS);
|
||||
SelectLanguageDialog langDialog = waitForDialogComponent(SelectLanguageDialog.class);
|
||||
assertNotNull(langDialog);
|
||||
pressButtonByText(langDialog, "Give me a language:");
|
||||
waitForSwing();
|
||||
|
|
@ -463,8 +454,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
langDialog = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
SelectLanguageDialog.class, TIMEOUT_MILLIS);
|
||||
langDialog = waitForDialogComponent(SelectLanguageDialog.class);
|
||||
|
||||
LanguageCompilerSpecPair chosenLang =
|
||||
new LanguageCompilerSpecPair("68000:BE:32:Coldfire", "default");
|
||||
|
|
@ -484,8 +474,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
langDialog = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
SelectLanguageDialog.class, TIMEOUT_MILLIS);
|
||||
langDialog = waitForDialogComponent(SelectLanguageDialog.class);
|
||||
|
||||
pressButtonByText(langDialog, "Give me a language:");
|
||||
waitForSwing();
|
||||
|
|
@ -510,7 +499,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
assertEquals(10101, chosenInt);
|
||||
|
||||
// Now set int to some other value
|
||||
Integer newInt = new Integer(123456);
|
||||
Integer newInt = 123456;
|
||||
chosenInt = ask_TextInput(Integer.toString(newInt), () -> {
|
||||
return script.askInt("Ask Test", "Enter an integer:");
|
||||
});
|
||||
|
|
@ -539,7 +528,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
assertEquals((long) Math.pow(2, 18), chosenLong);
|
||||
|
||||
// Now set the long value to a different value
|
||||
Long newLong = new Long((long) Math.pow(4, 28));
|
||||
Long newLong = (long) Math.pow(4, 28);
|
||||
chosenLong = ask_TextInput(Long.toString(newLong), () -> {
|
||||
return script.askLong("Ask Test", "Enter a long:");
|
||||
});
|
||||
|
|
@ -649,21 +638,21 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
createScript();
|
||||
|
||||
// Compare default value to expected properties value
|
||||
String[] choices = new String[] { "eenie", "meanie", "miney", "mo" };
|
||||
List<String> choices = Arrays.asList("eenie", "meanie", "miney", "mo");
|
||||
String chosen = ask_ComboInput(() -> {
|
||||
return script.askChoice("Ask Test", "Choose one:", choices, "mo");
|
||||
});
|
||||
assertEquals("meanie", chosen);
|
||||
|
||||
// Set choice to a different value
|
||||
String choice_eenie = choices[0];
|
||||
String choice_eenie = choices.get(0);
|
||||
chosen = ask_ComboInput(choice_eenie, () -> {
|
||||
return script.askChoice("Ask Test", "Choose one:", choices, "mo");
|
||||
});
|
||||
assertEquals(choice_eenie, chosen);
|
||||
|
||||
// See if the last-set value is auto-populated
|
||||
String choice_miney = choices[2];
|
||||
String choice_miney = choices.get(2);
|
||||
chosen = ask_ComboInput(() -> {
|
||||
// Note: we are passing a default of 'miney', but expect the last choice of 'eenie'
|
||||
return script.askChoice("Ask Test", "Choose one:", choices, choice_miney);
|
||||
|
|
@ -681,13 +670,13 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
public void testAskChoiceDefaultValue() throws Exception {
|
||||
createScript();
|
||||
|
||||
String[] choices = new String[] { "one fish", "two fish", "red fish", "blue fish" };
|
||||
List<String> choices = Arrays.asList("one fish", "two fish", "red fish", "blue fish");
|
||||
int choiceIndex = 2;
|
||||
String chosen = ask_ComboInput(() -> {
|
||||
return script.askChoice("Ask Default Choice Test",
|
||||
"Which choice would you like to pick?", choices, choices[choiceIndex]);
|
||||
"Which choice would you like to pick?", choices, choices.get(choiceIndex));
|
||||
});
|
||||
assertEquals(choices[choiceIndex], chosen);
|
||||
assertEquals(choices.get(choiceIndex), chosen);
|
||||
}
|
||||
|
||||
// TODO test for askChoices()
|
||||
|
|
@ -739,8 +728,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
DialogComponentProvider askDialog = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
DialogComponentProvider.class, TIMEOUT_MILLIS);
|
||||
DialogComponentProvider askDialog = waitForDialogComponent(DialogComponentProvider.class);
|
||||
assertNotNull(askDialog);
|
||||
|
||||
if (optionalValue != null) {
|
||||
|
|
@ -774,8 +762,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
DialogComponentProvider askDialog = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
DialogComponentProvider.class, TIMEOUT_MILLIS);
|
||||
DialogComponentProvider askDialog = waitForDialogComponent(DialogComponentProvider.class);
|
||||
assertNotNull(askDialog);
|
||||
|
||||
if (optionalValue != null) {
|
||||
|
|
@ -808,8 +795,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
}
|
||||
}, false);
|
||||
|
||||
AskDialog askDialog =
|
||||
waitForDialogComponent(env.getTool().getToolFrame(), AskDialog.class, TIMEOUT_MILLIS);
|
||||
AskDialog<?> askDialog = waitForDialogComponent(AskDialog.class);
|
||||
assertNotNull(askDialog);
|
||||
|
||||
if (optionalValue != null) {
|
||||
|
|
@ -890,7 +876,7 @@ public class GhidraScriptAskMethodsTest extends AbstractGhidraHeadedIntegrationT
|
|||
// test stub
|
||||
}
|
||||
};
|
||||
script.set(state, TaskMonitorAdapter.DUMMY_MONITOR, null);
|
||||
script.set(state, TaskMonitor.DUMMY, null);
|
||||
|
||||
URL url = GhidraScriptTest.class.getResource("GhidraScriptAsk.properties");
|
||||
assertNotNull("Test cannot run without properties file!", url);
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ import ghidra.test.AbstractGhidraHeadedIntegrationTest;
|
|||
import ghidra.test.TestEnv;
|
||||
import ghidra.util.Msg;
|
||||
import ghidra.util.exception.AssertException;
|
||||
import ghidra.util.task.TaskMonitorAdapter;
|
||||
import ghidra.util.task.TaskMonitor;
|
||||
|
||||
public class GhidraScriptTest extends AbstractGhidraHeadedIntegrationTest {
|
||||
|
||||
|
|
@ -666,7 +666,6 @@ public class GhidraScriptTest extends AbstractGhidraHeadedIntegrationTest {
|
|||
assertEquals(values.size(), userChoices.size());
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@Test
|
||||
public void testAskChoices_NoSharedInterface_ChooseMultiple_Deprecated() throws Exception {
|
||||
|
||||
|
|
@ -674,13 +673,13 @@ public class GhidraScriptTest extends AbstractGhidraHeadedIntegrationTest {
|
|||
|
||||
final GhidraScript script = getScript();
|
||||
|
||||
Object[] values = { new JPanel(), new String() };
|
||||
String[] labels = { "Panel", "String" };
|
||||
List<Object> values = Arrays.asList(new JPanel(), new String());
|
||||
List<String> labels = Arrays.asList("Panel", "String");
|
||||
|
||||
AtomicReference<Object[]> ref = new AtomicReference<>();
|
||||
AtomicReference<List<Object>> ref = new AtomicReference<>();
|
||||
runSwing(() -> {
|
||||
try {
|
||||
Object[] userChoices =
|
||||
List<Object> userChoices =
|
||||
script.askChoices("Ask Choices Test", "Pick", values, labels);
|
||||
ref.set(userChoices);
|
||||
}
|
||||
|
|
@ -689,16 +688,15 @@ public class GhidraScriptTest extends AbstractGhidraHeadedIntegrationTest {
|
|||
}
|
||||
}, false);
|
||||
|
||||
MultipleOptionsDialog<?> dialog = waitForDialogComponent(env.getTool().getToolFrame(),
|
||||
MultipleOptionsDialog.class, DEFAULT_WINDOW_TIMEOUT);
|
||||
MultipleOptionsDialog<?> dialog = waitForDialogComponent(MultipleOptionsDialog.class);
|
||||
assertNotNull(dialog);
|
||||
pressSelectAll(dialog);
|
||||
pressButtonByText(dialog, "OK");
|
||||
|
||||
waitForSwing();
|
||||
|
||||
Object[] userChoices = ref.get();
|
||||
assertEquals(values.length, userChoices.length);
|
||||
List<Object> userChoices = ref.get();
|
||||
assertEquals(values.size(), userChoices.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -777,7 +775,7 @@ public class GhidraScriptTest extends AbstractGhidraHeadedIntegrationTest {
|
|||
// test stub
|
||||
}
|
||||
};
|
||||
script.set(state, TaskMonitorAdapter.DUMMY_MONITOR, null);
|
||||
script.set(state, TaskMonitor.DUMMY, null);
|
||||
return script;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,42 +18,21 @@
|
|||
// Subfolders at a specific depth from this root form the roots of individual libraries
|
||||
// Library Name, Version, and Variant are created from the directory path elements
|
||||
//@category FunctionID
|
||||
import java.io.BufferedReader;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.TreeMap;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import generic.hash.FNV1a64MessageDigest;
|
||||
import generic.hash.MessageDigest;
|
||||
import ghidra.app.script.GhidraScript;
|
||||
import ghidra.feature.fid.db.FidDB;
|
||||
import ghidra.feature.fid.db.FidFile;
|
||||
import ghidra.feature.fid.db.FidFileManager;
|
||||
import ghidra.feature.fid.db.LibraryRecord;
|
||||
import ghidra.feature.fid.db.*;
|
||||
import ghidra.feature.fid.hash.FidHashQuad;
|
||||
import ghidra.feature.fid.service.FidPopulateResult;
|
||||
import ghidra.feature.fid.service.*;
|
||||
import ghidra.feature.fid.service.FidPopulateResult.Disposition;
|
||||
import ghidra.feature.fid.service.FidPopulateResultReporter;
|
||||
import ghidra.feature.fid.service.FidService;
|
||||
import ghidra.feature.fid.service.Location;
|
||||
import ghidra.framework.model.DomainFile;
|
||||
import ghidra.framework.model.DomainFolder;
|
||||
import ghidra.framework.model.DomainObject;
|
||||
import ghidra.framework.model.*;
|
||||
import ghidra.program.database.ProgramContentHandler;
|
||||
import ghidra.program.model.lang.LanguageID;
|
||||
import ghidra.program.model.listing.Function;
|
||||
import ghidra.program.model.listing.FunctionIterator;
|
||||
import ghidra.program.model.listing.FunctionManager;
|
||||
import ghidra.program.model.listing.Program;
|
||||
import ghidra.program.model.listing.*;
|
||||
import ghidra.program.model.mem.MemoryAccessException;
|
||||
import ghidra.util.Msg;
|
||||
import ghidra.util.exception.CancelledException;
|
||||
|
|
@ -122,7 +101,7 @@ public class CreateMultipleLibraries extends GhidraScript {
|
|||
}
|
||||
}
|
||||
outputLine("List of unresolved symbols:");
|
||||
TreeSet<String> symbols = new TreeSet<String>();
|
||||
TreeSet<String> symbols = new TreeSet<>();
|
||||
for (Location location : result.getUnresolvedSymbols()) {
|
||||
symbols.add(location.getFunctionName());
|
||||
}
|
||||
|
|
@ -183,7 +162,7 @@ public class CreateMultipleLibraries extends GhidraScript {
|
|||
private boolean checkForDuplicate(ArrayList<DomainFile> programs) throws CancelledException {
|
||||
String fullName =
|
||||
currentLibraryName + ':' + currentLibraryVersion + ':' + currentLibraryVariant;
|
||||
ArrayList<Long> hashList = new ArrayList<Long>();
|
||||
ArrayList<Long> hashList = new ArrayList<>();
|
||||
for (int i = 0; i < programs.size(); ++i) {
|
||||
monitor.checkCanceled();
|
||||
try {
|
||||
|
|
@ -216,7 +195,7 @@ public class CreateMultipleLibraries extends GhidraScript {
|
|||
private boolean detectDups(DomainFolder folder) {
|
||||
boolean isDuplicate = false;
|
||||
try {
|
||||
ArrayList<DomainFile> programs = new ArrayList<DomainFile>();
|
||||
ArrayList<DomainFile> programs = new ArrayList<>();
|
||||
findPrograms(programs, folder);
|
||||
|
||||
isDuplicate = checkForDuplicate(programs);
|
||||
|
|
@ -241,7 +220,7 @@ public class CreateMultipleLibraries extends GhidraScript {
|
|||
return;
|
||||
}
|
||||
BufferedReader reader = new BufferedReader(new FileReader(commonSymbolsFile));
|
||||
commonSymbols = new LinkedList<String>();
|
||||
commonSymbols = new LinkedList<>();
|
||||
String line = reader.readLine();
|
||||
while (line != null) {
|
||||
monitor.checkCanceled();
|
||||
|
|
@ -291,7 +270,7 @@ public class CreateMultipleLibraries extends GhidraScript {
|
|||
}
|
||||
|
||||
private void populateLibrary(DomainFolder folder) {
|
||||
ArrayList<DomainFile> programs = new ArrayList<DomainFile>();
|
||||
ArrayList<DomainFile> programs = new ArrayList<>();
|
||||
try {
|
||||
findPrograms(programs, folder);
|
||||
|
||||
|
|
@ -363,16 +342,16 @@ public class CreateMultipleLibraries extends GhidraScript {
|
|||
// ignore, means we use console
|
||||
}
|
||||
if (askYesNo("Do Duplication Detection", "Do you want to detect duplicates")) {
|
||||
duplicatemap = new TreeMap<Long, String>();
|
||||
duplicatemap = new TreeMap<>();
|
||||
}
|
||||
|
||||
List<FidFile> nonInstallationFidFiles = FidFileManager.getInstance().getUserAddedFiles();
|
||||
Object[] FidFile = nonInstallationFidFiles.toArray();
|
||||
if (nonInstallationFidFiles.isEmpty()) {
|
||||
throw new FileNotFoundException("Could not find any fidb files that can be populated");
|
||||
}
|
||||
fidFile = (FidFile) askChoice("Choose destination FidDB",
|
||||
"Please choose the destination FidDB for population", FidFile, FidFile[0]);
|
||||
fidFile = askChoice("Choose destination FidDB",
|
||||
"Please choose the destination FidDB for population", nonInstallationFidFiles,
|
||||
nonInstallationFidFiles.get(0));
|
||||
|
||||
rootFolder =
|
||||
askProjectFolder("Select root folder containing all libraries (at a depth of " +
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@
|
|||
// Opens all programs under a chosen domain folder, scans them for functions
|
||||
// that match a user supplied FID hash and prints info about the matching function
|
||||
//@category FunctionID
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
import ghidra.app.script.GhidraScript;
|
||||
import ghidra.feature.fid.hash.FidHashQuad;
|
||||
import ghidra.feature.fid.plugin.HashLookupListMode;
|
||||
|
|
@ -29,9 +32,6 @@ import ghidra.util.NumericUtilities;
|
|||
import ghidra.util.exception.CancelledException;
|
||||
import ghidra.util.exception.VersionException;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class FindFunctionByHash extends GhidraScript {
|
||||
|
||||
FidService service;
|
||||
|
|
@ -40,24 +40,23 @@ public class FindFunctionByHash extends GhidraScript {
|
|||
protected void run() throws Exception {
|
||||
service = new FidService();
|
||||
|
||||
DomainFolder folder =
|
||||
askProjectFolder("Please select a project folder to RECURSIVELY look for a named function:");
|
||||
String hashString =
|
||||
askString("Please enter function hash",
|
||||
"Please enter the (hex) function hash you're looking for:");
|
||||
DomainFolder folder = askProjectFolder(
|
||||
"Please select a project folder to RECURSIVELY look for a named function:");
|
||||
String hashString = askString("Please enter function hash",
|
||||
"Please enter the (hex) function hash you're looking for:");
|
||||
long hash = NumericUtilities.parseHexLong(hashString);
|
||||
HashLookupListMode[] choices =
|
||||
new HashLookupListMode[] { HashLookupListMode.FULL, HashLookupListMode.SPECIFIC };
|
||||
HashLookupListMode hashType =
|
||||
askChoice("Please choose hash type", "Please select the type of hash", choices,
|
||||
choices[1]);
|
||||
List<HashLookupListMode> choices =
|
||||
Arrays.asList(HashLookupListMode.FULL, HashLookupListMode.SPECIFIC);
|
||||
HashLookupListMode hashType = askChoice("Please choose hash type",
|
||||
"Please select the type of hash", choices, choices.get(1));
|
||||
|
||||
ArrayList<DomainFile> programs = new ArrayList<DomainFile>();
|
||||
ArrayList<DomainFile> programs = new ArrayList<>();
|
||||
findPrograms(programs, folder);
|
||||
findFunction(programs, hash, hashType);
|
||||
}
|
||||
|
||||
private void findFunction(ArrayList<DomainFile> programs, long hash, HashLookupListMode hashType) {
|
||||
private void findFunction(ArrayList<DomainFile> programs, long hash,
|
||||
HashLookupListMode hashType) {
|
||||
for (DomainFile domainFile : programs) {
|
||||
if (monitor.isCancelled()) {
|
||||
return;
|
||||
|
|
@ -76,7 +75,8 @@ public class FindFunctionByHash extends GhidraScript {
|
|||
continue;
|
||||
}
|
||||
if ((hashType == HashLookupListMode.FULL && hashQuad.getFullHash() == hash) ||
|
||||
(hashType == HashLookupListMode.SPECIFIC && hashQuad.getSpecificHash() == hash)) {
|
||||
(hashType == HashLookupListMode.SPECIFIC &&
|
||||
hashQuad.getSpecificHash() == hash)) {
|
||||
println("found " + function.getName() + " at " + function.getEntryPoint() +
|
||||
" in " + domainFile.getPathname());
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user