nest/nest-matrix-bot
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

Fix stale keys

Browse source
This commit is contained in:
Astra Logical 2026-07-23 12:04:10 -04:00
parent 8cf971c589
commit b55a919d3d
1 changed files with 7 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
matrix_keycloak_bot.py
View file

@ -30,8 +30,6 @@ KEYCLOAK_REALM = os.getenv("KEYCLOAK_REALM", "master")
KEYCLOAK_CLIENT_ID = os.getenv("KEYCLOAK_CLIENT_ID", "nest-matrix-bot") KEYCLOAK_CLIENT_ID = os.getenv("KEYCLOAK_CLIENT_ID", "nest-matrix-bot")
KEYCLOAK_CLIENT_SECRET = os.getenv("KEYCLOAK_CLIENT_SECRET", "your-client-secret") KEYCLOAK_CLIENT_SECRET = os.getenv("KEYCLOAK_CLIENT_SECRET", "your-client-secret")
CREDENTIALS_FILE = "/app/store/credentials.json"
# In-memory tracking of active requests (Event ID -> Request Info) # In-memory tracking of active requests (Event ID -> Request Info)
pending_requests = {} pending_requests = {}
@ -147,7 +145,7 @@ def get_requestable_groups(username: str) -> tuple[bool, str]:
except KeycloakError as e: except KeycloakError as e:
return False, f"Keycloak API error: {str(e)}" return False, f"Keycloak API error: {str(e)}"
except Exception as e: except Exception as e:
return False, f"Unexpected error: {str(e)}" return False, f"⚠️ Unexpected error: {str(e)}"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -322,34 +320,7 @@ async def main():
# 1. Initialize client # 1. Initialize client
client = Client(base_url=MATRIX_HOMESERVER, mxid=MATRIX_BOT_USER) client = Client(base_url=MATRIX_HOMESERVER, mxid=MATRIX_BOT_USER)
# 2. Session Persistence # 2. Attach Custom Memory Crypto & State Stores first so keys align with login
session_restored = False
if os.path.exists(CREDENTIALS_FILE):
log.info("Restoring existing Matrix session...")
try:
with open(CREDENTIALS_FILE, "r") as f:
creds = json.load(f)
client.api.token = creds["access_token"]
client.mxid = creds["user_id"]
client.device_id = creds["device_id"]
session_restored = True
except (json.JSONDecodeError, KeyError) as e:
log.warning(f"Corrupted credentials file ({e}). Forcing new login...")
if not session_restored:
log.info(f"Logging in to {MATRIX_HOMESERVER}...")
resp = await client.login(password=MATRIX_BOT_PASSWORD, device_name="KEYCLOAK_ACCESS_BOT")
os.makedirs(os.path.dirname(CREDENTIALS_FILE), exist_ok=True)
with open(CREDENTIALS_FILE, "w") as f:
json.dump({
"access_token": client.api.token,
"user_id": client.mxid,
"device_id": client.device_id,
}, f)
log.info("Logged in and saved credentials.")
# 3. Attach Custom Memory Crypto & State Stores
state_store = CustomMemoryStateStore(client.mxid) state_store = CustomMemoryStateStore(client.mxid)
client.state_store = state_store client.state_store = state_store
@ -358,6 +329,11 @@ async def main():
await machine.load() await machine.load()
client.crypto = machine client.crypto = machine
# 3. Perform Fresh Login on Startup (Syncs device ID and crypto keys correctly)
log.info(f"Logging in to {MATRIX_HOMESERVER}...")
await client.login(password=MATRIX_BOT_PASSWORD, device_name="KEYCLOAK_ACCESS_BOT")
log.info("Successfully logged in with fresh device session.")
# 4. Register Event Handlers # 4. Register Event Handlers
client.add_event_handler(EventType.ROOM_MEMBER, on_invite) client.add_event_handler(EventType.ROOM_MEMBER, on_invite)
client.add_event_handler(EventType.ROOM_MESSAGE, on_message) client.add_event_handler(EventType.ROOM_MESSAGE, on_message)