catarrh
903ead9791
A container's 127.0.0.1 is its own loopback, so a GSMTAP feed sent to the container's bridge address never reached the listener: it was hard-bound to 127.0.0.1. - `simtrace-analyser-server --gsmtap-bind ADDR` (default 127.0.0.1) is passed through GsmtapListener to GsmtapReceiver (whose bind_ip already existed), including the receiver re-created by a start() after close. The startup banner prints the effective bind address next to the port. - READMEs (EN/RU) document the option, naming the container case. - tests: the listener forwards the address on construction and on start(), binds 0.0.0.0, and keeps the loopback default. Verified end-to-end: with --gsmtap-bind 0.0.0.0 the socket listens on 0.0.0.0:14732 and an ATR + APDU sent to 127.0.0.1:14732 landed in the capture session (2 messages); without the flag it listens on 127.0.0.1. 557 Python + 80 Node tests.
103 lines
4.2 KiB
Python
103 lines
4.2 KiB
Python
"""simtrace-analyser-server — CLI entry point.
|
|
|
|
Usage:
|
|
simtrace-analyser-server --capture gsmtap [--gsmtap-bind 0.0.0.0]
|
|
[--gsmtap-port 4729] [--port 8081]
|
|
simtrace-analyser-server --capture direct [--port 8081]
|
|
"""
|
|
|
|
import argparse
|
|
import os
|
|
import sys
|
|
from http.server import HTTPServer
|
|
|
|
from .server import RequestHandler
|
|
from .database import Database, DEFAULT_DB_PATH
|
|
from .capture import CaptureManager, GsmtapListener, DirectSniffer
|
|
from .version import __version__
|
|
|
|
|
|
def _pick_web_dir(package_dir, repo_root):
|
|
"""The installed package's bundled PWA first, then the source checkout."""
|
|
packaged = os.path.join(package_dir, 'web')
|
|
if os.path.isfile(os.path.join(packaged, 'index.html')):
|
|
return packaged
|
|
return os.path.join(repo_root, 'frontend')
|
|
|
|
|
|
def _default_web_dir():
|
|
# A wheel/sdist install carries simtrace_analyser/web (copied there by
|
|
# setup.py); an editable install and a plain source run fall through to
|
|
# <repo>/frontend. __file__ is <repo>/simtrace_analyser/__main__.py.
|
|
pkg_dir = os.path.dirname(os.path.abspath(__file__))
|
|
return _pick_web_dir(pkg_dir, os.path.dirname(pkg_dir))
|
|
|
|
|
|
def main():
|
|
p = argparse.ArgumentParser(
|
|
prog='simtrace-analyser-server',
|
|
description='HTTP API + PWA server for APDU trace capture and analysis')
|
|
p.add_argument('--host', default='127.0.0.1',
|
|
help='HTTP bind address (default: 127.0.0.1)')
|
|
p.add_argument('--port', type=int, default=8081,
|
|
help='HTTP server port (default: 8081)')
|
|
p.add_argument('--db', default=DEFAULT_DB_PATH,
|
|
help=f'SQLite database path (default: {DEFAULT_DB_PATH})')
|
|
p.add_argument('--capture', choices=['gsmtap', 'direct', 'disabled'], default='gsmtap',
|
|
help='Capture mode: gsmtap (listen UDP 4729), direct (SIMtrace2 USB), or disabled (no capture)')
|
|
p.add_argument('--gsmtap-port', type=int, default=4729,
|
|
help='UDP port for GSMTAP listener (default: 4729)')
|
|
p.add_argument('--gsmtap-bind', default='127.0.0.1', metavar='ADDR',
|
|
help='UDP bind address for the GSMTAP listener '
|
|
'(default: 127.0.0.1; use 0.0.0.0 in a container)')
|
|
p.add_argument('--log-interval', type=float, default=60.0,
|
|
help='Seconds between capture liveness heartbeat logs '
|
|
'(default: 60.0)')
|
|
p.add_argument('--log-requests', action='store_true', default=False,
|
|
help='Log every HTTP request (off by default)')
|
|
p.add_argument('--web-dir', default=_default_web_dir(), metavar='PATH',
|
|
help='Directory with the simtrace-analyser PWA static files to serve '
|
|
'(default: the PWA bundled in the installed package, '
|
|
'or <repo>/frontend in a source checkout)')
|
|
args = p.parse_args()
|
|
|
|
db = Database(args.db)
|
|
|
|
capture = None
|
|
if args.capture == 'gsmtap':
|
|
backend = GsmtapListener(bind_ip=args.gsmtap_bind, bind_port=args.gsmtap_port)
|
|
capture = CaptureManager(backend, db, log_interval=args.log_interval)
|
|
elif args.capture == 'direct':
|
|
backend = DirectSniffer()
|
|
capture = CaptureManager(backend, db, log_interval=args.log_interval)
|
|
|
|
RequestHandler.db = db
|
|
RequestHandler.capture = capture
|
|
RequestHandler.capture_mode = args.capture
|
|
RequestHandler.log_requests = args.log_requests
|
|
|
|
server = HTTPServer((args.host, args.port), RequestHandler)
|
|
server.web_dir = args.web_dir
|
|
|
|
print(f'simtrace-analyser-server v{__version__} — http://{args.host}:{args.port}', file=sys.stderr)
|
|
print(f' capture mode: {args.capture}', file=sys.stderr)
|
|
if args.capture == 'gsmtap':
|
|
print(f' GSMTAP bind: {args.gsmtap_bind}', file=sys.stderr)
|
|
print(f' GSMTAP port: {args.gsmtap_port}', file=sys.stderr)
|
|
print(f' database: {args.db}', file=sys.stderr)
|
|
print(f' PWA served at http://{args.host}:{args.port}/', file=sys.stderr)
|
|
print(file=sys.stderr)
|
|
|
|
try:
|
|
server.serve_forever()
|
|
except KeyboardInterrupt:
|
|
pass
|
|
finally:
|
|
if capture and capture.active:
|
|
capture.stop_session()
|
|
server.server_close()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|