Store observation kind when prohibiting project names (#17731)

* Store observation kind when prohibiting project names

* Add migration

Author: di

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

@@ -45,6 +45,7 @@
         <th>Prohibited by</th>
         <th>Prohibited on</th>
         <th>Comment</th>
+        <th>Observation kind</th>
         <th>Actions</th>
       </tr>
       </thead>
@@ -62,6 +63,7 @@
         </td>
         <td>{{ prohibited_project_name.created|format_datetime() }}</td>
         <td>{{ prohibited_project_name.comment }}</td>
+        <td>{{ prohibited_project_name.observation_kind }}</td>
         <td>
           <form method="POST" action="{{ request.route_path('admin.prohibited_project_names.remove') }}">
             <input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">

warehouse/admin/views/malware_reports.py

@@ -187,7 +187,9 @@ def malware_reports_project_verdict_remove_malware(project, request):
         }
 
     # prohibit the project
-    prohibit_and_remove_project(project, request, comment="malware")
+    prohibit_and_remove_project(
+        project, request, observation_kind=ObservationKind.IsMalware.value[0]
+    )
     # tell helpdesk to add a tag to all related conversations
     helpdesk_service = request.find_service(IHelpDeskService)
     for observation in observations:
@@ -325,7 +327,9 @@ def remove_malware_for_project(request):
             tag="removed_as_malware_via_admin",
         )
 
-    prohibit_and_remove_project(project, request, comment="malware")
+    prohibit_and_remove_project(
+        project, request, observation_kind=ObservationKind.IsMalware.value[0]
+    )
 
     request.session.flash(
         f"Malware Project {project.name} removed and report updated",

warehouse/admin/views/prohibited_project_names.py

@@ -250,7 +250,7 @@ def add_prohibited_project_names(request):
         )
         return HTTPSeeOther(request.route_path("admin.prohibited_project_names.list"))
 
-    prohibit_and_remove_project(project_name, request, comment)
+    prohibit_and_remove_project(project_name, request, comment=comment)
 
     request.session.flash(f"Prohibited Project Name {project_name!r}", queue="success")
 

warehouse/migrations/versions/db7633e75422_add_observation_kid_to_prohibited_.py

@@ -0,0 +1,41 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Add observation_kid to prohibited_project_names
+
+Revision ID: db7633e75422
+Revises: 635b80625fc9
+Create Date: 2025-03-03 20:21:55.738828
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "db7633e75422"
+down_revision = "635b80625fc9"
+
+
+def upgrade():
+    op.add_column(
+        "prohibited_project_names",
+        sa.Column(
+            "observation_kind",
+            sa.String(),
+            nullable=True,
+            comment="If this was created via an observation, the kind of observation",
+        ),
+    )
+
+
+def downgrade():
+    op.drop_column("prohibited_project_names", "observation_kind")

warehouse/packaging/models.py

@@ -1071,6 +1071,10 @@ class ProhibitedProjectName(db.Model):
     )
     prohibited_by: Mapped[User] = orm.relationship()
     comment: Mapped[str] = mapped_column(server_default="")
+    observation_kind: Mapped[str] = mapped_column(
+        nullable=True,
+        comment="If this was created via an observation, the kind of observation",
+    )
 
 
 class ProjectMacaroonWarningAssociation(db.Model):

warehouse/utils/project.py

@@ -74,7 +74,11 @@ def confirm_project(
 
 
 def prohibit_and_remove_project(
-    project: Project | str, request, comment: str, flash: bool = True
+    project: Project | str,
+    request,
+    comment: str | None = None,
+    observation_kind: str | None = None,
+    flash: bool = True,
 ):
     """
     View helper to prohibit and remove a project.
@@ -84,7 +88,10 @@ def prohibit_and_remove_project(
     # Add our requested prohibition.
     request.db.add(
         ProhibitedProjectName(
-            name=project_name, comment=comment, prohibited_by=request.user
+            name=project_name,
+            comment=comment,
+            observation_kind=observation_kind,
+            prohibited_by=request.user,
         )
     )
     # Go through and delete the project and everything related to it so that