yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GP-1007_Dan_dedupNodepContents--SQUASHED' (Closes #3076)
This commit is contained in:
Ryan Kurtz 2023-03-14 06:21:53 -04:00
commit 2d9fe939c4
15 changed files with 262 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Ghidra/Debug/Debugger-agent-gdb/build.gradle
View file

@ -19,6 +19,8 @@ apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
apply from: "$rootProject.projectDir/gradle/debugger/hasExecutableJar.gradle"
apply plugin: 'eclipse'
eclipse.project.name = 'Debug Debugger-agent-gdb'
@ -33,74 +35,14 @@ dependencies {
testImplementation project(path: ':Debugger-gadp', configuration: 'testArtifacts')
}
def boolean filterJar(File jarfile) {
if (jarfile.name.contains("gradle-api")) {
return false
} else if (jarfile.name.contains("groovy-all")) {
return false
} else if (jarfile.name.contains("gradle-installation-beacon")) {
return false
}
return true
}
jar {
tasks.nodepJar {
manifest {
attributes['Main-Class'] = 'agent.gdb.gadp.GdbGadpServer'
}
}
task configureNodepJar {
dependsOn(configurations.default)
doLast {
configurations.default.files.forEach {
if (filterJar(it)) {
nodepJar.from(zipTree(it))
}
}
}
}
task nodepJar(type: Jar) {
inputs.file(file(jar.archivePath))
dependsOn(configureNodepJar)
dependsOn(jar)
archiveAppendix = 'nodep'
manifest {
attributes['Main-Class'] = 'agent.gdb.gadp.GdbGadpServer'
}
from(zipTree(jar.archivePath))
// TODO: This kind of stinks. I could probably apply some judicious excludes
// images I don't care.
// I probably must include duplicate LICENSE files, so that all are included
// IDK why the duplicate OSGi framework classes, but I probably don't care.
duplicatesStrategy = 'include'
}
task executableJar {
ext.execsh = file("src/main/sh/execjar.sh")
ext.jarfile = file(nodepJar.archivePath)
tasks.executableJar {
ext.outjar = file("${buildDir}/bin/gadp-agent-gdb")
dependsOn(nodepJar)
inputs.file(execsh)
inputs.file(jarfile)
outputs.file(outjar)
doLast {
outjar.parentFile.mkdirs()
outjar.withOutputStream { output ->
execsh.withInputStream { input ->
output << input
}
jarfile.withInputStream { input ->
output << input
}
}
exec {
commandLine("chmod", "+x", outjar)
}
}
}
test {

74
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpServer.java
View file

@ -30,6 +30,38 @@ import ghidra.dbg.agent.AgentWindow;
import ghidra.util.Msg;
public interface GdbGadpServer extends AutoCloseable {
public static final String USAGE =
"""
This is the GADP wrapper for GDB. Usage:
gadp-agent-gdb [GDB options] [--agent-args [-H HOST/ADDR] [-p PORT]
[-g CMD] [-x]]
Options:
Use gdb -h for suitable [GDB options]
THE FOLLOWING OPTIONS MUST BE PRECEDED BY --agent-args
--host/-H The address of the interface on which to listen. Default is
localhost
--port/-p The TCP port on which to listen. Default is 12345. 0 for
automatic.
--gdb-cmd/-g The command to launch gdb. Default is 'gdb'
--existing/-x Do not launch gdb. Instead just open a pty
Starts a GDB-based GADP server "agent". In general, it can be invoked in the
same manner as standard gdb. Arguments to control the GADP server and GDB
invocation are given after the --gadp-args flag. Once the server has started, it
will print the interface IP and port. The -g and -x flags are mutually
exclusive. The one appearing last get preference. The -x flags causes the agent
to refrain from launching its own gdb process. Instead, it prints the file name
of a pseudo terminal (pty) where it expects a GDB/MI v2 interpreter from an
existing gdb process. Use the new-ui command (available since GDB version 7.12)
to join the agent to the existing session:
(gdb) new-ui mi2 /dev/ptyXX
""";
public static void main(String[] args) throws Exception {
try {
new Runner().run(args);
@ -73,7 +105,7 @@ public interface GdbGadpServer extends AutoCloseable {
Iterator<String> ait = Arrays.asList(args).iterator();
while (ait.hasNext()) {
String a = ait.next();
if ("--gadp-args".equals(a)) {
if ("--agent-args".equals(a)) {
break;
}
else if ("-h".equals(a) || "--help".equals(a)) {
@ -131,45 +163,7 @@ public interface GdbGadpServer extends AutoCloseable {
}
private void printUsage() {
System.out.println("This is the GADP wrapper for GDB. Usage:");
System.out.println();
System.out.println(
" gadpgdb [GDB options] [--gadp-args [-H HOST/ADDR] [-p PORT] [-g CMD] [-x]]");
System.out.println();
System.out.println("Options:");
System.out.println();
System.out.println("Use gdb -h for suitable [GDB options]");
System.out.println();
System.out.println(
" --host/-H The address of the interface on which to listen. Default is localhost");
System.out.println(
" --port/-p The TCP port on which to listen. Default is 12345. 0 for automatic.");
System.out.println(
" --gdb-cmd/-g The command to launch gdb. Default is 'gdb'");
System.out.println(
" --existing/-x Do not launch gdb. Instead just open a pty");
System.out.println();
System.out.println(
"Starts a GDB-based GADP server \"agent\". In general, it can be invoked in");
System.out.println(
"the same manner as standard gdb. Arguments to control the GADP server and");
System.out.println(
"GDB invocation are given after the --gadp-args flag. Once the server has");
System.out.println(
"started, it will print the interface IP and port. The -g and -x flags are");
System.out.println(
"mutually exclusive. The one appearing last get preference. The -x flags");
System.out.println(
"causes the agent to refrain from launching its own gdb process. Instead,");
System.out.println(
"it prints the file name of a private terminate (pty) where it expects a");
System.out.println(
"GDB/MI v2 interpreter from an existing gdb process. Use the new-ui command");
System.out.println(
"(available since GDB version 7.12) to join the agent to the existing");
System.out.println("session:");
System.out.println();
System.out.println("(gdb) new-ui mi2 /dev/ptyXX");
System.out.println(USAGE);
}
}

2
Ghidra/Debug/Debugger-agent-gdb/src/main/sh/execjar.sh
View file

@ -18,5 +18,5 @@
set -e
java -jar "$0"
java -jar "$0" ${@:1}
exit