jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(chalice): changed s-permissions

Browse source 
fix(DB): changed s-permissions

(cherry picked from commit 389ec4a8fc)
This commit is contained in:
Taha Yassine Kraiem 2024-07-04 14:25:52 +02:00
parent 456a44f9b4
commit 2ff0d164fb
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ee/api/auth/auth_jwt.py
View file

@ -20,8 +20,6 @@ def _get_current_auth_context(request: Request, jwt_payload: dict) -> schemas.Cu
logger.warning("User not found.") logger.warning("User not found.")
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User not found.") raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User not found.")
request.state.authorizer_identity = "jwt" request.state.authorizer_identity = "jwt"
if user["serviceAccount"]:
user["permissions"] = [p.value for p in schemas.ServicePermissions]
request.state.currentContext = schemas.CurrentContext(tenantId=jwt_payload.get("tenantId", -1), request.state.currentContext = schemas.CurrentContext(tenantId=jwt_payload.get("tenantId", -1),
userId=jwt_payload.get("userId", -1), userId=jwt_payload.get("userId", -1),
email=user["email"], email=user["email"],

1
ee/api/chalicelib/core/roles.py
View file

@ -121,6 +121,7 @@ def get_roles(tenant_id):
AND projects.deleted_at ISNULL ) AS role_projects ON (TRUE) AND projects.deleted_at ISNULL ) AS role_projects ON (TRUE)
WHERE tenant_id =%(tenant_id)s WHERE tenant_id =%(tenant_id)s
AND deleted_at IS NULL AND deleted_at IS NULL
AND not service_role
ORDER BY role_id;""", ORDER BY role_id;""",
{"tenant_id": tenant_id}) {"tenant_id": tenant_id})
cur.execute(query=query) cur.execute(query=query)

4
ee/scripts/schema/db/init_dbs/postgresql/1.18.0/1.18.0.sql
View file

@ -29,6 +29,10 @@ ALTER TABLE IF EXISTS public.sessions
CREATE INDEX IF NOT EXISTS graphql_session_id_idx ON events.graphql (session_id); CREATE INDEX IF NOT EXISTS graphql_session_id_idx ON events.graphql (session_id);
CREATE INDEX IF NOT EXISTS crashes_session_id_idx ON events_common.crashes (session_id); CREATE INDEX IF NOT EXISTS crashes_session_id_idx ON events_common.crashes (session_id);
UPDATE public.roles
SET permissions='{SERVICE_SESSION_REPLAY,SERVICE_DEV_TOOLS,SERVICE_ASSIST_LIVE,SERVICE_ASSIST_CALL}'
WHERE service_role;
COMMIT; COMMIT;
\elif :is_next \elif :is_next