chore: remove calls to JournalEntry.submitted_from

tests/unit/admin/views/test_journals.py

@@ -119,27 +119,3 @@ def test_query_term_version(self, db_request):
             "journals": [journals[0]],
             "query": f"version:{journals[0].version}",
         }
-
-    def test_query_term_ip(self, db_request):
-        ipv4 = "10.6.6.6"
-        ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"
-        journals0 = sorted(
-            [JournalEntryFactory.create(submitted_from=ipv4) for _ in range(10)],
-            key=lambda j: (j.submitted_date, j.id),
-            reverse=True,
-        )
-        journals1 = sorted(
-            [JournalEntryFactory.create(submitted_from=ipv6) for _ in range(10)],
-            key=lambda j: (j.submitted_date, j.id),
-            reverse=True,
-        )
-
-        db_request.GET["q"] = f"ip:{ipv4}"
-        result = views.journals_list(db_request)
-
-        assert result == {"journals": journals0, "query": f"ip:{ipv4}"}
-
-        db_request.GET["q"] = f"ip:{ipv6}"
-        result = views.journals_list(db_request)
-
-        assert result == {"journals": journals1, "query": f"ip:{ipv6}"}

tests/unit/forklift/test_legacy.py

@@ -1472,16 +1472,12 @@ def storage_service_store(path, file_path, *, meta):
             .order_by("submitted_date", "id")
             .all()
         )
-        assert [
-            (j.name, j.version, j.action, j.submitted_by, j.submitted_from)
-            for j in journals
-        ] == [
+        assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
             (
                 release.project.name,
                 release.version,
                 f"add source file {filename}",
                 user,
-                db_request.remote_addr,
             )
         ]
 
@@ -2118,26 +2114,11 @@ def test_upload_succeeds_custom_project_size_limit(
             .order_by("submitted_date", "id")
             .all()
         )
-        assert [
-            (j.name, j.version, j.action, j.submitted_by, j.submitted_from)
-            for j in journals
-        ] == [
-            ("example", None, "create", user, db_request.remote_addr),
-            (
-                "example",
-                None,
-                f"add Owner {user.username}",
-                user,
-                db_request.remote_addr,
-            ),
-            ("example", "1.0", "new release", user, db_request.remote_addr),
-            (
-                "example",
-                "1.0",
-                "add source file example-1.0.tar.gz",
-                user,
-                db_request.remote_addr,
-            ),
+        assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
+            ("example", None, "create", user),
+            ("example", None, f"add Owner {user.username}", user),
+            ("example", "1.0", "new release", user),
+            ("example", "1.0", "add source file example-1.0.tar.gz", user),
         ]
 
     def test_upload_fails_with_previously_used_filename(
@@ -2768,16 +2749,12 @@ def storage_service_store(path, file_path, *, meta):
             .order_by("submitted_date", "id")
             .all()
         )
-        assert [
-            (j.name, j.version, j.action, j.submitted_by, j.submitted_from)
-            for j in journals
-        ] == [
+        assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
             (
                 release.project.name,
                 release.version,
                 f"add cp34 file {filename}",
                 user,
-                db_request.remote_addr,
             )
         ]
 
@@ -2902,16 +2879,12 @@ def storage_service_store(path, file_path, *, meta):
             .order_by("submitted_date", "id")
             .all()
         )
-        assert [
-            (j.name, j.version, j.action, j.submitted_by, j.submitted_from)
-            for j in journals
-        ] == [
+        assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
             (
                 release.project.name,
                 release.version,
                 f"add cp34 file {filename}",
                 user,
-                db_request.remote_addr,
             )
         ]
 
@@ -3167,23 +3140,18 @@ def test_upload_succeeds_creates_release(
             .order_by("submitted_date", "id")
             .all()
         )
-        assert [
-            (j.name, j.version, j.action, j.submitted_by, j.submitted_from)
-            for j in journals
-        ] == [
+        assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
             (
                 release.project.name,
                 release.version,
                 "new release",
                 user,
-                db_request.remote_addr,
             ),
             (
                 release.project.name,
                 release.version,
                 f"add source file {filename}",
                 user,
-                db_request.remote_addr,
             ),
         ]
 
@@ -3464,26 +3432,11 @@ def test_upload_succeeds_creates_project(
             .order_by("submitted_date", "id")
             .all()
         )
