feat(security): enforce telegram allowlist with owner-managed add/remove controls
This commit is contained in:
@@ -80,3 +80,12 @@ Timers:
|
||||
- `prime-state-backup.timer` (15m)
|
||||
- `prime-restore-test.timer` (nightly dry-run restore)
|
||||
- `prime-audit-watch.timer` (15m anomaly check)
|
||||
|
||||
## 11) Telegram allowlist controls
|
||||
Prime responds only to allowlisted Telegram users.
|
||||
Owner (configured `TELEGRAM_CHAT_ID`) can manage list:
|
||||
- `allowlist show`
|
||||
- `allowlist add <telegram_user_id>`
|
||||
- `allowlist remove <telegram_user_id>`
|
||||
|
||||
Owner cannot be removed from allowlist.
|
||||
|
||||
@@ -14,6 +14,38 @@ from .audit import log_event
|
||||
|
||||
OFFSET_FILE = Path('/srv/prime-core/state/telegram-offset.txt')
|
||||
|
||||
ALLOW_FILE = Path('/srv/prime-core/state/telegram-allowlist.json')
|
||||
|
||||
|
||||
def owner_id() -> str:
|
||||
return _env('TELEGRAM_CHAT_ID')
|
||||
|
||||
|
||||
def load_allowlist() -> set[str]:
|
||||
# default allowlist contains owner only
|
||||
if not ALLOW_FILE.exists():
|
||||
s = {owner_id()}
|
||||
save_allowlist(s)
|
||||
return s
|
||||
try:
|
||||
data = json.loads(ALLOW_FILE.read_text())
|
||||
ids = set(str(x) for x in data.get('allowed_user_ids', []))
|
||||
ids.add(owner_id())
|
||||
return ids
|
||||
except Exception:
|
||||
s = {owner_id()}
|
||||
save_allowlist(s)
|
||||
return s
|
||||
|
||||
|
||||
def save_allowlist(ids: set[str]) -> None:
|
||||
ALLOW_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||
ALLOW_FILE.write_text(json.dumps({'allowed_user_ids': sorted(ids)}, indent=2))
|
||||
|
||||
|
||||
def is_owner(user_id: str) -> bool:
|
||||
return user_id == owner_id()
|
||||
|
||||
|
||||
def _env(name: str) -> str:
|
||||
v = os.getenv(name, '').strip()
|
||||
@@ -133,6 +165,30 @@ def parse_and_handle(chat_id: int, msg_id: int, text: str) -> str:
|
||||
if not parts:
|
||||
return help_text()
|
||||
|
||||
if parts[:2] == ['allowlist','show']:
|
||||
if str(chat_id) != owner_id():
|
||||
return 'Not authorized.'
|
||||
return json.dumps({'allowed_user_ids': sorted(load_allowlist())}, indent=2)
|
||||
|
||||
if parts[:2] == ['allowlist','add']:
|
||||
if str(chat_id) != owner_id():
|
||||
return 'Not authorized.'
|
||||
if len(parts) != 3:
|
||||
return 'Usage: allowlist add <telegram_user_id>'
|
||||
s = load_allowlist(); s.add(str(parts[2])); save_allowlist(s)
|
||||
return 'allowlist updated'
|
||||
|
||||
if parts[:2] == ['allowlist','remove']:
|
||||
if str(chat_id) != owner_id():
|
||||
return 'Not authorized.'
|
||||
if len(parts) != 3:
|
||||
return 'Usage: allowlist remove <telegram_user_id>'
|
||||
uid = str(parts[2])
|
||||
if uid == owner_id():
|
||||
return 'Cannot remove owner.'
|
||||
s = load_allowlist(); s.discard(uid); save_allowlist(s)
|
||||
return 'allowlist updated'
|
||||
|
||||
if parts[0] == 'status':
|
||||
code, out = run_prime(['status'])
|
||||
return f"status (code={code})\n{out[:3500]}"
|
||||
@@ -232,7 +288,9 @@ def loop() -> int:
|
||||
if not msg:
|
||||
continue
|
||||
chat_id = str(msg.get('chat', {}).get('id', ''))
|
||||
if chat_id != allowed_chat:
|
||||
from_user_id = str((msg.get('from') or {}).get('id', ''))
|
||||
allowed = load_allowlist()
|
||||
if from_user_id not in allowed and chat_id not in allowed:
|
||||
continue
|
||||
|
||||
text = msg.get('text') or ''
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"allowed_user_ids": [
|
||||
"8538271745"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user