Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-16 23:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-1136-dragonmacher-debugger-process' (Closes #3175)
This commit is contained in:
Ryan Kurtz 2021-07-21 14:23:54 -04:00
commit 2552403ed3
7 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpServer.java
View File

@ -22,6 +22,8 @@ import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import agent.dbgeng.gadp.impl.DbgEngGadpServerImpl;
import ghidra.dbg.agent.AgentWindow;
import ghidra.util.Msg;
@ -40,7 +42,13 @@ public interface DbgEngGadpServer extends AutoCloseable {
* @throws InterruptedException
*/
public static void main(String[] args) throws Exception {
new DbgEngRunner().run(args);
try {
new DbgEngRunner().run(args);
}
catch (Throwable t) {
System.err.println(ExceptionUtils.getMessage(t));
System.exit(1);
}
}
/**

6
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelSelectableObject.java
View File

@ -22,7 +22,13 @@ import agent.dbgeng.manager.DbgThread;
import agent.dbgeng.manager.impl.DbgManagerImpl;
import agent.dbgeng.model.iface2.*;
import ghidra.dbg.target.TargetObject;
import ghidra.dbg.target.schema.TargetAttributeType;
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
@TargetObjectSchemaInfo(
name = "Selectable",
attributes = {
@TargetAttributeType(type = Void.class) })
public interface DbgModelSelectableObject extends DbgModelTargetObject {
public default CompletableFuture<Void> setActive() {

10
Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/gadp/DbgModelGadpServer.java
View File

@ -19,6 +19,8 @@ import java.io.IOException;
import java.net.SocketAddress;
import java.util.concurrent.ExecutionException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import agent.dbgeng.gadp.DbgEngGadpServer;
import agent.dbgmodel.gadp.impl.DbgModelGadpServerImpl;
import ghidra.dbg.agent.AgentWindow;
@ -75,7 +77,13 @@ public interface DbgModelGadpServer extends DbgEngGadpServer {
* @throws InterruptedException
*/
public static void main(String[] args) throws Exception {
new DbgModelRunner().run(args);
try {
new DbgModelRunner().run(args);
}
catch (Throwable t) {
System.err.println(ExceptionUtils.getMessage(t));
System.exit(1);
}
}
/**

10
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpServer.java
View File

@ -22,13 +22,21 @@ import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import agent.gdb.gadp.impl.GdbGadpServerImpl;
import ghidra.dbg.agent.AgentWindow;
import ghidra.util.Msg;
public interface GdbGadpServer extends AutoCloseable {
public static void main(String[] args) throws Exception {
new Runner().run(args);
try {
new Runner().run(args);
}
catch (Throwable t) {
System.err.println(ExceptionUtils.getMessage(t));
System.exit(1);
}
}
public static GdbGadpServer newInstance(SocketAddress addr) throws IOException {

6
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelSelectableObject.java
View File

@ -18,7 +18,13 @@ package agent.gdb.model.impl;
import java.util.concurrent.CompletableFuture;
import ghidra.dbg.target.TargetObject;
import ghidra.dbg.target.schema.TargetAttributeType;
import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
@TargetObjectSchemaInfo(
name = "Selectable",
attributes = {
@TargetAttributeType(type = Void.class) })
interface GdbModelSelectableObject extends TargetObject {
CompletableFuture<Void> setActive();
}

28
Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpLocalDebuggerModelFactory.java
View File

@ -15,18 +15,18 @@
*/
package ghidra.dbg.gadp.server;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.lang.ProcessBuilder.Redirect;
import java.io.*;
import java.nio.channels.AsynchronousByteChannel;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import generic.concurrent.io.IOResult;
import generic.concurrent.io.ProcessConsumer;
import ghidra.dbg.DebuggerModelFactory;
import ghidra.dbg.gadp.client.GadpClient;
import ghidra.dbg.gadp.client.GadpTcpDebuggerModelFactory;
import ghidra.dbg.util.ConfigurableFactory.FactoryOption;
import ghidra.util.Msg;
public abstract class AbstractGadpLocalDebuggerModelFactory implements DebuggerModelFactory {
@ -108,9 +108,13 @@ public abstract class AbstractGadpLocalDebuggerModelFactory implements DebuggerM
}
completeCommandLine(cmd);
builder.command(cmd);
builder.redirectError(Redirect.INHERIT);
//builder.redirectError(Redirect.INHERIT);
process = builder.start();
InputStream errorStream = process.getErrorStream();
Future<IOResult> errorFuture = ProcessConsumer.consume(errorStream);
BufferedReader reader =
new BufferedReader(new InputStreamReader(process.getInputStream()));
String line;
@ -124,9 +128,19 @@ public abstract class AbstractGadpLocalDebuggerModelFactory implements DebuggerM
ready.complete(null);
}
}
if (!ready.isDone()) {
ready.completeExceptionally(
new RuntimeException("Agent terminated unexpectedly"));
IOResult errorResult = errorFuture.get();
String errorMessage = errorResult.getOutputAsString();
if (errorMessage != null) {
ready.completeExceptionally(
new RuntimeException("Agent terminated with error: " + errorMessage));
}
else {
ready.completeExceptionally(
new RuntimeException("Agent terminated unexpectedly"));
}
}
}
catch (Throwable e) {

4
Ghidra/Framework/Generic/src/main/java/generic/concurrent/io/IOResult.java
View File

@ -32,7 +32,7 @@ public class IOResult implements Runnable {
public static final String THREAD_POOL_NAME = "I/O Thread Pool";
private List<String> outputLines = new ArrayList<String>();
private List<String> outputLines = new ArrayList<>();
private BufferedReader commandOutput;
private final Throwable inception;
private Consumer<String> consumer = Dummy.consumer();
@ -53,7 +53,7 @@ public class IOResult implements Runnable {
public String getOutputAsString() {
StringBuilder buffy = new StringBuilder();
for (String line : outputLines) {
buffy.append(line);
buffy.append(line).append("\n");
}
return buffy.toString();
}