Skip to content
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

[24.0] Fix make all histories private with immutable histories #18200

Merged
merged 5 commits into from
May 22, 2024
Merged

[24.0] Fix make all histories private with immutable histories #18200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e03914
Raise appropriate API exceptions in `history` controller
davelopez May 22, 2024
994be2f
Do not fail hard when one history fails to be made private
davelopez May 22, 2024
f3c6354
Allow to make private purged and archived histories
davelopez May 22, 2024
c1a8fd4
Drop redundant check after setting dataset permissions
davelopez May 22, 2024
ec2bd51
Remove unnecessary catch all
davelopez May 22, 2024
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
2 changes: 1 addition & 1 deletion client/src/components/User/UserPreferences.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export default {
_l(
"WARNING: This will make all datasets (excluding library datasets) for which you have " +
"'management' permissions, in all of your histories " +
"private, and will set permissions such that all " +
"private (including archived and purged), and will set permissions such that all " +
"of your new data in these histories is created as private. Any " +
"datasets within that are currently shared will need " +
"to be re-shared or published. Are you sure you " +
Expand Down
15 changes: 6 additions & 9 deletions lib/galaxy/webapps/galaxy/controllers/history.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,15 @@ def display_by_username_and_slug(self, trans, username, slug, **kwargs):
)
)

@web.legacy_expose_api
@web.expose_api
@web.require_login("changing default permissions")
def permissions(self, trans, payload=None, **kwd):
"""
Sets the permissions on a history.
"""
history_id = kwd.get("id")
if not history_id:
return self.message_exception(trans, f"Invalid history id ({str(history_id)}) received")
raise exceptions.RequestParameterMissingException("No history id received")
history = self.history_manager.get_owned(self.decode_id(history_id), trans.user, current_history=trans.history)
if trans.request.method == "GET":
inputs = []
Expand Down Expand Up @@ -166,7 +166,7 @@ def permissions(self, trans, payload=None, **kwd):
trans.app.security_agent.history_set_default_permissions(history, permissions)
return {"message": "Default history '%s' dataset permissions have been changed." % history.name}

@web.legacy_expose_api
@web.expose_api
@web.require_login("make datasets private")
def make_private(self, trans, history_id=None, all_histories=False, **kwd):
"""
Expand All @@ -184,15 +184,14 @@ def make_private(self, trans, history_id=None, all_histories=False, **kwd):
if history:
histories.append(history)
if not histories:
return self.message_exception(trans, "Invalid history or histories specified.")
raise exceptions.RequestParameterMissingException("No history or histories specified.")
private_role = trans.app.security_agent.get_private_user_role(trans.user)
user_roles = trans.user.all_roles()
private_permissions = {
trans.app.security_agent.permitted_actions.DATASET_MANAGE_PERMISSIONS: [private_role],
trans.app.security_agent.permitted_actions.DATASET_ACCESS: [private_role],
}
for history in histories:
self.history_manager.error_unless_mutable(history)
# Set default role for history to private
trans.app.security_agent.history_set_default_permissions(history, private_permissions)
# Set private role for all datasets
Expand All @@ -204,8 +203,6 @@ def make_private(self, trans, history_id=None, all_histories=False, **kwd):
):
# If it's not private to me, and I can manage it, set fixed private permissions.
trans.app.security_agent.set_all_dataset_permissions(hda.dataset, private_permissions)
if not trans.app.security_agent.dataset_is_private_to_user(trans, hda.dataset):
raise exceptions.InternalServerError("An error occurred and the dataset is NOT private.")
return {
"message": f"Success, requested permissions have been changed in {'all histories' if all_histories else history.name}."
}
Expand Down Expand Up @@ -256,12 +253,12 @@ def resume_paused_jobs(self, trans, current=False, ids=None, **kwargs):
return trans.show_ok_message("Your jobs have been resumed.", refresh_frames=refresh_frames)
# TODO: used in index.mako

@web.legacy_expose_api
@web.expose_api
@web.require_login("rename histories")
def rename(self, trans, payload=None, **kwd):
id = kwd.get("id")
if not id:
return self.message_exception(trans, "No history id received for renaming.")
raise exceptions.RequestParameterMissingException("No history id received for renaming.")
user = trans.get_user()
id = listify(id)
histories = []
Expand Down
Loading