-        assert [
-            (j.name, j.version, j.action, j.submitted_by, j.submitted_from)
-            for j in journals
-        ] == [
-            ("example", None, "create", user, db_request.remote_addr),
-            (
-                "example",
-                None,
-                f"add Owner {user.username}",
-                user,
-                db_request.remote_addr,
-            ),
-            ("example", "1.0", "new release", user, db_request.remote_addr),
-            (
-                "example",
-                "1.0",
-                "add source file example-1.0.tar.gz",
-                user,
-                db_request.remote_addr,
-            ),
+        assert [(j.name, j.version, j.action, j.submitted_by) for j in journals] == [
+            ("example", None, "create", user),
+            ("example", None, f"add Owner {user.username}", user),
+            ("example", "1.0", "new release", user),
+            ("example", "1.0", "add source file example-1.0.tar.gz", user),
         ]
 
     def test_upload_succeeds_with_signature(

tests/unit/manage/test_views.py

@@ -3975,7 +3975,6 @@ def test_yank_project_release(self, monkeypatch, db_request):
         assert entry.action == "yank release"
         assert entry.version == release.version
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
         assert db_request.session.flash.calls == [
             pretend.call(f"Yanked release {release.version!r}", queue="success")
         ]
@@ -4129,7 +4128,6 @@ def test_unyank_project_release(self, monkeypatch, db_request):
         assert entry.action == "unyank release"
         assert entry.version == release.version
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
         assert db_request.session.flash.calls == [
             pretend.call(f"Un-yanked release {release.version!r}", queue="success")
@@ -4287,7 +4285,6 @@ def test_delete_project_release(self, monkeypatch, db_request):
         assert entry.action == "remove release"
         assert entry.version == release.version
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
         assert db_request.session.flash.calls == [
             pretend.call(f"Deleted release {release.version!r}", queue="success")
@@ -4474,7 +4471,6 @@ def test_delete_project_release_file(self, monkeypatch, db_request):
                 version=release.version,
                 action=f"remove file {release_file.filename}",
                 submitted_by=user,
-                submitted_from=db_request.remote_addr,
             )
             .one()
         )
@@ -5460,7 +5456,6 @@ def test_change_role(self, db_request, monkeypatch):
         assert entry.name == project.name
         assert entry.action == "change Owner testuser to Maintainer"
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
     def test_change_role_invalid_role_name(self, pyramid_request):
         project = pretend.stub(name="foobar")
@@ -5578,7 +5573,6 @@ def test_delete_role(self, db_request, monkeypatch):
         assert entry.name == project.name
         assert entry.action == "remove Owner testuser"
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
     def test_delete_missing_role(self, db_request):
         project = ProjectFactory.create(name="foobar")
@@ -5674,7 +5668,6 @@ def test_delete_not_sole_owner_role(self, db_request, monkeypatch):
         assert entry.name == project.name
         assert entry.action == "remove Owner testuser"
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
     def test_delete_non_owner_role(self, db_request):
         project = ProjectFactory.create(name="foobar")

tests/unit/manage/views/test_teams.py

@@ -838,7 +838,6 @@ def test_change_role(
         assert entry.name == organization_project.name
         assert entry.action == f"change Owner {organization_team.name} to Maintainer"
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
     def test_change_role_invalid_role_name(self, pyramid_request, organization_project):
         pyramid_request.method = "POST"
@@ -1023,7 +1022,6 @@ def test_delete_role(
         assert entry.name == organization_project.name
         assert entry.action == f"remove Owner {organization_team.name}"
         assert entry.submitted_by == db_request.user
-        assert entry.submitted_from == db_request.remote_addr
 
     def test_delete_missing_role(self, db_request, organization_project):
         missing_role_id = str(uuid.uuid4())

tests/unit/utils/test_project.py

@@ -140,7 +140,6 @@ def test_remove_project(db_request, flash):
     )
     assert journal_entry.action == "remove project"
     assert journal_entry.submitted_by == db_request.user
-    assert journal_entry.submitted_from == db_request.remote_addr
 
 
 @pytest.mark.parametrize("flash", [True, False])
@@ -164,7 +163,6 @@ def test_destroy_docs(db_request, flash):
     )
     assert journal_entry.action == "docdestroy"
     assert journal_entry.submitted_by == db_request.user
-    assert journal_entry.submitted_from == db_request.remote_addr
 
     assert not (
         db_request.db.query(Project)

warehouse/accounts/views.py

@@ -1127,7 +1127,6 @@ def _error(message):
             name=project.name,
             action=f"accepted {desired_role} {user.username}",
             submitted_by=request.user,
-            submitted_from=request.remote_addr,
         )
     )
     project.record_event(

warehouse/admin/templates/admin/journals/list.html

@@ -26,7 +26,7 @@
   <div class="card-body">
     <form>
       <div class="input-group input-group-lg">
-        <input name="q" type="text" class="form-control input-lg" placeholder="Search: supported terms are user: project: version: ip:"{% if query %} value="{{ query }}"{% endif %}>
+        <input name="q" type="text" class="form-control input-lg" placeholder="Search: supported terms are user: project: version:"{% if query %} value="{{ query }}"{% endif %}>
         <div class="input-group-btn input-group-append">
           <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
         </div>
@@ -44,7 +44,6 @@
         <th>Version</th>
         <th>Date</th>
         <th>Submitted By</th>
-        <th>Submitted From</th>
         <th>Action</th>
       </tr>
       </thead>
@@ -55,13 +54,6 @@
         <td>{{ journal.version }}</td>
         <td>{{ journal.submitted_date }}</td>
         <td><a href="{{ request.route_path('admin.user.detail', username=journal.submitted_by.username) }}">{{ journal.submitted_by.username }}</a></td>
-        <td>
-          {% if journal.submitted_from %}
-          <a href="{{ request.route_path('admin.journals.list', _query={'q': 'ip:' + journal.submitted_from}) }}">
-            {{ journal.submitted_from }}
-          </a>
-          {% endif %}
-        </td>
         <td>{{ journal.action }}</td>
       </tr>
       {% endfor %}

warehouse/admin/templates/admin/projects/detail.html

@@ -280,7 +280,6 @@ <h3 class="card-title">Journals</h3>
             <th>version</th>
             <th>date</th>
             <th>submitted_by</th>
-            <th>submitted_from</th>
             <th>action</th>
           </tr>
         </thead>
@@ -291,7 +290,6 @@ <h3 class="card-title">Journals</h3>
             <td>{{ entry.version }}</td>
             <td>{{ entry.submitted_date }}</td>
             <td><a href="{{ request.route_path('admin.user.detail', username=entry.submitted_by.username) }}">{{ entry.submitted_by.username }}</a></td>
-            <td>{{ entry.submitted_from }}</td>
             <td>{{ entry.action }}</td>
           </tr>
           {% endfor %}

warehouse/admin/templates/admin/projects/journals_list.html

@@ -46,7 +46,6 @@
         <th>Version</th>
         <th>Date</th>
         <th>Submitted By</th>
-        <th>Submitted From</th>
         <th>Action</th>
       </tr>
       </thead>
@@ -58,7 +57,6 @@
         <td>{{ journal.version }}</td>
         <td>{{ journal.submitted_date }}</td>
         <td><a href="{{ request.route_path('admin.user.detail', username=journal.submitted_by.username) }}">{{ journal.submitted_by.username }}</a></td>
-        <td>{{ journal.submitted_from }}</td>
         <td>{{ journal.action }}</td>
       </tr>
       {% endfor %}

warehouse/admin/templates/admin/projects/release_detail.html

@@ -103,7 +103,7 @@ <h3>Journals</h3>
         <tr>
           <td>{{ journal.action }}</td>
           <td>{{ journal.submitted_date|format_datetime() }}</td>
-          <td>{{ journal.submitted_by.username }} from {{ journal.submitted_from }}</td>
+          <td>{{ journal.submitted_by.username }}</td>
         </tr>
         {% endfor %}
         </tbody>

warehouse/admin/views/journals.py

@@ -55,8 +55,6 @@ def journals_list(request):
                     filters.append(JournalEntry.version.ilike(value))
                 if field.lower() == "user":
                     filters.append(JournalEntry._submitted_by.like(value))
-                if field.lower() == "ip":
-                    filters.append(JournalEntry.submitted_from.ilike(value))
             else:
                 filters.append(JournalEntry.name.ilike(term))
 

warehouse/admin/views/projects.py

@@ -404,7 +404,6 @@ def add_role(project, request):
             name=project.name,
             action=f"add {role_name} {user.username}",
             submitted_by=request.user,
-            submitted_from=request.remote_addr,
         )
     )
 
@@ -455,7 +454,6 @@ def delete_role(project, request):
             name=project.name,
             action=f"remove {role.role_name} {role.user.username}",
             submitted_by=request.user,
-            submitted_from=request.remote_addr,
         )
     )
 

warehouse/admin/views/users.py

@@ -207,7 +207,6 @@ def _nuke_user(user, request):
                 name=project.name,
                 action="remove project",
                 submitted_by=request.user,
-                submitted_from=request.remote_addr,
             )
         )
     projects.delete(synchronize_session=False)
@@ -239,7 +238,6 @@ def _nuke_user(user, request):
             name=f"user:{user.username}",
             action="nuke user",
             submitted_by=request.user,
-            submitted_from=request.remote_addr,
         )
     )
 

warehouse/forklift/legacy.py

@@ -1164,7 +1164,6 @@ def file_upload(request):
                 version=release.version,
                 action="new release",
                 submitted_by=request.user if request.user else None,
-                submitted_from=request.remote_addr,
             )
         )
 
@@ -1437,7 +1436,6 @@ def file_upload(request):
                     python_version=file_.python_version, filename=file_.filename
                 ),
                 submitted_by=request.user if request.user else None,
-                submitted_from=request.remote_addr,
             )
         )