mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-2740: Add Target interface. Refactor UI to use it, not TraceRecorder.

Browse Source
This commit is contained in:
Dan
2023-10-02 15:21:19 -04:00
parent 7ccef54f19
commit 84b9181c00
184 changed files with 4080 additions and 2808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/manager/impl/FridaManagerImpl.java
View File

@@ -1198,7 +1198,7 @@ public class FridaManagerImpl implements FridaManager {
getEventListeners().fire.promptChanged(prompt);
continuation.complete(command);
setContinuation(null);
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
return execute(
new FridaConsoleExecCommand(this, command, FridaConsoleExecCommand.Output.CONSOLE))

4
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/iface1/FridaModelTargetActiveScope.java
View File

@@ -42,7 +42,7 @@ public interface FridaModelTargetActiveScope extends FridaModelTargetObject, Tar
public default CompletableFuture<Void> doRequestActivation(TargetObject obj) {
if (getManager().isWaiting()) {
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
getModel().assertMine(TargetObject.class, obj);
if (!PathUtils.isAncestor(this.getPath(), obj.getPath())) {
@@ -62,7 +62,7 @@ public interface FridaModelTargetActiveScope extends FridaModelTargetObject, Tar
}
throw new AssertionError();
}
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}

8
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/iface1/FridaModelTargetFocusScope.java
View File

@@ -48,11 +48,11 @@ public interface FridaModelTargetFocusScope extends FridaModelTargetObject, Targ
public default CompletableFuture<Void> doRequestFocus(TargetObject obj) {
if (getManager().isWaiting()) {
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
getModel().assertMine(TargetObject.class, obj);
if (obj.equals(getFocus())) {
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
if (!PathUtils.isAncestor(this.getPath(), obj.getPath())) {
throw new DebuggerIllegalArgumentException("Can only focus a successor of the scope");
@@ -63,7 +63,7 @@ public interface FridaModelTargetFocusScope extends FridaModelTargetObject, Targ
FridaModelSelectableObject sel = (FridaModelSelectableObject) cur;
//System.err.println("requestFocus " + obj);
setFocus(sel);
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
if (cur instanceof FridaModelTargetObject) {
FridaModelTargetObject def = (FridaModelTargetObject) cur;
@@ -72,7 +72,7 @@ public interface FridaModelTargetFocusScope extends FridaModelTargetObject, Targ
}
throw new AssertionError();
}
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/iface2/FridaModelTargetObject.java
View File

@@ -52,7 +52,7 @@ public interface FridaModelTargetObject extends SpiTargetObject {
public CompletableFuture<? extends Map<String, ?>> requestNativeAttributes();
public default CompletableFuture<Void> requestAugmentedAttributes() {
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
public CompletableFuture<List<TargetObject>> requestNativeElements();

202
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaDebuggerBot.java
View File

@@ -1,202 +0,0 @@
/* ###
* IP: GHIDRA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package agent.frida.model.impl;
import java.lang.invoke.MethodHandles;
import java.util.*;
import agent.frida.frida.FridaThreadInfo;
import agent.frida.manager.FridaProcess;
import agent.frida.manager.FridaThread;
import agent.frida.manager.evt.FridaStateChangedEvent;
import agent.frida.manager.evt.FridaThreadSelectedEvent;
import agent.frida.manager.impl.FridaManagerImpl;
import ghidra.app.services.DebuggerWorkflowFrontEndService;
import ghidra.dbg.*;
import ghidra.dbg.error.DebuggerMemoryAccessException;
import ghidra.dbg.target.*;
import ghidra.dbg.target.TargetConsole.Channel;
import ghidra.dbg.target.TargetExecutionStateful.TargetExecutionState;
import ghidra.dbg.util.DebuggerCallbackReorderer;
import ghidra.debug.api.workflow.DebuggerBot;
import ghidra.debug.api.workflow.DebuggerBotInfo;
import ghidra.framework.options.annotation.HelpInfo;
import ghidra.program.model.address.Address;
import ghidra.program.model.address.AddressRange;
import ghidra.util.datastruct.PrivatelyQueuedListener;
@DebuggerBotInfo(
description = "Link debugger to Frida",
details = "Listens for debuggers to add state to Frida.",
help = @HelpInfo(anchor = "link_frida"),
enabledByDefault = true)
public class FridaDebuggerBot implements DebuggerBot {
private DebuggerWorkflowFrontEndService service;
private FridaObjectListener listener = new FridaObjectListener();
private List<DebuggerObjectModel> models = new ArrayList<>();
private FridaModelImpl primary;
private FridaManagerImpl manager;
@Override
public void enable(DebuggerWorkflowFrontEndService service) {
this.service = service;
}
@Override
public boolean isEnabled() {
return service != null;
}
@Override
public void disable() {
service = null;
}
@Override
public void modelAdded(DebuggerObjectModel model) {
models.add(model);
if (model instanceof FridaModelImpl) {
primary = (FridaModelImpl) model;
manager = primary.getManager();
}
else {
model.addModelListener(getListener(), true);
}
}
@Override
public void modelRemoved(DebuggerObjectModel model) {
models.remove(model);
if (model instanceof FridaModelImpl) {
primary = null;
manager = null;
}
else {
model.removeModelListener(getListener());
}
}
public DebuggerModelListener getListener() {
return listener.queue.in;
}
private Object findMatchingObject(TargetObject object) {
if (object instanceof TargetProcess) {
String id = Long.toHexString(((TargetProcess) object).getPid());
return manager.getProcess(manager.getCurrentSession(), id);
}
if (object instanceof TargetThread) {
TargetProcess tp = DebugModelConventions.ancestor(TargetProcess.class, object);
Object found = findMatchingObject(tp);
if (found != null) {
FridaProcess process = (FridaProcess) found;
String id = Long.toHexString(((TargetThread) object).getTid());
return manager.getThread(process, id);
}
}
return null;
}
class FridaObjectListener extends AnnotatedDebuggerAttributeListener {
protected final DebuggerCallbackReorderer reorderer = new DebuggerCallbackReorderer(this);
protected final PrivatelyQueuedListener<DebuggerModelListener> queue =
new PrivatelyQueuedListener<>(DebuggerModelListener.class, "ObjectsProvider-EventQueue",
reorderer);
public FridaObjectListener() {
super(MethodHandles.lookup());
}
@AttributeCallback(TargetAccessConditioned.ACCESSIBLE_ATTRIBUTE_NAME)
public void accessibilityChanged(TargetObject object, boolean accessible) {
//System.err.println("accessibilityChanged: "+object+":"+accessible);
}
@Override
public void consoleOutput(TargetObject console, Channel channel, String out) {
//System.err.println("consoleOutput: "+out);
}
@AttributeCallback(TargetObject.DISPLAY_ATTRIBUTE_NAME)
public void displayChanged(TargetObject object, String display) {
//System.err.println("displayChanged: "+display);
}
@AttributeCallback(TargetObject.MODIFIED_ATTRIBUTE_NAME)
public void modifiedChanged(TargetObject object, boolean modified) {
//System.err.println("modifiedChanged: "+object);
}
@AttributeCallback(TargetExecutionStateful.STATE_ATTRIBUTE_NAME)
public void executionStateChanged(TargetObject object, TargetExecutionState state) {
if (primary != null) {
Object localObject = findMatchingObject(object);
if (localObject != null) {
manager.processEvent(new FridaStateChangedEvent(localObject, state));
}
}
}
@AttributeCallback(TargetFocusScope.FOCUS_ATTRIBUTE_NAME)
public void focusChanged(TargetObject object, TargetObject focused) {
if (primary != null) {
if (focused instanceof TargetThread) {
Object localObject = findMatchingObject(focused);
if (localObject != null) {
FridaThreadInfo info = new FridaThreadInfo((FridaThread) localObject);
manager.processEvent(new FridaThreadSelectedEvent(info));
}
}
}
}
@Override
public void memoryUpdated(TargetObject memory, Address address, byte[] data) {
//System.err.println("memoryUpdated: "+address);
}
@Override
public void memoryReadError(TargetObject memory, AddressRange range,
DebuggerMemoryAccessException e) {
//System.err.println("memoryReadError: "+range);
}
@AttributeCallback(TargetInterpreter.PROMPT_ATTRIBUTE_NAME)
public void promptChanged(TargetObject interpreter, String prompt) {
//System.err.println("promptChanged: "+prompt);
}
@Override
public void registersUpdated(TargetObject bank, Map<String, byte[]> updates) {
//System.err.println("registersUpdated: "+bank);
}
@Override
public void elementsChanged(TargetObject parent, Collection<String> removed,
Map<String, ? extends TargetObject> added) {
//System.err.println("elementsChanged: "+parent);
}
@Override
public void attributesChanged(TargetObject parent, Collection<String> removed,
Map<String, ?> added) {
super.attributesChanged(parent, removed, added);
//System.err.println("attributesChanged: "+parent);
}
}
}

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelImpl.java
View File

@@ -126,7 +126,7 @@ public class FridaModelImpl extends AbstractFridaModel implements DebuggerObject
}
catch (RejectedExecutionException e) {
reportError(this, "Model is already closing", e);
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
catch (Throwable t) {
return CompletableFuture.failedFuture(t);

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelTargetAvailableDevicesContainerImpl.java
View File

@@ -96,7 +96,7 @@ public class FridaModelTargetAvailableDevicesContainerImpl extends FridaModelTar
}
default:
}
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelTargetAvailableProcessesContainerImpl.java
View File

@@ -96,7 +96,7 @@ public class FridaModelTargetAvailableProcessesContainerImpl extends FridaModelT
}
default:
}
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelTargetProcessContainerImpl.java
View File

@@ -144,7 +144,7 @@ public class FridaModelTargetProcessContainerImpl extends FridaModelTargetObject
}
default:
}
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}

4
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelTargetProcessImpl.java
View File

@@ -154,7 +154,7 @@ public class FridaModelTargetProcessImpl extends FridaModelTargetObjectImpl
public CompletableFuture<Void> launch(List<String> args) {
model.gateFuture(getManager().execute(new FridaLaunchProcessCommand(getManager(),
getProcess().getName(), args)));
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
@Override
@@ -200,7 +200,7 @@ public class FridaModelTargetProcessImpl extends FridaModelTargetObjectImpl
@Override
public CompletableFuture<Void> delete() {
return AsyncUtils.NIL;
return AsyncUtils.nil();
//return model.gateFuture(process.remove());
}

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelTargetRegisterContainerImpl.java
View File

@@ -147,7 +147,7 @@ public class FridaModelTargetRegisterContainerImpl
reg.getRegister().setValue(val.toString());
}
broadcast().registersUpdated(getProxy(), values);
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}

2
Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/impl/FridaModelTargetThreadContainerImpl.java
View File

@@ -170,7 +170,7 @@ public class FridaModelTargetThreadContainerImpl extends FridaModelTargetObjectI
}
default:
}
return AsyncUtils.NIL;
return AsyncUtils.nil();
}
}