Deploy ttstd relay and configure secure public WSS clients
This commit is contained in:
1 parent
82adce545d
commit
c38f067bea
16 files changed
+384
-24
No files matched your search
+47
-6
@@ -1,11 +1,16 @@
|
||||
"""Opt-in, read-only smoke test through a remote ADB smart socket and all three programs."""
|
||||
import argparse
|
||||
import http.client
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import secrets
|
||||
import socket
|
||||
import ssl
|
||||
import subprocess
|
||||
import time
|
||||
import urllib.request
|
||||
import urllib.parse
|
||||
|
||||
from e2e import ROOT, free_port, wait_until
|
||||
|
||||
@@ -17,15 +22,31 @@ def main():
|
||||
parser.add_argument("--adb", default="adb")
|
||||
parser.add_argument("--bin-dir", type=Path, default=ROOT / "bin")
|
||||
parser.add_argument("--rust-dir", type=Path)
|
||||
parser.add_argument("--relay-url", help="Use an already deployed wss:// relay instead of a temporary local server")
|
||||
parser.add_argument("--connect-address", help="Optional origin host:port; TLS still verifies relay hostname")
|
||||
parser.add_argument("--credentials-dir", type=Path)
|
||||
args = parser.parse_args()
|
||||
suffix = ".exe" if os.name == "nt" else ""
|
||||
rust_dir = args.rust_dir or args.bin_dir
|
||||
relay_port, local_port = free_port(), free_port()
|
||||
server_url = f"ws://127.0.0.1:{relay_port}"
|
||||
server_url = args.relay_url or f"ws://127.0.0.1:{relay_port}"
|
||||
endpoint = f"127.0.0.1:{local_port}"
|
||||
env = os.environ.copy()
|
||||
env["ADS_AGENT_TOKEN"] = secrets.token_hex(32)
|
||||
env["ADS_CLIENT_TOKEN"] = secrets.token_hex(32)
|
||||
if args.relay_url:
|
||||
if not args.relay_url.startswith('wss://'):
|
||||
raise SystemExit('External relay smoke test requires wss://')
|
||||
if args.credentials_dir:
|
||||
for role in ('agent', 'client'):
|
||||
for line in (args.credentials_dir / (role + '.env')).read_text().splitlines():
|
||||
name, separator, value = line.partition('=')
|
||||
if separator and name in ('ADS_AGENT_TOKEN', 'ADS_CLIENT_TOKEN'):
|
||||
env[name] = value
|
||||
if not env.get('ADS_AGENT_TOKEN') or not env.get('ADS_CLIENT_TOKEN'):
|
||||
raise SystemExit('External relay requires role tokens in env or --credentials-dir')
|
||||
else:
|
||||
env["ADS_AGENT_TOKEN"] = secrets.token_hex(32)
|
||||
env["ADS_CLIENT_TOKEN"] = secrets.token_hex(32)
|
||||
env.pop('ADS_CONNECT_ADDRESS', None)
|
||||
for key in ("ADB_SERVER_SOCKET", "ANDROID_ADB_SERVER_ADDRESS", "ANDROID_ADB_SERVER_PORT"):
|
||||
env.pop(key, None)
|
||||
folder = ROOT / "work" / "real-device"
|
||||
@@ -45,18 +66,38 @@ def main():
|
||||
text=True, timeout=10)
|
||||
|
||||
def leased():
|
||||
if args.relay_url:
|
||||
url = urllib.parse.urlsplit(args.relay_url)
|
||||
connection = http.client.HTTPSConnection(url.hostname, url.port or 443, timeout=5)
|
||||
if args.connect_address:
|
||||
host, port = args.connect_address.rsplit(':', 1)
|
||||
tcp = socket.create_connection((host, int(port)), timeout=5)
|
||||
connection.sock = ssl.create_default_context().wrap_socket(tcp, server_hostname=url.hostname)
|
||||
try:
|
||||
connection.request('GET', url.path.rstrip('/') + '/v1/devices',
|
||||
headers={'Authorization': 'Bearer ' + env['ADS_CLIENT_TOKEN']})
|
||||
response = connection.getresponse()
|
||||
if response.status != 200:
|
||||
raise ConnectionError(f'Device query failed: HTTP {response.status}')
|
||||
return any(device['id'] == 'smoke-phone' and device['busy'] for device in json.load(response))
|
||||
finally:
|
||||
connection.close()
|
||||
request = urllib.request.Request(f"http://127.0.0.1:{relay_port}/v1/devices",
|
||||
headers={"Authorization": "Bearer " + env["ADS_CLIENT_TOKEN"]})
|
||||
with urllib.request.urlopen(request, timeout=2) as response:
|
||||
return b'"busy":true' in response.read()
|
||||
|
||||
try:
|
||||
start("server", [(args.bin_dir / f"ads-server{suffix}").resolve(), "--listen", f"127.0.0.1:{relay_port}"])
|
||||
if not args.relay_url:
|
||||
start("server", [(args.bin_dir / f"ads-server{suffix}").resolve(), "--listen", f"127.0.0.1:{relay_port}"])
|
||||
network_args = [] if args.relay_url else ['--allow-insecure']
|
||||
if args.connect_address:
|
||||
network_args += ['--connect-address', args.connect_address]
|
||||
start("agent", [(rust_dir / f"ads-agent{suffix}").resolve(), "--server", server_url,
|
||||
"--allow-insecure", "--device", "smoke-phone", "--adb-server", args.adb_server,
|
||||
*network_args, "--device", "smoke-phone", "--adb-server", args.adb_server,
|
||||
"--adb-serial", args.serial])
|
||||
start("client", [(rust_dir / f"ads-client{suffix}").resolve(), "--server", server_url,
|
||||
"--allow-insecure", "--device", "smoke-phone", "--listen", endpoint,
|
||||
*network_args, "--device", "smoke-phone", "--listen", endpoint,
|
||||
"--no-auto-connect"])
|
||||
wait_until(leased, "remote phone lease", seconds=20)
|
||||
print(adb("connect", endpoint).stdout.strip(), flush=True)
|
||||
|
||||
Reference in new issue
Block a user