Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 11:31:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-5105_d-millar_better_labels--SQUASHED' (Closes #7167)
This commit is contained in:
Ryan Kurtz 2024-11-15 13:30:16 -05:00
commit b536b99e60
2 changed files with 86 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/methods.py
View File

@ -1,17 +1,17 @@
## ### ## ###
# IP: GHIDRA # IP: GHIDRA
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
## ##
from concurrent.futures import Future, ThreadPoolExecutor from concurrent.futures import Future, ThreadPoolExecutor
from contextlib import redirect_stdout from contextlib import redirect_stdout
@ -199,9 +199,11 @@ def execute(cmd: str, to_string: bool=False):
exec(cmd, shared_globals) exec(cmd, shared_globals)
@REGISTRY.method @REGISTRY.method(action='evaluate', display='Evaluate')
# @util.dbg.eng_thread # @util.dbg.eng_thread
def evaluate(expr: str): def evaluate(
session: sch.Schema('Session'),
expr: ParamDesc(str, display='Expr')):
"""Evaluate a Python3 expression.""" """Evaluate a Python3 expression."""
return str(eval(expr, shared_globals)) return str(eval(expr, shared_globals))
@ -323,15 +325,16 @@ def remove_process(process: sch.Schema('Process')):
dbg().detach_proc() dbg().detach_proc()
@REGISTRY.method(action='connect') @REGISTRY.method(action='connect', display='Connect')
@util.dbg.eng_thread @util.dbg.eng_thread
def target(process: sch.Schema('Process'), spec: str): def target(
session: sch.Schema('Session'),
cmd: ParamDesc(str, display='Command')):
"""Connect to a target machine or process.""" """Connect to a target machine or process."""
find_proc_by_obj(process) dbg().attach_kernel(cmd)
dbg().attach_kernel(spec)
@REGISTRY.method(action='attach') @REGISTRY.method(action='attach', display='Attach')
@util.dbg.eng_thread @util.dbg.eng_thread
def attach_obj(target: sch.Schema('Attachable')): def attach_obj(target: sch.Schema('Attachable')):
"""Attach the process to the given target.""" """Attach the process to the given target."""
@ -339,29 +342,34 @@ def attach_obj(target: sch.Schema('Attachable')):
dbg().attach_proc(pid) dbg().attach_proc(pid)
@REGISTRY.method(action='attach') @REGISTRY.method(action='attach', display='Attach by pid')
@util.dbg.eng_thread @util.dbg.eng_thread
def attach_pid(pid: int): def attach_pid(
session: sch.Schema('Session'),
pid: ParamDesc(str, display='PID')):
"""Attach the process to the given target.""" """Attach the process to the given target."""
dbg().attach_proc(pid) dbg().attach_proc(int(pid))
@REGISTRY.method(action='attach') @REGISTRY.method(action='attach', display='Attach by name')
@util.dbg.eng_thread @util.dbg.eng_thread
def attach_name(process: sch.Schema('Process'), name: str): def attach_name(
session: sch.Schema('Session'),
name: ParamDesc(str, display='Name')):
"""Attach the process to the given target.""" """Attach the process to the given target."""
dbg().attach_proc(name) dbg().attach_proc(name)
@REGISTRY.method @REGISTRY.method(action='detach', display='Detach')
@util.dbg.eng_thread @util.dbg.eng_thread
def detach(process: sch.Schema('Process')): def detach(process: sch.Schema('Process')):
"""Detach the process's target.""" """Detach the process's target."""
dbg().detach_proc() dbg().detach_proc()
@REGISTRY.method(action='launch') @REGISTRY.method(action='launch', display='Launch')
def launch_loader( def launch_loader(
session: sch.Schema('Session'),
file: ParamDesc(str, display='File'), file: ParamDesc(str, display='File'),
args: ParamDesc(str, display='Arguments')=''): args: ParamDesc(str, display='Arguments')=''):
""" """
@ -373,8 +381,9 @@ def launch_loader(
commands.ghidra_trace_create(command=file, start_trace=False) commands.ghidra_trace_create(command=file, start_trace=False)
@REGISTRY.method(action='launch') @REGISTRY.method(action='launch', display='LaunchEx')
def launch( def launch(
session: sch.Schema('Session'),
file: ParamDesc(str, display='File'), file: ParamDesc(str, display='File'),
args: ParamDesc(str, display='Arguments')='', args: ParamDesc(str, display='Arguments')='',
initial_break: ParamDesc(bool, display='Initial Break')=True, initial_break: ParamDesc(bool, display='Initial Break')=True,
@ -431,7 +440,7 @@ def step_out(thread: sch.Schema('Thread')):
util.dbg.run_async(lambda: dbg().stepout()) util.dbg.run_async(lambda: dbg().stepout())
@REGISTRY.method(action='step_to') @REGISTRY.method(action='step_to', display='Step To')
def step_to(thread: sch.Schema('Thread'), address: Address, max=None): def step_to(thread: sch.Schema('Thread'), address: Address, max=None):
"""Continue execution up to the given address.""" """Continue execution up to the given address."""
find_thread_by_obj(thread) find_thread_by_obj(thread)

81
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidrattd/methods.py
View File

@ -1,17 +1,17 @@
## ### ## ###
# IP: GHIDRA # IP: GHIDRA
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
## ##
from concurrent.futures import Future, ThreadPoolExecutor from concurrent.futures import Future, ThreadPoolExecutor
import re import re
@ -196,8 +196,10 @@ def execute(cmd: str, to_string: bool=False):
exec("{}".format(cmd), shared_globals) exec("{}".format(cmd), shared_globals)
@REGISTRY.method @REGISTRY.method(action='evaluate', display='Evaluate')
def evaluate(expr: str): def evaluate(
session: sch.Schema('Session'),
expr: ParamDesc(str, display='Expr')):
"""Execute a CLI command.""" """Execute a CLI command."""
return str(eval("{}".format(expr), shared_globals)) return str(eval("{}".format(expr), shared_globals))
@ -311,40 +313,51 @@ def remove_process(process: sch.Schema('Process')):
dbg().detach() dbg().detach()
@REGISTRY.method(action='connect') @REGISTRY.method(action='connect', display='Connect')
def target(process: sch.Schema('Process'), spec: str): @util.dbg.eng_thread
def target(
session: sch.Schema('Session'),
cmd: ParamDesc(str, display='Command')):
"""Connect to a target machine or process.""" """Connect to a target machine or process."""
find_proc_by_obj(process) dbg().attach_kernel(cmd)
dbg().attach(spec)
@REGISTRY.method(action='attach') @REGISTRY.method(action='attach', display='Attach')
@util.dbg.eng_thread
def attach_obj(target: sch.Schema('Attachable')): def attach_obj(target: sch.Schema('Attachable')):
"""Attach the process to the given target.""" """Attach the process to the given target."""
pid = find_availpid_by_obj(target) pid = find_availpid_by_obj(target)
dbg().attach(pid) dbg().attach(pid)
@REGISTRY.method(action='attach') @REGISTRY.method(action='attach', display='Attach by pid')
def attach_pid(pid: int): @util.dbg.eng_thread
def attach_pid(
session: sch.Schema('Session'),
pid: ParamDesc(str, display='PID')):
"""Attach the process to the given target.""" """Attach the process to the given target."""
dbg().attach(pid) dbg().attach_proc(int(pid))
@REGISTRY.method(action='attach') @REGISTRY.method(action='attach', display='Attach by name')
def attach_name(process: sch.Schema('Process'), name: str): @util.dbg.eng_thread
def attach_name(
session: sch.Schema('Session'),
name: ParamDesc(str, display='Name')):
"""Attach the process to the given target.""" """Attach the process to the given target."""
dbg().atach(name) dbg().attach_proc(name)
@REGISTRY.method @REGISTRY.method(action='detach', display='Detach')
@util.dbg.eng_thread
def detach(process: sch.Schema('Process')): def detach(process: sch.Schema('Process')):
"""Detach the process's target.""" """Detach the process's target."""
dbg().detach() dbg().detach()
@REGISTRY.method(action='launch') @REGISTRY.method(action='launch', display='Launch')
def launch_loader( def launch_loader(
session: sch.Schema('Session'),
file: ParamDesc(str, display='File'), file: ParamDesc(str, display='File'),
args: ParamDesc(str, display='Arguments')=''): args: ParamDesc(str, display='Arguments')=''):
""" """
@ -356,11 +369,13 @@ def launch_loader(
commands.ghidra_trace_create(command=file, start_trace=False) commands.ghidra_trace_create(command=file, start_trace=False)
@REGISTRY.method(action='launch') @REGISTRY.method(action='launch', display='LaunchEx')
def launch( def launch(
timeout: ParamDesc(int, display='Timeout'), session: sch.Schema('Session'),
file: ParamDesc(str, display='File'), file: ParamDesc(str, display='File'),
args: ParamDesc(str, display='Arguments')=''): args: ParamDesc(str, display='Arguments')='',
initial_break: ParamDesc(bool, display='Initial Break')=True,
timeout: ParamDesc(int, display='Timeout')=-1):
""" """
Run a native process with the given command line. Run a native process with the given command line.
""" """
@ -368,7 +383,7 @@ def launch(
if args != None: if args != None:
command += " "+args command += " "+args
commands.ghidra_trace_create( commands.ghidra_trace_create(
command, initial_break=False, timeout=timeout, start_trace=False) command, initial_break=initial_break, timeout=timeout, start_trace=False)
@REGISTRY.method @REGISTRY.method
@ -413,7 +428,7 @@ def step_out(thread: sch.Schema('Thread')):
hooks.on_stop() hooks.on_stop()
@REGISTRY.method(action='step_to') @REGISTRY.method(action='step_to', display='Step To')
def step_to(thread: sch.Schema('Thread'), address: Address, max=None): def step_to(thread: sch.Schema('Thread'), address: Address, max=None):
"""Continue execution up to the given address.""" """Continue execution up to the given address."""
find_thread_by_obj(thread) find_thread_by_obj(thread)