Skip to content

Commit 319cbc0

Browse files
ewdurbinmiketheman
andauthored
Remove internal malware infrastructure/checks (#13647)
* Remove internal malware infrastructure/checks * from review * recreate migration * remove malware check test infra * forgot order of migration mattered * remove useless config Signed-off-by: Mike Fiedler <[email protected]> --------- Signed-off-by: Mike Fiedler <[email protected]> Co-authored-by: Mike Fiedler <[email protected]>
1 parent 04aa800 commit 319cbc0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+189
-5385
lines changed

Procfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ release: bin/release
22
web: bin/start-web ddtrace-run python -m gunicorn.app.wsgiapp -c gunicorn-prod.conf.py warehouse.wsgi:application
33
web-uploads: bin/start-web ddtrace-run python -m gunicorn.app.wsgiapp -c gunicorn-uploads.conf.py warehouse.wsgi:application
44
worker: bin/start-worker celery -A warehouse worker -Q default -l info --max-tasks-per-child 32
5-
worker-malware: bin/start-worker celery -A warehouse worker -Q malware -l info --max-tasks-per-child 32
65
worker-beat: bin/start-worker celery -A warehouse beat -S redbeat.RedBeatScheduler -l info

bin/release

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@ set -eo pipefail
66
# Migrate our database to the latest revision.
77
python -m warehouse db upgrade head
88

9-
# Insert/upgrade malware checks.
10-
python -m warehouse malware sync-checks
11-
129
# Insert/upgrade classifiers.
1310
python -m warehouse classifiers sync

dev/environment

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ MAIL_BACKEND=warehouse.email.services.ConsoleAndSMTPEmailSender host=maildev por
4343

4444
BREACHED_PASSWORDS=warehouse.accounts.NullPasswordBreachedService
4545

46-
MALWARE_CHECK_BACKEND=warehouse.malware.services.PrinterMalwareCheckService
47-
4846
OIDC_BACKEND=warehouse.oidc.services.NullOIDCPublisherService
4947

5048
METRICS_BACKEND=warehouse.metrics.DataDogMetrics host=notdatadog

docs/dev/application.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ Warehouse serves four main classes of users:
5555
3. *PyPI application moderators*. These users have a subset of the
5656
permissions of *PyPI application administrators* to assist in some
5757
routine administration tasks such as adding new trove classifiers,
58-
adjusting upload limits for distribution packages, and reviewing
59-
malware verdicts.
58+
and adjusting upload limits for distribution packages.
6059
4. *PyPI application administrators*, e.g., Ee Durbin,
6160
Dustin Ingram, and Donald Stufft, who can ban
6261
spam/malware projects, help users with account recovery, and so
@@ -103,7 +102,6 @@ Directories within the repository:
103102
- `legacy/ <https://github.com/pypi/warehouse/tree/main/warehouse/legacy>`_ - most of the read-only APIs implemented here
104103
- `locale/ <https://github.com/pypi/warehouse/tree/main/warehouse/locale>`_ - internationalization
105104
- `macaroons/ <https://github.com/pypi/warehouse/tree/main/warehouse/macaroons>`_ - API token support
106-
- `malware/ <https://github.com/pypi/warehouse/tree/main/warehouse/malware>`_ - automated malware checks
107105
- `manage/ <https://github.com/pypi/warehouse/tree/main/warehouse/manage>`_ - logged-in user functionality (i.e., manage account &
108106
owned/maintained projects)
109107
- `metrics/ <https://github.com/pypi/warehouse/tree/main/warehouse/metrics>`_ - services for recording metrics

docs/dev/development/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Get involved or find help using:
3737
development-database
3838
cloud
3939
email
40-
malware-checks
4140
token-scanning
4241

4342
.. _`GitHub`: https://github.com/pypi/warehouse

docs/dev/development/malware-checks.rst

Lines changed: 0 additions & 188 deletions
This file was deleted.

docs/dev/security.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,3 @@ Project and release activity details
1313
------------------------------------
1414
See :doc:`api-reference/feeds` for how to track new and updated releases on
1515
PyPI.
16-
17-
Malware Checks
18-
--------------
19-
See :doc:`development/malware-checks` for information about existing checks
20-
that are instrumented in PyPI, and instructions for contributing new checks.

requirements/main.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,5 @@ typeguard
7171
webauthn>=1.0.0,<2.0.0
7272
whitenoise
7373
WTForms[email]>=2.0.0
74-
yara-python
7574
zope.sqlalchemy
7675
zxcvbn

requirements/main.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,21 +1631,6 @@ wtforms[email]==3.0.1 \
16311631
--hash=sha256:6b351bbb12dd58af57ffef05bc78425d08d1914e0fd68ee14143b7ade023c5bc \
16321632
--hash=sha256:837f2f0e0ca79481b92884962b914eba4e72b7a2daaf1f939c890ed0124b834b
16331633
# via -r requirements/main.in
1634-
yara-python==4.2.3 \
1635-
--hash=sha256:113f430c5189519e13fc07d8493e3f29a1464a9be06eb7ba1b76451da620a391 \
1636-
--hash=sha256:26ec1042017b3c4e12d2999ed6a33d7807013ae16c487048464b98dabfe3a7b0 \
1637-
--hash=sha256:31f6f6f2fdca4c5ddfeed7cc6d29afad6af7dc259dde284df2d7ea5ae15ee69a \
1638-
--hash=sha256:47a7de4d7dae04e5e146b79f26b7f0b7e9430cb92459b85db7f4341843974aac \
1639-
--hash=sha256:87125ede7fbc18ae65aab550f1a36f4ebf73bb828c5d7a3dd2bb99176f0faa15 \
1640-
--hash=sha256:90db22a471b512d1adb49cec97a1356a1cf7791beeb0acab74c3187f6e8679a6 \
1641-
--hash=sha256:98040aa88d242632c75be87ac3a9958eb407ca30e85b513b9e22807af82ab1c8 \
1642-
--hash=sha256:9f17e0572c49906d0b2a8f6ac20fcb46f17820a7408a5511744a844df4b2ec61 \
1643-
--hash=sha256:aaad4cd4495b7605cb4e039473710ee87a151082171c4bb720086adbe548fb36 \
1644-
--hash=sha256:bef2f079acd459b852c0634f72cd41058766110d8900573b2d55be12d35d55db \
1645-
--hash=sha256:d6c2de71b368da053599d734c031389815a70df4b667d6dc386d1335689717d6 \
1646-
--hash=sha256:d7543ff7eb7e21a815d7bc1bf2fcca24cab3548184d3257c58916628f3c89b37 \
1647-
--hash=sha256:feac02291a584b846615aa9265f01fa458ec7e7087317ffa679bbb1a2baec85b
1648-
# via -r requirements/main.in
16491634
zope-deprecation==5.0 \
16501635
--hash=sha256:28c2ee983812efb4676d33c7a8c6ade0df191c1c6d652bbbfe6e2eeee067b2d4 \
16511636
--hash=sha256:b7c32d3392036b2145c40b3103e7322db68662ab09b7267afe1532a9d93f640f

tests/common/checks/__init__.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/common/checks/hooked.py

Lines changed: 0 additions & 39 deletions
This file was deleted.

tests/common/checks/scheduled.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)