feat(teamsbot): RBAC session isolation -- users see only their own sessions
Made-with: Cursor
This commit is contained in:
parent
d1e081cf98
commit
565ad62c39
2 changed files with 26 additions and 5 deletions
|
|
@ -69,11 +69,14 @@ class TeamsbotObjects:
|
||||||
# Sessions
|
# Sessions
|
||||||
# =========================================================================
|
# =========================================================================
|
||||||
|
|
||||||
def getSessions(self, instanceId: str, includeEnded: bool = True) -> List[Dict[str, Any]]:
|
def getSessions(self, instanceId: str, includeEnded: bool = True, userId: str | None = None) -> List[Dict[str, Any]]:
|
||||||
"""Get all sessions for a feature instance."""
|
"""Get sessions for a feature instance, optionally filtered by owner."""
|
||||||
|
recordFilter = {"instanceId": instanceId}
|
||||||
|
if userId:
|
||||||
|
recordFilter["startedByUserId"] = userId
|
||||||
records = self.db.getRecordset(
|
records = self.db.getRecordset(
|
||||||
TeamsbotSession,
|
TeamsbotSession,
|
||||||
recordFilter={"instanceId": instanceId},
|
recordFilter=recordFilter,
|
||||||
)
|
)
|
||||||
if not includeEnded:
|
if not includeEnded:
|
||||||
records = [r for r in records if r.get("status") != TeamsbotSessionStatus.ENDED.value]
|
records = [r for r in records if r.get("status") != TeamsbotSessionStatus.ENDED.value]
|
||||||
|
|
|
||||||
|
|
@ -134,6 +134,14 @@ def _validateInstanceAccess(instanceId: str, context: RequestContext) -> str:
|
||||||
return str(mandateId)
|
return str(mandateId)
|
||||||
|
|
||||||
|
|
||||||
|
def _validateSessionOwnership(session: dict, context: RequestContext) -> None:
|
||||||
|
"""Raise 404 if the user does not own this session (sysAdmin bypasses)."""
|
||||||
|
if context.hasSysAdminRole:
|
||||||
|
return
|
||||||
|
if session.get("startedByUserId") != str(context.user.id):
|
||||||
|
raise HTTPException(status_code=404, detail=f"Session '{session.get('id')}' not found")
|
||||||
|
|
||||||
|
|
||||||
def _getInstanceConfig(instanceId: str) -> TeamsbotConfig:
|
def _getInstanceConfig(instanceId: str) -> TeamsbotConfig:
|
||||||
"""Load TeamsbotConfig from FeatureInstance.config JSONB field."""
|
"""Load TeamsbotConfig from FeatureInstance.config JSONB field."""
|
||||||
rootInterface = getRootInterface()
|
rootInterface = getRootInterface()
|
||||||
|
|
@ -306,10 +314,11 @@ async def listSessions(
|
||||||
includeEnded: bool = Query(True, description="Include ended sessions"),
|
includeEnded: bool = Query(True, description="Include ended sessions"),
|
||||||
context: RequestContext = Depends(getRequestContext),
|
context: RequestContext = Depends(getRequestContext),
|
||||||
):
|
):
|
||||||
"""List all sessions for a feature instance."""
|
"""List sessions for a feature instance (filtered to own sessions unless sysAdmin)."""
|
||||||
_validateInstanceAccess(instanceId, context)
|
_validateInstanceAccess(instanceId, context)
|
||||||
interface = _getInterface(context, instanceId)
|
interface = _getInterface(context, instanceId)
|
||||||
sessions = interface.getSessions(instanceId, includeEnded=includeEnded)
|
userId = None if context.hasSysAdminRole else str(context.user.id)
|
||||||
|
sessions = interface.getSessions(instanceId, includeEnded=includeEnded, userId=userId)
|
||||||
return {"sessions": sessions}
|
return {"sessions": sessions}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -330,6 +339,7 @@ async def getSession(
|
||||||
session = interface.getSession(sessionId)
|
session = interface.getSession(sessionId)
|
||||||
if not session:
|
if not session:
|
||||||
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
||||||
|
_validateSessionOwnership(session, context)
|
||||||
|
|
||||||
result = {"session": session}
|
result = {"session": session}
|
||||||
|
|
||||||
|
|
@ -362,6 +372,7 @@ async def streamSession(
|
||||||
session = interface.getSession(sessionId)
|
session = interface.getSession(sessionId)
|
||||||
if not session:
|
if not session:
|
||||||
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
||||||
|
_validateSessionOwnership(session, context)
|
||||||
|
|
||||||
async def _eventGenerator():
|
async def _eventGenerator():
|
||||||
"""Generate SSE events from the session event queue."""
|
"""Generate SSE events from the session event queue."""
|
||||||
|
|
@ -418,6 +429,7 @@ async def stopSession(
|
||||||
session = interface.getSession(sessionId)
|
session = interface.getSession(sessionId)
|
||||||
if not session:
|
if not session:
|
||||||
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
||||||
|
_validateSessionOwnership(session, context)
|
||||||
|
|
||||||
currentStatus = session.get("status")
|
currentStatus = session.get("status")
|
||||||
if currentStatus in [TeamsbotSessionStatus.ENDED.value, TeamsbotSessionStatus.ERROR.value]:
|
if currentStatus in [TeamsbotSessionStatus.ENDED.value, TeamsbotSessionStatus.ERROR.value]:
|
||||||
|
|
@ -446,6 +458,7 @@ async def deleteSession(
|
||||||
session = interface.getSession(sessionId)
|
session = interface.getSession(sessionId)
|
||||||
if not session:
|
if not session:
|
||||||
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
||||||
|
_validateSessionOwnership(session, context)
|
||||||
|
|
||||||
# Don't delete active sessions
|
# Don't delete active sessions
|
||||||
currentStatus = session.get("status")
|
currentStatus = session.get("status")
|
||||||
|
|
@ -798,6 +811,11 @@ async def submitMfaCode(
|
||||||
):
|
):
|
||||||
"""Submit MFA code/confirmation from the frontend to the active bot session."""
|
"""Submit MFA code/confirmation from the frontend to the active bot session."""
|
||||||
_validateInstanceAccess(instanceId, context)
|
_validateInstanceAccess(instanceId, context)
|
||||||
|
interface = _getInterface(context, instanceId)
|
||||||
|
session = interface.getSession(sessionId)
|
||||||
|
if not session:
|
||||||
|
raise HTTPException(status_code=404, detail=f"Session '{sessionId}' not found")
|
||||||
|
_validateSessionOwnership(session, context)
|
||||||
body = await request.json()
|
body = await request.json()
|
||||||
mfaCode = body.get("code", "")
|
mfaCode = body.get("code", "")
|
||||||
mfaAction = body.get("action", "code")
|
mfaAction = body.get("action", "code")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue