Deploy msgboard

src/msgboard/db.py

@@ -458,10 +458,26 @@ CREATE INDEX messages_response_dm ON messages(channel_id, sender_id, created_at,
 CREATE INDEX attachments_published_at ON attachments(published, created_at);
 """
 
+# Agents are owned by people: an agent that an agent invited moves to the person at the top of the chain.
+SCHEMA_V26 = """
+WITH RECURSIVE up(agent, cur, path) AS (
+    SELECT p.id, p.owner_id, ',' || p.id || ',' FROM principals p JOIN principals o ON o.id = p.owner_id
+    WHERE o.identity_type != 'user'
+  UNION ALL
+    SELECT u.agent, o.owner_id, u.path || o.id || ',' FROM up u JOIN principals o ON o.id = u.cur
+    WHERE o.identity_type != 'user' AND o.owner_id IS NOT NULL AND instr(u.path, ',' || o.id || ',') = 0
+),
+root(agent, person) AS (
+    SELECT u.agent, u.cur FROM up u JOIN principals h ON h.id = u.cur WHERE h.identity_type = 'user'
+)
+UPDATE principals SET owner_id = (SELECT person FROM root WHERE root.agent = principals.id)
+WHERE id IN (SELECT agent FROM root);
+"""
+
 # Index i holds the SQL that moves the schema from version i to i + 1.
 MIGRATIONS = [SCHEMA_V1, SCHEMA_V2, SCHEMA_V3, SCHEMA_V4, SCHEMA_V5, SCHEMA_V6, SCHEMA_V7, SCHEMA_V8, SCHEMA_V9,
               SCHEMA_V10, SCHEMA_V11, SCHEMA_V12, SCHEMA_V13, SCHEMA_V14, SCHEMA_V15, SCHEMA_V16, SCHEMA_V17, SCHEMA_V18, SCHEMA_V19, SCHEMA_V20, SCHEMA_V21, SCHEMA_V22,
-              SCHEMA_V23, SCHEMA_V24, SCHEMA_V25]
+              SCHEMA_V23, SCHEMA_V24, SCHEMA_V25, SCHEMA_V26]
 SCHEMA_VERSION = len(MIGRATIONS)
 
 

src/msgboard/store.py

@@ -1061,6 +1061,18 @@ def _join_channels(conn, invite, principal_id: int, now: float) -> None:
                          "VALUES (?, ?, ?, ?)", (ch["id"], principal_id, invite["created_by"], now))
 
 
+def _human_owner(conn, row):
+    """The person at the top of an ownership chain: the row itself for a person, else its owner's owner, and so on.
+    A chain that loops or ends without a person is refused rather than answered with an agent."""
+    seen = set()
+    while row["identity_type"] != "user":
+        if row["owner_id"] is None or row["id"] in seen:
+            raise ApiError(410, "invite_inactive", "no person owns the agent that made this invite")
+        seen.add(row["id"])
+        row = _principal_row(conn, row["owner_id"])
+    return row
+
+
 def join(conn, code, name, display_name, now: float) -> dict:
     """Redeem an invite (or a sign-in link). Returns the identity and its token."""
     row = _find_invite(conn, code)
@@ -1103,10 +1115,14 @@ def join(conn, code, name, display_name, now: float) -> dict:
         audit(conn, pid, "join.human", f"principal:{pid}", {"invite": row["id"], "role": row["role"]}, now)
         return {"token": token, "principal": principal_json(conn, _principal_row(conn, pid)), "created": True, "next": JOIN_NEXT}
 
-    # Agent or service account, owned by the inviter.
+    # Agent or service account. It is owned by a person: the inviter, or, when an agent made the invite,
+    # the person who owns that agent. The inviting agent stays on record as created_by.
     needed = auth.owner_roles_for(row["role"])
     if inviter["role"] not in needed:
         raise ApiError(410, "invite_inactive", "the person who made this invite can no longer give out this access")
+    owner = _human_owner(conn, inviter)
+    if owner["disabled"] or owner["role"] not in needed:
+        raise ApiError(410, "invite_inactive", "the person who owns the agent that made this invite can no longer give out this access")
     if row["agent_name"]:   # a named invite decides the name; the agent need not (and may not) pick another
         if name not in (None, "", row["agent_name"]):
             raise bad_request(f"this invite is for the agent {row['agent_name']!r}: leave name out or use that one")
@@ -1127,7 +1143,7 @@ def join(conn, code, name, display_name, now: float) -> dict:
         """INSERT INTO principals (issuer, external_id, identity_type, role, display_name, created_at, created_by,
                                    joined_via, owner_id, can_create_channels, invite_id)
            VALUES (?, ?, ?, ?, ?, ?, ?, 'invite', ?, ?, ?)""",
-        (issuer, name, row["identity_type"], row["role"], display_name, now, inviter["id"], inviter["id"],
+        (issuer, name, row["identity_type"], row["role"], display_name, now, inviter["id"], owner["id"],
          row["can_create_channels"], row["id"])).lastrowid
     conn.execute("UPDATE invites SET uses = uses + 1 WHERE id = ?", (row["id"],))
     _join_channels(conn, row, pid, now)