-
Notifications
You must be signed in to change notification settings - Fork 888
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
83 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
7.68 | ||
* 优化 h264 实时屏幕 | ||
|
||
7.67 | ||
* 精简掉部分无效的程序逻辑 | ||
* 修复自动恢复时间过长的问题 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
diff --git a/console/cli.py b/console/cli.py | ||
index 1fc22fb..80e52dc 100644 | ||
--- a/console/cli.py | ||
+++ b/console/cli.py | ||
@@ -31,8 +31,10 @@ from ..utils.helpers import normalize_gadget_name, print_frida_connection_help, | ||
@click.option('--serial', '-S', required=False, default=None, help='A device serial to connect to.') | ||
@click.option('--debug', '-d', required=False, default=False, is_flag=True, | ||
help='Enable debug mode with verbose output. (Includes agent source map in stack traces)') | ||
+@click.option('--certificate', '-c', required=False, default=None, help="Frida connection certificate") | ||
+@click.option('--token', '-t', required=False, default=None, help="Frida connection token") | ||
def cli(network: bool, host: str, port: int, api_host: str, api_port: int, | ||
- gadget: str, serial: str, debug: bool) -> None: | ||
+ gadget: str, serial: str, debug: bool, certificate: str, token: str) -> None: | ||
""" | ||
\b | ||
_ _ _ _ | ||
@@ -56,6 +58,8 @@ def cli(network: bool, host: str, port: int, api_host: str, api_port: int, | ||
state_connection.use_network() | ||
state_connection.host = host | ||
state_connection.port = port | ||
+ state_connection.certificate = certificate | ||
+ state_connection.token = token | ||
|
||
if serial: | ||
state_connection.device_serial = serial | ||
diff --git a/utils/agent.py b/utils/agent.py | ||
index 6d88e3a..fbe9b40 100644 | ||
--- a/utils/agent.py | ||
+++ b/utils/agent.py | ||
@@ -126,8 +126,13 @@ class Agent(object): | ||
return device | ||
|
||
if state_connection.get_comms_type() == state_connection.TYPE_REMOTE: | ||
+ kwargs = {} | ||
+ if state_connection.certificate: | ||
+ kwargs["certificate"] = state_connection.certificate | ||
+ if state_connection.token: | ||
+ kwargs["token"] = state_connection.token | ||
device = frida.get_device_manager().add_remote_device('{host}:{port}'.format( | ||
- host=state_connection.host, port=state_connection.port)) | ||
+ host=state_connection.host, port=state_connection.port), **kwargs) | ||
click.secho('Using networked device @`{n}`'.format(n=device.name), bold=True) | ||
|
||
return device |