catarrh
2a58fec0a3
- capture.py: DirectSniffer/GsmtapListener yield (type, data, flags), CaptureManager passes flags to insert_message (change flags were previously dropped, leaving every change row with flags=0) - protocol.py: add _parse_fidi (1-byte value) — FIDI was mis-mapped to _parse_change (4-byte flags), so FIDI messages were silently dropped - database.py: pass flags into decode_sniff_msg - decode.py: decode_change(flags) reads flags directly; decode_sniff_msg gains flags parameter; change messages no longer require non-empty data - tests: fix FIDI test, add change/fidi decode tests (43 total)
189 lines
6.8 KiB
Python
189 lines
6.8 KiB
Python
"""SQLite database for session and APDU storage."""
|
|
|
|
import os
|
|
import sqlite3
|
|
import time
|
|
from contextlib import contextmanager
|
|
|
|
DEFAULT_DB_DIR = os.path.expanduser('~/.simtrace-analyser')
|
|
DEFAULT_DB_PATH = os.path.join(DEFAULT_DB_DIR, 'sessions.db')
|
|
|
|
_SCHEMA = """
|
|
CREATE TABLE IF NOT EXISTS sessions (
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
name TEXT,
|
|
started TEXT NOT NULL,
|
|
ended TEXT,
|
|
mode TEXT NOT NULL
|
|
);
|
|
|
|
CREATE TABLE IF NOT EXISTS messages (
|
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
session_id INTEGER NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
|
|
elapsed REAL NOT NULL,
|
|
type TEXT NOT NULL,
|
|
data BLOB NOT NULL,
|
|
flags INTEGER DEFAULT 0
|
|
);
|
|
|
|
CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id);
|
|
CREATE INDEX IF NOT EXISTS idx_messages_type ON messages(type);
|
|
CREATE INDEX IF NOT EXISTS idx_messages_elapsed ON messages(session_id, elapsed);
|
|
"""
|
|
|
|
|
|
def _iso_now():
|
|
return time.strftime('%Y-%m-%dT%H:%M:%S.', time.localtime()) + \
|
|
f'{time.time() % 1 * 1000:03.0f}'
|
|
|
|
|
|
class Database:
|
|
def __init__(self, db_path=None):
|
|
if db_path is None:
|
|
db_path = DEFAULT_DB_PATH
|
|
os.makedirs(os.path.dirname(db_path), exist_ok=True)
|
|
self._conn = sqlite3.connect(db_path, check_same_thread=False)
|
|
self._conn.execute('PRAGMA journal_mode=WAL')
|
|
self._conn.execute('PRAGMA foreign_keys=ON')
|
|
self._conn.executescript(_SCHEMA)
|
|
self._conn.commit()
|
|
|
|
# --- Sessions ---
|
|
|
|
def create_session(self, mode):
|
|
cur = self._conn.execute(
|
|
'INSERT INTO sessions (started, mode) VALUES (?, ?)',
|
|
(_iso_now(), mode))
|
|
self._conn.commit()
|
|
return cur.lastrowid
|
|
|
|
def close_session(self, session_id):
|
|
self._conn.execute(
|
|
'UPDATE sessions SET ended=? WHERE id=? AND ended IS NULL',
|
|
(_iso_now(), session_id))
|
|
self._conn.commit()
|
|
|
|
def rename_session(self, session_id, name):
|
|
self._conn.execute(
|
|
'UPDATE sessions SET name=? WHERE id=?',
|
|
(name, session_id))
|
|
self._conn.commit()
|
|
|
|
def delete_session(self, session_id):
|
|
self._conn.execute('DELETE FROM messages WHERE session_id=?', (session_id,))
|
|
self._conn.execute('DELETE FROM sessions WHERE id=?', (session_id,))
|
|
self._conn.commit()
|
|
|
|
def get_session(self, session_id):
|
|
row = self._conn.execute(
|
|
'SELECT id, name, started, ended, mode FROM sessions WHERE id=?',
|
|
(session_id,)).fetchone()
|
|
if row is None:
|
|
return None
|
|
return self._row_to_session(row)
|
|
|
|
def list_sessions(self):
|
|
rows = self._conn.execute("""
|
|
SELECT s.id, s.name, s.started, s.ended, s.mode,
|
|
COUNT(m.id) AS msg_count
|
|
FROM sessions s LEFT JOIN messages m ON m.session_id = s.id
|
|
GROUP BY s.id
|
|
ORDER BY s.started DESC
|
|
""").fetchall()
|
|
return [self._row_to_session(r) for r in rows]
|
|
|
|
def get_active_session(self):
|
|
row = self._conn.execute(
|
|
'SELECT id, name, started, ended, mode FROM sessions WHERE ended IS NULL ORDER BY id DESC LIMIT 1'
|
|
).fetchone()
|
|
if row is None:
|
|
return None
|
|
return self._row_to_session(row)
|
|
|
|
def _row_to_session(self, row):
|
|
d = {'id': row[0], 'name': row[1], 'started': row[2], 'ended': row[3], 'mode': row[4]}
|
|
if len(row) > 5:
|
|
d['message_count'] = row[5]
|
|
return d
|
|
|
|
# --- Messages ---
|
|
|
|
def insert_message(self, session_id, elapsed, msg_type, data, flags=0):
|
|
cur = self._conn.execute(
|
|
'INSERT INTO messages (session_id, elapsed, type, data, flags) VALUES (?,?,?,?,?)',
|
|
(session_id, elapsed, msg_type, data, flags))
|
|
self._conn.commit()
|
|
return cur.lastrowid
|
|
|
|
def get_message(self, msg_id):
|
|
row = self._conn.execute(
|
|
'SELECT id, session_id, elapsed, type, data, flags FROM messages WHERE id=?',
|
|
(msg_id,)).fetchone()
|
|
if row is None:
|
|
return None
|
|
return self._row_to_message(row)
|
|
|
|
def get_messages(self, session_id, offset=0, limit=200):
|
|
rows = self._conn.execute(
|
|
'SELECT id, session_id, elapsed, type, data, flags FROM messages '
|
|
'WHERE session_id=? ORDER BY elapsed, id LIMIT ? OFFSET ?',
|
|
(session_id, limit, offset)).fetchall()
|
|
return [self._row_to_message(r) for r in rows]
|
|
|
|
def get_messages_after(self, session_id, after_id):
|
|
rows = self._conn.execute(
|
|
'SELECT id, session_id, elapsed, type, data, flags FROM messages '
|
|
'WHERE session_id=? AND id > ? ORDER BY elapsed, id',
|
|
(session_id, after_id)).fetchall()
|
|
return [self._row_to_message(r) for r in rows]
|
|
|
|
def count_messages(self, session_id):
|
|
row = self._conn.execute(
|
|
'SELECT COUNT(*) FROM messages WHERE session_id=?',
|
|
(session_id,)).fetchone()
|
|
return row[0]
|
|
|
|
def search_messages(self, session_id, query):
|
|
hex_q = ''.join(c for c in query if c in '0123456789abcdefABCDEF')
|
|
if not hex_q:
|
|
return []
|
|
rows = self._conn.execute(
|
|
"SELECT id, session_id, elapsed, type, data, flags FROM messages "
|
|
"WHERE session_id=? AND hex(data) LIKE ? ORDER BY elapsed, id",
|
|
(session_id, f'%{hex_q.lower()}%')).fetchall()
|
|
return [self._row_to_message(r) for r in rows]
|
|
|
|
def filter_messages(self, session_id, msg_type):
|
|
rows = self._conn.execute(
|
|
'SELECT id, session_id, elapsed, type, data, flags FROM messages '
|
|
'WHERE session_id=? AND type=? ORDER BY elapsed, id',
|
|
(session_id, msg_type)).fetchall()
|
|
return [self._row_to_message(r) for r in rows]
|
|
|
|
def get_type_counts(self, session_id):
|
|
rows = self._conn.execute(
|
|
'SELECT type, COUNT(*) FROM messages WHERE session_id=? GROUP BY type ORDER BY COUNT(*) DESC',
|
|
(session_id,)).fetchall()
|
|
return [{'type': r[0], 'count': r[1]} for r in rows]
|
|
|
|
def _row_to_message(self, row):
|
|
data_blob = row[4]
|
|
flags = row[5]
|
|
msg = {
|
|
'id': row[0],
|
|
'session_id': row[1],
|
|
'elapsed': row[2],
|
|
'type': row[3],
|
|
'data': data_blob.hex(),
|
|
'flags': flags,
|
|
}
|
|
if row[3] in ('tpdu', 'change', 'fidi', 'atr', 'pps'):
|
|
try:
|
|
from .decode import decode_sniff_msg
|
|
msg['decoded'] = decode_sniff_msg(data_blob, row[3], flags)
|
|
except Exception as e:
|
|
import sys
|
|
print(f'Decode error for msg {row[0]} ({row[3]}, {len(data_blob)} bytes): {e}',
|
|
file=sys.stderr)
|
|
return msg
|