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

Merge remote-tracking branch 'origin/GP-5255_James_source_file_transform_file_chooser--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2025-02-21 14:11:58 -05:00
commit b1f1edb524
2 changed files with 65 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Features/Base/src/main/help/help/topics/SourceFilesTablePlugin/SourceFilesTable.html
View file

@ -15,7 +15,7 @@
<P>This plugin shows the source file information (described <A href= <P>This plugin shows the source file information (described <A href=
"#Source_File_Information">below</A>) associated with the current program and allows the user "#Source_File_Information">below</A>) associated with the current program and allows the user
to manage source file path transforms.</P> to manage source file path <A href="#Source_Path_Transformations">transforms</A>.</P>
<H2><A name="Source_Files_Table"></A>Source Files Table</H2> <H2><A name="Source_Files_Table"></A>Source Files Table</H2>
@ -40,14 +40,12 @@
<H3><A name="Transform_File"></A>Transform File</H3> <H3><A name="Transform_File"></A>Transform File</H3>
<P>This action allows you to create a file transform for the selected source file. The input <P>This action allows you to create a file transform for the selected source file.</P>
must be an absolute, normalized file path using forward slashes.</P>
<H3><A name="Transform_Directory"></A>Transform Directory</H3> <H3><A name="Transform_Directory"></A>Transform Directory</H3>
<P>This action allows you to create a directory transform whose source is a user-selected <P>This action allows you to create a directory transform whose source is a user-selected
parent directory of the corresponding source file. The input must be an absolute, normalized parent directory of the corresponding source file.</P>
directory path using forward slashes.</P>
</BLOCKQUOTE> </BLOCKQUOTE>
<H2><A name="Transforms_Table"></A>Transforms Table</H2> <H2><A name="Transforms_Table"></A>Transforms Table</H2>
@ -178,7 +176,7 @@
<BR> <BR>
<H2>Source Path Transformations</H2> <H2><A name="Source_Path_Transformations"></A>Source Path Transformations</H2>
<P>Source file path information can be sent to an external tool, such as an IDE. However, there <P>Source file path information can be sent to an external tool, such as an IDE. However, there
is no guarantee that a path recorded for a source file exists on the machine running Ghidra. is no guarantee that a path recorded for a source file exists on the machine running Ghidra.

87
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/sourcefilestable/SourceFilesTableProvider.java
View file

