Browse Source

security(deps): Bump django version to 2.2.27 (#33079)

security(deps): Bump django version to 2.2.27

* security(deps): upgrade Django to 2.2.27 from 2.2.24
* fix(urls): update catchall pattern to match as expected (breaking changes in Django 2.2.25)
* style(comment): remove note about false positive on urls.W002
* fix(urls): re-order debug urls and adjust regex
mdtro 2 years ago
parent
commit
0919305ecd
3 changed files with 57 additions and 58 deletions
  1. 1 1
      requirements-base.txt
  2. 55 55
      src/sentry/web/debug_urls.py
  3. 1 2
      src/sentry/web/urls.py

+ 1 - 1
requirements-base.txt

@@ -12,7 +12,7 @@ datadog==0.29.3
 django-crispy-forms==1.8.1
 django-picklefield==2.1.0
 django-pg-zero-downtime-migrations==0.10
-Django==2.2.24
+Django==2.2.27
 djangorestframework==3.11.2
 drf-spectacular==0.21.0
 email-reply-parser==0.5.12

+ 55 - 55
src/sentry/web/debug_urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 from django.views.generic import TemplateView
 
 import sentry.web.frontend.debug.mail
@@ -65,67 +65,67 @@ from sentry.web.frontend.debug.debug_unable_to_fetch_commits_email import (
 from sentry.web.frontend.debug.debug_unassigned_email import DebugUnassignedEmailView
 
 urlpatterns = [
-    url(r"^debug/mail/alert/$", sentry.web.frontend.debug.mail.alert),
-    url(r"^debug/mail/note/$", DebugNoteEmailView.as_view()),
-    url(r"^debug/mail/new-release/$", DebugNewReleaseEmailView.as_view()),
-    url(r"^debug/mail/new-user-feedback/$", DebugNewUserFeedbackEmailView.as_view()),
-    url(r"^debug/mail/assigned/$", DebugAssignedEmailView.as_view()),
-    url(r"^debug/mail/assigned/self/$", DebugSelfAssignedEmailView.as_view()),
-    url(r"^debug/mail/assigned/team/$", DebugSelfAssignedTeamEmailView.as_view()),
-    url(
-        r"^debug/mail/codeowners_auto_sync_failure/$", DebugCodeOwnersAutoSyncFailureView.as_view()
+    re_path("^debug/mail/alert", sentry.web.frontend.debug.mail.alert),
+    re_path("^debug/mail/note", DebugNoteEmailView.as_view()),
+    re_path("^debug/mail/new-release", DebugNewReleaseEmailView.as_view()),
+    re_path("^debug/mail/new-user-feedback", DebugNewUserFeedbackEmailView.as_view()),
+    re_path("^debug/mail/assigned/self", DebugSelfAssignedEmailView.as_view()),
+    re_path("^debug/mail/assigned/team", DebugSelfAssignedTeamEmailView.as_view()),
+    re_path("^debug/mail/assigned", DebugAssignedEmailView.as_view()),
+    re_path(
+        "^debug/mail/codeowners_auto_sync_failure", DebugCodeOwnersAutoSyncFailureView.as_view()
     ),
-    url(r"^debug/mail/digest/$", sentry.web.frontend.debug.mail.digest),
-    url(r"^debug/mail/report/$", sentry.web.frontend.debug.mail.report),
-    url(r"^debug/mail/regression/$", DebugRegressionEmailView.as_view()),
-    url(r"^debug/mail/regression/release/$", DebugRegressionReleaseEmailView.as_view()),
-    url(r"^debug/mail/resolved/$", DebugResolvedEmailView.as_view()),
-    url(r"^debug/mail/resolved-in-release/$", DebugResolvedInReleaseEmailView.as_view()),
-    url(
-        r"^debug/mail/resolved-in-release/upcoming/$",
+    re_path("^debug/mail/digest", sentry.web.frontend.debug.mail.digest),
+    re_path("^debug/mail/report", sentry.web.frontend.debug.mail.report),
+    re_path("^debug/mail/regression/release", DebugRegressionReleaseEmailView.as_view()),
+    re_path("^debug/mail/regression", DebugRegressionEmailView.as_view()),
+    re_path(
+        "^debug/mail/resolved-in-release/upcoming",
         DebugResolvedInReleaseUpcomingEmailView.as_view(),
     ),
-    url(r"^debug/mail/request-access/$", sentry.web.frontend.debug.mail.request_access),
-    url(
-        r"^debug/mail/request-access-for-another-member/$",
+    re_path("^debug/mail/resolved-in-release", DebugResolvedInReleaseEmailView.as_view()),
+    re_path("^debug/mail/resolved", DebugResolvedEmailView.as_view()),
+    re_path(
+        "^debug/mail/request-access-for-another-member",
         sentry.web.frontend.debug.mail.request_access_for_another_member,
     ),
-    url(r"^debug/mail/join-request/$", DebugOrganizationJoinRequestEmailView.as_view()),
-    url(r"^debug/mail/invite-request/$", DebugOrganizationInviteRequestEmailView.as_view()),
-    url(r"^debug/mail/access-approved/$", sentry.web.frontend.debug.mail.access_approved),
-    url(r"^debug/mail/invitation/$", sentry.web.frontend.debug.mail.invitation),
-    url(r"^debug/mail/invalid-identity/$", DebugInvalidIdentityEmailView.as_view()),
-    url(r"^debug/mail/codeowners-request/$", DebugCodeOwnersRequestView.as_view()),
-    url(r"^debug/mail/confirm-email/$", sentry.web.frontend.debug.mail.confirm_email),
-    url(r"^debug/mail/recover-account/$", sentry.web.frontend.debug.mail.recover_account),
-    url(r"^debug/mail/unable-to-delete-repo/$", DebugUnableToDeleteRepository.as_view()),
-    url(r"^debug/mail/unable-to-fetch-commits/$", DebugUnableToFetchCommitsEmailView.as_view()),
-    url(r"^debug/mail/unassigned/$", DebugUnassignedEmailView.as_view()),
-    url(r"^debug/mail/org-delete-confirm/$", sentry.web.frontend.debug.mail.org_delete_confirm),
-    url(r"^debug/mail/mfa-removed/$", DebugMfaRemovedEmailView.as_view()),
-    url(r"^debug/mail/mfa-added/$", DebugMfaAddedEmailView.as_view()),
-    url(
-        r"^debug/mail/recovery-codes-regenerated/$",
+    re_path("^debug/mail/request-access", sentry.web.frontend.debug.mail.request_access),
+    re_path("^debug/mail/join-request", DebugOrganizationJoinRequestEmailView.as_view()),
+    re_path("^debug/mail/invite-request", DebugOrganizationInviteRequestEmailView.as_view()),
+    re_path("^debug/mail/access-approved", sentry.web.frontend.debug.mail.access_approved),
+    re_path("^debug/mail/invitation", sentry.web.frontend.debug.mail.invitation),
+    re_path("^debug/mail/invalid-identity", DebugInvalidIdentityEmailView.as_view()),
+    re_path("^debug/mail/codeowners-request", DebugCodeOwnersRequestView.as_view()),
+    re_path("^debug/mail/confirm-email", sentry.web.frontend.debug.mail.confirm_email),
+    re_path("^debug/mail/recover-account", sentry.web.frontend.debug.mail.recover_account),
+    re_path("^debug/mail/unable-to-delete-repo", DebugUnableToDeleteRepository.as_view()),
+    re_path("^debug/mail/unable-to-fetch-commits", DebugUnableToFetchCommitsEmailView.as_view()),
+    re_path("^debug/mail/unassigned", DebugUnassignedEmailView.as_view()),
+    re_path("^debug/mail/org-delete-confirm", sentry.web.frontend.debug.mail.org_delete_confirm),
+    re_path("^debug/mail/mfa-removed", DebugMfaRemovedEmailView.as_view()),
+    re_path("^debug/mail/mfa-added", DebugMfaAddedEmailView.as_view()),
+    re_path(
+        "^debug/mail/recovery-codes-regenerated",
         DebugRecoveryCodesRegeneratedEmailView.as_view(),
     ),
-    url(r"^debug/mail/password-changed/$", DebugPasswordChangedEmailView.as_view()),
-    url(r"^debug/mail/new-processing-issues/$", DebugNewProcessingIssuesEmailView.as_view()),
-    url(
-        r"^debug/mail/new-processing-issues-no-reprocessing/$",
+    re_path("^debug/mail/password-changed", DebugPasswordChangedEmailView.as_view()),
+    re_path(
+        "^debug/mail/new-processing-issues-no-reprocessing",
         DebugNewProcessingIssuesNoReprocessingEmailView.as_view(),
     ),
-    url(r"^debug/mail/sso-linked/$", DebugSsoLinkedEmailView.as_view()),
-    url(r"^debug/mail/sso-unlinked/$", DebugSsoUnlinkedEmailView.as_view()),
-    url(r"^debug/mail/sso-unlinked/no-password$", DebugSsoUnlinkedNoPasswordEmailView.as_view()),
-    url(r"^debug/mail/incident-activity$", DebugIncidentActivityEmailView.as_view()),
-    url(r"^debug/mail/incident-trigger$", DebugIncidentTriggerEmailView.as_view()),
-    url(r"^debug/mail/setup-2fa/$", DebugSetup2faEmailView.as_view()),
-    url(r"^debug/embed/error-page/$", DebugErrorPageEmbedView.as_view()),
-    url(r"^debug/trigger-error/$", DebugTriggerErrorView.as_view()),
-    url(r"^debug/auth-confirm-identity/$", debug_auth_views.DebugAuthConfirmIdentity.as_view()),
-    url(r"^debug/auth-confirm-link/$", debug_auth_views.DebugAuthConfirmLink.as_view()),
-    url(r"^debug/sudo/$", TemplateView.as_view(template_name="sentry/account/sudo.html")),
-    url(r"^debug/oauth/authorize/$", DebugOAuthAuthorizeView.as_view()),
-    url(r"^debug/oauth/authorize/error/$", DebugOAuthAuthorizeErrorView.as_view()),
-    url(r"^debug/chart-renderer/$", DebugChartRendererView.as_view()),
+    re_path("^debug/mail/new-processing-issues", DebugNewProcessingIssuesEmailView.as_view()),
+    re_path("^debug/mail/sso-linked", DebugSsoLinkedEmailView.as_view()),
+    re_path("^debug/mail/sso-unlinked/no-password", DebugSsoUnlinkedNoPasswordEmailView.as_view()),
+    re_path("^debug/mail/sso-unlinked", DebugSsoUnlinkedEmailView.as_view()),
+    re_path("^debug/mail/incident-activity", DebugIncidentActivityEmailView.as_view()),
+    re_path("^debug/mail/incident-trigger", DebugIncidentTriggerEmailView.as_view()),
+    re_path("^debug/mail/setup-2fa", DebugSetup2faEmailView.as_view()),
+    re_path("^debug/embed/error-page", DebugErrorPageEmbedView.as_view()),
+    re_path("^debug/trigger-error", DebugTriggerErrorView.as_view()),
+    re_path("^debug/auth-confirm-identity", debug_auth_views.DebugAuthConfirmIdentity.as_view()),
+    re_path("^debug/auth-confirm-link", debug_auth_views.DebugAuthConfirmLink.as_view()),
+    re_path("^debug/sudo", TemplateView.as_view(template_name="sentry/account/sudo.html")),
+    re_path("^debug/oauth/authorize/error", DebugOAuthAuthorizeErrorView.as_view()),
+    re_path("^debug/oauth/authorize", DebugOAuthAuthorizeView.as_view()),
+    re_path("^debug/chart-renderer", DebugChartRendererView.as_view()),
 ]

+ 1 - 2
src/sentry/web/urls.py

@@ -700,6 +700,5 @@ urlpatterns += [
         name="sentry-project-event-redirect",
     ),
     # Legacy
-    # This triggers a false positive for the urls.W002 Django warning
-    url(r"/$", react_page_view),
+    url(r"", react_page_view),
 ]