Skip to content

Commit b0f8fd4

Browse files
authored
Permissions.AdminProhibitedProjectsRelease (#18257)
This introduces Permissions.AdminProhibitedProjectsWrite and grants it to admins and support. Closes #18251
1 parent 1cbbe1a commit b0f8fd4

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

tests/unit/test_config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ def test_root_factory_access_control_list():
567567
Permissions.AdminProhibitedEmailDomainsWrite,
568568
Permissions.AdminProhibitedProjectsRead,
569569
Permissions.AdminProhibitedProjectsWrite,
570+
Permissions.AdminProhibitedProjectsRelease,
570571
Permissions.AdminProhibitedUsernameRead,
571572
Permissions.AdminProhibitedUsernameWrite,
572573
Permissions.AdminProjectsDelete,
@@ -598,6 +599,7 @@ def test_root_factory_access_control_list():
598599
Permissions.AdminOrganizationsWrite,
599600
Permissions.AdminProhibitedEmailDomainsRead,
600601
Permissions.AdminProhibitedProjectsRead,
602+
Permissions.AdminProhibitedProjectsRelease,
601603
Permissions.AdminProhibitedUsernameRead,
602604
Permissions.AdminProjectsRead,
603605
Permissions.AdminProjectsSetLimit,

warehouse/admin/templates/admin/prohibited_project_names/list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
<input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
6767
<input name="project_name" type="hidden" value="{{ prohibited_project_name.name }}">
6868
<input name="next" type="hidden" value="{{ request.current_route_path() }}">
69-
<button type="submit" class="btn btn-link" title="{{ 'Submitting requires superuser privileges' if not request.has_permission(Permissions.AdminProhibitedProjectsWrite) }}" {{ "disabled" if not request.has_permission(Permissions.AdminProhibitedProjectsWrite) }}>
69+
<button type="submit" class="btn btn-link" title="{{ 'Submitting requires additional privileges' if not request.has_permission(Permissions.AdminProhibitedProjectsRelease) }}" {{ "disabled" if not request.has_permission(Permissions.AdminProhibitedProjectsRelease) }}>
7070
<i class="fa fa-hands"></i>
7171
</button>
72-
<input name="username" type="text" {{ "disabled" if not request.has_permission(Permissions.AdminProhibitedProjectsWrite) }}>
72+
<input name="username" type="text" {{ "disabled" if not request.has_permission(Permissions.AdminProhibitedProjectsRelease) }}>
7373
</form>
7474
</td>
7575
</tr>

warehouse/admin/views/prohibited_project_names.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def confirm_prohibited_project_names(request):
136136

137137
@view_config(
138138
route_name="admin.prohibited_project_names.release",
139-
permission=Permissions.AdminProhibitedProjectsWrite,
139+
permission=Permissions.AdminProhibitedProjectsRelease,
140140
request_method="POST",
141141
uses_session=True,
142142
require_methods=False,

warehouse/authnz/_permissions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class Permissions(StrEnum):
5656

5757
AdminProhibitedProjectsRead = "admin:prohibited-projects:read"
5858
AdminProhibitedProjectsWrite = "admin:prohibited-projects:write"
59+
AdminProhibitedProjectsRelease = "admin:prohibited-projects:release"
5960

6061
AdminProhibitedUsernameRead = "admin:prohibited-username:read"
6162
AdminProhibitedUsernameWrite = "admin:prohibited-username:write"

warehouse/config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ class RootFactory:
8181
Permissions.AdminProhibitedEmailDomainsWrite,
8282
Permissions.AdminProhibitedProjectsRead,
8383
Permissions.AdminProhibitedProjectsWrite,
84+
Permissions.AdminProhibitedProjectsRelease,
8485
Permissions.AdminProhibitedUsernameRead,
8586
Permissions.AdminProhibitedUsernameWrite,
8687
Permissions.AdminProjectsDelete,
@@ -112,6 +113,7 @@ class RootFactory:
112113
Permissions.AdminOrganizationsWrite,
113114
Permissions.AdminProhibitedEmailDomainsRead,
114115
Permissions.AdminProhibitedProjectsRead,
116+
Permissions.AdminProhibitedProjectsRelease,
115117
Permissions.AdminProhibitedUsernameRead,
116118
Permissions.AdminProjectsRead,
117119
Permissions.AdminProjectsSetLimit,

0 commit comments

Comments
 (0)