@ -17,6 +17,9 @@ package ghidra.app.plugin.core.sourcefilestable;
import java.awt.*; import java.awt.*;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.IntSupplier; import java.util.function.IntSupplier;
@ -305,14 +308,15 @@ public class SourceFilesTableProvider extends ComponentProviderAdapter {
UserDataPathTransformer.getPathTransformer(sourceFilesTableModel.getProgram()); UserDataPathTransformer.getPathTransformer(sourceFilesTableModel.getProgram());
String source = transformRecord.source(); String source = transformRecord.source();
GValuesMap valueMap = new GValuesMap(); GValuesMap valueMap = new GValuesMap();
valueMap.defineString(DESTINATION, transformRecord.target()); valueMap.defineDirectory(DESTINATION, new File(transformRecord.target()));
valueMap.setValidator((map, status) -> { valueMap.setValidator((map, status) -> {
String path = valueMap.getString(DESTINATION); File directory = valueMap.getFile(DESTINATION);
try { if (directory == null || !directory.exists()) {
UserDataPathTransformer.validateDirectoryPath(path); status.setStatusText("Directory does not exist", MessageType.ERROR);
return false;
} }
catch (IllegalArgumentException e) { if (!directory.isDirectory()) {
status.setStatusText(e.getMessage(), MessageType.ERROR); status.setStatusText("Must select a directory", MessageType.ERROR);
return false; return false;
} }
return true; return true;
@ -324,8 +328,19 @@ public class SourceFilesTableProvider extends ComponentProviderAdapter {
if (results == null) { if (results == null) {
return; return;
} }
String path = results.getString(DESTINATION); try {
pathTransformer.addDirectoryTransform(source, path); String canonical = results.getFile(DESTINATION).getCanonicalPath();
URI uri = new File(canonical).toURI().normalize();
String transformedPath = uri.getPath();
if (!transformedPath.endsWith("/")) {
transformedPath = transformedPath + "/";
}
pathTransformer.addDirectoryTransform(source, transformedPath);
}
catch (IOException e) {
Msg.showError(this, sourceFilesTable, "IOException getting canonical path",
e.getMessage());
}
sourceFilesTableModel.refresh(); sourceFilesTableModel.refresh();
transformsModel.reload(); transformsModel.reload();
@ -344,14 +359,15 @@ public class SourceFilesTableProvider extends ComponentProviderAdapter {
parentDirs.add(latest + directories[i] + "/"); parentDirs.add(latest + directories[i] + "/");
} }
valueMap.defineChoice(SOURCE, parentDirs.getLast(), parentDirs.toArray(new String[0])); valueMap.defineChoice(SOURCE, parentDirs.getLast(), parentDirs.toArray(new String[0]));
valueMap.defineString(DESTINATION); valueMap.defineDirectory(DESTINATION, null);
valueMap.setValidator((map, status) -> { valueMap.setValidator((map, status) -> {
String enteredPath = valueMap.getString(DESTINATION); File directory = valueMap.getFile(DESTINATION);
try { if (directory == null || !directory.exists()) {
UserDataPathTransformer.validateDirectoryPath(enteredPath); status.setStatusText("Directory does not exist", MessageType.ERROR);
return false;
} }
catch (IllegalArgumentException e) { if (!directory.isDirectory()) {
status.setStatusText(e.getMessage(), MessageType.ERROR); status.setStatusText("Must select a directory", MessageType.ERROR);
return false; return false;
} }
return true; return true;
@ -366,8 +382,19 @@ public class SourceFilesTableProvider extends ComponentProviderAdapter {
SourcePathTransformer pathTransformer = SourcePathTransformer pathTransformer =
UserDataPathTransformer.getPathTransformer(sourceFilesTableModel.getProgram()); UserDataPathTransformer.getPathTransformer(sourceFilesTableModel.getProgram());
String source = results.getChoice(SOURCE); String source = results.getChoice(SOURCE);
String destination = results.getString(DESTINATION); try {
pathTransformer.addDirectoryTransform(source, destination); String canonical = results.getFile(DESTINATION).getCanonicalPath();
URI uri = new File(canonical).toURI().normalize();
String transformedPath = uri.getPath();
if (!transformedPath.endsWith("/")) {
transformedPath = transformedPath + "/";
}
pathTransformer.addDirectoryTransform(source, transformedPath);
}
catch (IOException e) {
Msg.showError(this, sourceFilesTable, "IOException getting canonical path",
e.getMessage());
}
sourceFilesTableModel.refresh(); sourceFilesTableModel.refresh();
transformsModel.reload(); transformsModel.reload();
@ -383,18 +410,15 @@ public class SourceFilesTableProvider extends ComponentProviderAdapter {
UserDataPathTransformer.getPathTransformer(sourceFilesTableModel.getProgram()); UserDataPathTransformer.getPathTransformer(sourceFilesTableModel.getProgram());
String existing = pathTransformer.getTransformedPath(sourceFile, true); String existing = pathTransformer.getTransformedPath(sourceFile, true);
GValuesMap valueMap = new GValuesMap(); GValuesMap valueMap = new GValuesMap();
valueMap.defineString(DESTINATION, existing); valueMap.defineFile(DESTINATION, new File(existing));
valueMap.setValidator((map, status) -> { valueMap.setValidator((map, status) -> {
String path = valueMap.getString(DESTINATION); File targetFile = valueMap.getFile(DESTINATION);
try { if (targetFile == null || !targetFile.exists()) {
String normalized = new SourceFile(path).getPath(); status.setStatusText("File does not exist", MessageType.ERROR);
if (!normalized.equals(path)) {
status.setStatusText("Path not normalized", MessageType.ERROR);
return false; return false;
} }
} if (targetFile.isDirectory()) {
catch (IllegalArgumentException e) { status.setStatusText("Must specify a file", MessageType.ERROR);
status.setStatusText(e.getMessage(), MessageType.ERROR);
return false; return false;
} }
return true; return true;
@ -406,8 +430,17 @@ public class SourceFilesTableProvider extends ComponentProviderAdapter {
if (results == null) { if (results == null) {
return; return;
} }
String path = results.getString(DESTINATION);
pathTransformer.addFileTransform(sourceFile, path); try {
String path = results.getFile(DESTINATION).getCanonicalPath();
URI uri = new File(path).toURI().normalize();
pathTransformer.addFileTransform(sourceFile, uri.getPath());
}
catch (IOException e) {
Msg.showError(this, sourceFilesTable, "IOException getting canonical path",
e.getMessage());
}
sourceFilesTableModel.refresh(); sourceFilesTableModel.refresh();
transformsModel.reload(); transformsModel.reload();
} }