Skip to content

fix endpoints that should accept any type of SessionIDs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+12 −8
Open

fix endpoints that should accept any type of SessionIDs #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions sogs/routes/rooms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def get_permission_info(room):
return jsonify({k: addExtraPermInfo(v) for k, v in room.permissions.items()})


@rooms.get("/room/<Room:room>/permissions/<SessionID:sid>")
@rooms.get("/room/<Room:room>/permissions/<AnySessionID:sid>")
@auth.mod_required
def get_user_permission_info(room, sid):
"""
Expand Down Expand Up @@ -352,7 +352,7 @@ def get_future_permission_info(room):
return jsonify(room.future_permissions)


@rooms.get("/room/<Room:room>/futurePermissions/<SessionID:sid>")
@rooms.get("/room/<Room:room>/futurePermissions/<AnySessionID:sid>")
@auth.mod_required
def get_user_future_permissions(room, sid):
"""
Expand All @@ -368,7 +368,7 @@ def get_user_future_permissions(room, sid):
return jsonify(room.user_future_permissions(user))


@rooms.post("/room/<Room:room>/permissions/<SessionID:sid>")
@rooms.post("/room/<Room:room>/permissions/<AnySessionID:sid>")
@auth.mod_required
def set_permissions(room, sid):
"""
Expand Down Expand Up @@ -468,7 +468,7 @@ def set_permissions(room, sid):
return jsonify(res)


@rooms.post("/room/<Room:room>/futurePermissions/<SessionID:sid>")
@rooms.post("/room/<Room:room>/futurePermissions/<AnySessionID:sid>")
@auth.mod_required
def set_future_permissions(room, sid):
"""
Expand Down Expand Up @@ -937,7 +937,7 @@ def serve_file_with_ignored_filename(room, fileId, filename):
return serve_file(room=room, fileId=fileId)


@rooms.delete("/room/<Room:room>/all/<SessionID:sid>")
@rooms.delete("/room/<Room:room>/all/<AnySessionID:sid>")
def delete_all_posts(room, sid):
"""
Deletes all posts from a room made by a user
Expand All @@ -955,14 +955,18 @@ def delete_all_posts(room, sid):
- 403 Forbidden — if the invoking user does not have access to the room.
- 404 Not Found — if the user we are deleting posts from made no posts in this room.
"""
user = muser.User(session_id=sid, autovivify=False)

user = muser.User(session_id=sid, try_blinding=True, autovivify=False)
app.logger.warning(f"plop1: {user.session_id}")

deleted, _ = room.delete_all_posts(user, deleter=g.user)

if not deleted:
abort(http.NOT_FOUND)
return jsonify({})


@rooms.delete("/rooms/all/<SessionID:sid>")
@rooms.delete("/rooms/all/<AnySessionID:sid>")
def delete_user_posts_from_all_rooms(sid):
"""
Deletes all posts from all rooms by a given user.
Expand All @@ -980,7 +984,7 @@ def delete_user_posts_from_all_rooms(sid):
"""
deletions = {}
total = 0
user = muser.User(session_id=sid, autovivify=False)
user = muser.User(session_id=sid, try_blinding=True, autovivify=False)
for room in mroom.get_accessible_rooms(g.user):
try:
count, _ = room.delete_all_posts(user, deleter=g.user)
Expand Down