Skip to content

Revert to using admin permission check when we can't determine an XPI type #1908

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
Eijebong wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert to using admin permission check when we can't determine an XPI type #1908

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: 15 additions & 5 deletions api/src/shipit_api/admin/xpi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,21 @@ def abandon_release_xpi(name):
session = current_app.db.session
release = session.query(XPIRelease).filter(XPIRelease.name == name).first_or_404()
# we must require scope which depends on XPI type
xpi_type = _xpi_type(release.revision, release.xpi_name)
required_permission = f"{SCOPE_PREFIX}/abandon_release/xpi/{xpi_type}"
if not current_user.has_permissions(required_permission):
user_permissions = ", ".join(current_user.get_permissions())
abort(401, f"required permission: {required_permission}, user permissions: {user_permissions}")
try:
xpi_type = _xpi_type(release.revision, release.xpi_name)
except Exception:
xpi_type = None
logger.warning("Failed to determine XPI type for %s", release.name)

if xpi_type:
required_permission = f"{SCOPE_PREFIX}/abandon_release/xpi/{xpi_type}"
if not current_user.has_permissions(required_permission):
user_permissions = ", ".join(current_user.get_permissions())
abort(401, f"required permission: {required_permission}, user permissions: {user_permissions}")
else:
admin_group = current_app.config.get("LDAP_GROUPS", {}).get("admin", [])
if not any(g in current_user.get_ldap_groups() for g in admin_group):
abort(401, "XPI type could not be determined and user is not an admin")

# XPI doesn't support the "cancel-all" action task, just mark as aborted
release.status = "aborted"
Expand Down
Loading