codeforlife-portal 7.4.9__py2.py3-none-any.whl → 8.0.1__py2.py3-none-any.whl

cfl_common/setup.py

@@ -17,12 +17,17 @@ setup(
     version=version,
     include_package_data=True,
     install_requires=[
-        "django==3.2.25",
-        "djangorestframework==3.13.1",
-        "django-two-factor-auth==1.13.2",
-        "django-countries==7.3.1",
-        "pyjwt==2.6.0",
+        "django==4.2.16",
+        "django-countries==7.6.1",
+        "django-csp==3.8",
+        "django-import-export==4.2.0",
+        "django-pipeline==3.1.0",
+        "django-two-factor-auth==1.17.0",
+        "djangorestframework==3.15.1",
+        "libsass==0.23.0",
+        "more-itertools==8.7.0",
         "pgeocode==0.4.0",
+        "pyjwt==2.6.0",
     ],
     tests_require=[],
     test_suite="tests",

{codeforlife_portal-7.4.9.dist-info → codeforlife_portal-8.0.1.dist-info}/METADATA

@@ -1,32 +1,25 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 7.4.9
+Version: 8.0.1
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: django-pipeline==2.0.8
-Requires-Dist: django-recaptcha==2.0.6
+Requires-Dist: django-recaptcha==4.0.0
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: importlib-metadata==4.13.0
-Requires-Dist: rapid-router>=6.3.6
 Requires-Dist: reportlab==3.6.13
-Requires-Dist: django-formtools==2.2
-Requires-Dist: django-otp==1.0.2
+Requires-Dist: django-formtools==2.5.1
+Requires-Dist: django-otp==1.5.4
 Requires-Dist: requests==2.32.2
-Requires-Dist: django-treebeard==4.3.1
-Requires-Dist: django-sekizai==2.0.0
-Requires-Dist: django-classy-tags==2.0.0
-Requires-Dist: libsass==0.23.0
+Requires-Dist: django-treebeard==4.7.1
+Requires-Dist: django-sekizai==4.1.0
+Requires-Dist: django-classy-tags==4.1.0
 Requires-Dist: phonenumbers==8.12.12
-Requires-Dist: more-itertools==8.7.0
-Requires-Dist: cfl-common==7.4.9
 Requires-Dist: django-ratelimit==3.0.1
 Requires-Dist: django-preventconcurrentlogins==0.8.2
-Requires-Dist: django-csp==3.7
 Requires-Dist: setuptools==74.0.0
-Requires-Dist: django-import-export
 
 # Code for Life Portal
 

{codeforlife_portal-7.4.9.dist-info → codeforlife_portal-8.0.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cfl_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cfl_common/setup.py,sha256=5Rk-FXyWToTujXqGRYqeA0A5nJ4NC5woXxyb6NLLbpo,818
+cfl_common/setup.py,sha256=XLMyrOLiz1PqXQbnMUcYZEmT5dscDfDjlYF_8r7UmxI,978
 cfl_common/common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
 cfl_common/common/app_settings.py,sha256=Bw1DXkZpNIdwUJ-cIOjZnngH5_NbMXC0koW7NgQ0pKY,2495
 cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
@@ -93,7 +93,7 @@ deploy/middleware/admin_access.py,sha256=-uF9Wgm7WPmNCEQ2Ti-rBXMrYJb0NnrIfnUdRIX
 deploy/middleware/basicauth.py,sha256=DiSImGc9mepmsVK1Be5hc2iLnGzsOFx-S2i8AQnXMwY,1170
 deploy/middleware/exceptionlogging.py,sha256=qE3fJnaCwEslrCpF3k8jK1MeqldnvALPnlrUsiqV-5g,474
 deploy/middleware/screentime_warning.py,sha256=-YmaOn9_RQwTU8C6VxDLWct_0G3Y5oHjAv9AvKZSvIw,1152
-deploy/middleware/security.py,sha256=h9gXlWtLHAE1gARrZxsjJwZEyMXoQs1vZ0FpMwG4W-8,751
+deploy/middleware/security.py,sha256=LOZ-OUFo2dVhbRzI_KdSCMh4TItcJhhqzZg5zNAH-6Q,870
 deploy/middleware/session_timeout.py,sha256=Vfl6_9d8KwPsWRvCIcpBm7kWjgvHC8I7exJOejbyI4k,1023
 deploy/static/apple-touch-icon-120x120.png,sha256=7GwelKO6CNbvjJJ1nqMvDGkPoQWqYomMKKP5EB5gmfM,24583
 deploy/static/apple-touch-icon-152x152.png,sha256=V57OGP0VeeKHen_iYVa72sHe_rEaMAJzU1FAiHWWBwY,36276
@@ -104,19 +104,19 @@ deploy/static/robots.txt,sha256=5cS4RITuQhbpNzvpk4AyDCXdlIBfmfCoBYRvCHY2VT8,24
 deploy/templates/deploy/csrf_failure.html,sha256=-pBRPn4Y7nUdYHGpTHCokT9Boi-isuwuivF8V2K1SgM,412
 example_project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example_project/manage.py,sha256=EUgybZlZ7xk2Zf2KCwBbK_z7gf7Ifqs0_bl4Kijhdgo,242
-example_project/portal_test_settings.py,sha256=_gI7-HMoPJ-cDGO6n5UlEIHKHuTR5SC_Xt-l5Vdbx-0,7312
-example_project/settings.py,sha256=HgGSG0n6Xggd0NieFVoJgn8vKGqyRbCddoB3CRuoT-Y,5640
-example_project/urls.py,sha256=3SsP5jvPAXV5xmduka4zbSZB5PbXggjsalu1ojY5KIo,434
+example_project/portal_test_settings.py,sha256=7Q7SdosA0Ba85qz-xkAe3EHyMPpSIQ61CSlwYL4uNog,7321
+example_project/settings.py,sha256=NjFhtDNLwdY5vhUAtqk9a9m3GRfcuWRVqIqnJ3u0o6E,5658
+example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=4Oq5cK6u8vYJtO-kHkWgMNQEUpUB1YbKJ_fc_Ehjwqk,22
-portal/admin.py,sha256=on1-zNRnZvf2cwBN6GVRVYRhkaksrCgfzX8XPWtkvz8,6062
+portal/__init__.py,sha256=qR-61NMOca8p2Rty8s6xwXQSXLDufw2os6i4zdyqfak,22
+portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
 portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
 portal/context_processors.py,sha256=Q68UhmArLPRchS2KmfVR4hKrijllXal3sO5cHYWC2Fc,222
 portal/handlers.py,sha256=gF99OfQrGcIGDnUyONhvylZNU8sl6XHYEurwu0fuiss,422
 portal/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/urls.py,sha256=4bGQQWiQI9zSG1oceVjQctUnDKggzzZsbYAxuBvijpY,18002
+portal/urls.py,sha256=_EJQ7XNVzeqN6g9pbtKg7DHZHlz31-HgWgft6_kOwXw,18415
 portal/wsgi.py,sha256=3yRcNxBQG30NhzrVi93bX-DrbXtsIQBc70HiW5wbOyE,401
 portal/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/forms/admin.py,sha256=Cdl8-wvasAzvMfgUlFYzQjYeuyC7gIsSiy8V_-jMp7w,2080
@@ -124,12 +124,12 @@ portal/forms/dotmailer.py,sha256=j-o9qthQc7xmOsHSQGEEoHvaEyOpzlWrj6bOnV0PpsI,156
 portal/forms/error_messages.py,sha256=8d3z_3e2L-5zwj5hFhnUByC5k2CEpIVVuJg2nYkCUQ8,148
 portal/forms/invite_teacher.py,sha256=jkDNcCfkts4_lXRzhcI3xBam21Zn2yX9wMpMVhDtW1w,880
 portal/forms/organisation.py,sha256=QcQyd7AiqBmvt4y8uQSQylguUbKOKqo2pjqWIkpWjDg,7433
-portal/forms/play.py,sha256=z9P5LzyS3jjYcnfco84d2x8ptgLxRmh94Dnj05plmbY,11505
-portal/forms/registration.py,sha256=gWcY7rllhWO3c9as6QHUDWZx1Jme7DqtGHYaKcvxe-U,5990
-portal/forms/teach.py,sha256=Fd7zOdwpKTFmxxa3q_Tsj1E9B_M5DZlStF5YXiCA-ys,22688
+portal/forms/play.py,sha256=j_QYAKb4qyW0uy0VUUG49dmzDLINc3jR6ddK-djrbc4,11523
+portal/forms/registration.py,sha256=a-TuzikRc0Q-BAYs3rJ3Sz1wmQ1o_rTEtZmWdF7-xss,6008
+portal/forms/teach.py,sha256=VutOzDz3ATbL08cs09mcyfWDIX4NV1UQEJWs_OYEvUQ,22706
 portal/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/helpers/captcha.py,sha256=Amwg3HZ9eIh1LGYVYWYruk1ccNj6P3nYP_evufOY8BY,254
-portal/helpers/decorators.py,sha256=AnHbcRg42cUYkpMnJMImEMueSKHZRBZ0o67B7_Wp_Zs,3695
+portal/helpers/decorators.py,sha256=Bs6AVCvcgxfHLdJVWzTmZpxlYbJZXJh5e9AGRXf7cwo,3617
 portal/helpers/password.py,sha256=tvCRwul_70XE7D_RkEbs7Ox7kMZlECzZEhDVn_0yfFw,5546
 portal/helpers/ratelimit.py,sha256=AyQ31YbhPUIE6JFyc8RARiTzLoMDeCSwKFNIZ7u0MNM,6744
 portal/helpers/regexes.py,sha256=LlMsbmjGow70QWUh__3PnQWVIce4W9kKSzKnYSGN9AA,813
@@ -430,8 +430,8 @@ portal/templates/404.html,sha256=Tk6HmuzDdIT4ojoIHvH2MibU_0OekU5gmuJmk5M4K_Q,563
 portal/templates/500.html,sha256=aqJfDXPzaEw9K6LToPpE4rARuunLSxiIrJ_GnuJr8pI,1703
 portal/templates/email.html,sha256=MXB64zc1Sd34eIq8mGT1HhrjAiZUNvRx0_XjZllfKUU,268
 portal/templates/email.txt,sha256=z3bkT2WnkCrVa1RLVbGd-pE81cLEHlZ_QowfbSQAOvg,19
-portal/templates/captcha/widget_v2_invisible.html,sha256=wPBAvvjm-qhSCrQruwJ2SSBkxFg4oUNFl26Axs1IjZw,306
-portal/templates/captcha/includes/js_v2_invisible.html,sha256=FUyDf1RDyS7whzW2B_TnD1ovS8an9sDavCJFqAsrnmQ,1409
+portal/templates/django_recaptcha/widget_v2_invisible.html,sha256=3t5JHgyr_so5FQEUtbq501kEjz80KYBOoVz3PuU1JOc,318
+portal/templates/django_recaptcha/includes/js_v2_invisible.html,sha256=QQnBzZBqdtPeJeYFOIihJM18YoSUWbsGjuoMy-5gxNM,1408
 portal/templates/portal/about.html,sha256=_iD0GCP6q3-XuZ2LC-9O0KYY-mKL6c9qk3O-NRRqsRM,10321
 portal/templates/portal/base.html,sha256=4xLACNgKmRQTdEsdNNGYhLzMozzYzWIIzk31HrLGBf0,12109
 portal/templates/portal/base_no_userprofile.html,sha256=PlRufyYmUUGWBZ6CvbYhJWOMTqKqdcee4xnO5--AogA,447
@@ -512,11 +512,11 @@ portal/templates/two_factor/_wizard_forms_token.html,sha256=5JwDoRj_X1EM8RBISx6C
 portal/templates/two_factor/backup_token.html,sha256=5JwDoRj_X1EM8RBISx6Ckb_QZioHknwk_Xi04jUD19U,262
 portal/templates/two_factor/setup_wizard_token.html,sha256=Z0Et2sknJNLtFYvPnVZssG4zCsADuH77xllPIQb22rg,266
 portal/templates/two_factor/core/backup_tokens.html,sha256=u0T-LqtZtGRitlT6lwx_-U8DLPMQERRL2uh_rRL77rI,1442
-portal/templates/two_factor/core/login.html,sha256=BCM5SSepCC4J1RtuGNt6FJXwR8gwdCKxN5NTIl7dP2U,2723
-portal/templates/two_factor/core/setup.html,sha256=k5CIx8Xf9aQNR98c5BTTxOJhS3r1F8VVEBcCe47Zt8s,3145
+portal/templates/two_factor/core/login.html,sha256=Pd9sEvuif-C9W5TcHzUT79v_MCetelotFt-uS3TPMWQ,2198
+portal/templates/two_factor/core/setup.html,sha256=B4lg0htUt9JzmTTGG9jGm_1H04FICoMTRwZ-VyQk2E8,3025
 portal/templates/two_factor/core/setup_complete.html,sha256=aE67CIwicwn6W8-JwUqf-bSgje_9G_2Nm9XfnXU-Uhk,600
 portal/templates/two_factor/profile/disable.html,sha256=fKIxqmB8RqN_DQrNMiZPTcSmoH-hChNcGWR0HKl1r-s,1010
-portal/templates/two_factor/profile/profile.html,sha256=N5nlY4CV_OBSyQld7nUXBMVZfAsByZ7MRIGRjjfTWkE,1800
+portal/templates/two_factor/profile/profile.html,sha256=31dWbU-IL1ogn4mNvLYaPix4WQwmoP1Ho-UW66jXywI,2333
 portal/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/templatetags/app_tags.py,sha256=SvOc4sPGNYpUtnJYxS80EmWYSE-C2mzmvxgRqUHet_o,3794
 portal/templatetags/banner_tags.py,sha256=7jk8avxiot0jMM1xWnUbs2QDsOg1v2aJDJA4p0-SJF0,823
@@ -533,14 +533,14 @@ portal/tests/selenium_test_case.py,sha256=eWUF_5SqkI178bkay5SUDa06r0QTIKUUT8jTAh
 portal/tests/test_2FA.py,sha256=0N4C9Ab3TvO9W__oQLCo-fLDH1Ho3CiGGsSg-2TiZUE,3597
 portal/tests/test_admin.py,sha256=AM2dgv8j9m4L-SDO-sMA9tQvQH9GwRBrlwRG9OgqtfI,1451
 portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,13819
-portal/tests/test_captcha_forms.py,sha256=lirhIli-sHovun8VdrF0he7KRFTAd8DMCpkJ8cQNotg,1015
+portal/tests/test_captcha_forms.py,sha256=Yn_VYO_6jbq6AeKeLcv-YFL1YwXZpU0C3y7SK8fRUm4,1033
 portal/tests/test_class.py,sha256=43g2HslNosbSuSnnMBzM6VWk4LaV0HXkWS3f8VKVRmw,15930
 portal/tests/test_emails.py,sha256=pLr06j3uMBxP1raoZQWzUTBVFvsEDFtUh85J8OnqCwE,9238
 portal/tests/test_global_forms.py,sha256=A5JpAe4AYK-wpu0o1qU4THmeNv_wr7lhzaMbjz5czpY,1543
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
 portal/tests/test_independent_student.py,sha256=NrRjTEr6V4WXpCE74N8LYNVocvLSvddkjuo3dYpfAZc,27245
 portal/tests/test_invite_teacher.py,sha256=gUe1spFp60v3i6kMqGoNgJd0OlBEcwplPPNYLomTJS4,12269
-portal/tests/test_middleware.py,sha256=b6jfNmiRZ2snqLKsyJUG-RivoX5fmrqLlQkG9MeVnqM,8034
+portal/tests/test_middleware.py,sha256=HV7AdgWyvgrtPyDMw3np5YDbUstFpKif7Qqw-e8gs5s,8258
 portal/tests/test_organisation.py,sha256=kCMUNzLN6EzaMUBcFkqXwnqLGgOuQxQWIHHt63nhqBs,7574
 portal/tests/test_partials.py,sha256=cSLNLjdsriROjPxkZlM3HKD3CSKDuKgpaDIdL3fPyBs,1794
 portal/tests/test_ratelimit.py,sha256=XWq1A9XgRrlcMHibGoJ0kc4gLc5U_u5UhKHjthxCfYA,19376
@@ -606,14 +606,14 @@ portal/tests/utils/messages.py,sha256=LeYqCEU-ubEO1lrPSAaXF6WsM8M7C-ZIfVwwlbAFT2
 portal/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/about.py,sha256=-muXy17UhxCSKkjnMAkSLXiCvT_pBPlf2ykTYr794dI,443
 portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
-portal/views/api.py,sha256=lCwiclR98G-yTgK55u8IjkueIH8iremeiZSa3jAvO-M,6990
+portal/views/api.py,sha256=mdWmFkV5mxmR-mvj6ttIe8uwW9tbcx9-5ykk5dpX0LI,7047
 portal/views/dotmailer.py,sha256=x49p89TtwA1MLysRLtq5yRRzVtIpzGoU__Xb5hPuHak,3208
 portal/views/email.py,sha256=V3wXRxIjeZ4OJBVqGCQrPn-GQWKZK1PCXbR1f2Zpa_4,2174
-portal/views/home.py,sha256=qt5kW7TAaRFXz7BA2BrnHe5oYc69jjoLksEbfr0Aa3c,9715
+portal/views/home.py,sha256=cKCby5xDYImMeJqNnrnfkDbb3tAcQX-lw6IgBS7RmR4,10050
 portal/views/legal.py,sha256=nUunsTHnhMcXBcDlg1GmUal86k9Vhinne4A2FWfq78M,342
 portal/views/organisation.py,sha256=sPDbiM7hdtpF8GKyh_4n4VPl2a-WnAgnF4q9aSvQCVI,3341
 portal/views/play_landing_page.py,sha256=FFmjUFub3ZdlbMqkB8yX3jAImCzqrUqgb8AZcpKywZ4,308
-portal/views/registration.py,sha256=L9AzIG2nOU946cSOXmUMQRtDo3uxApHX-0ceXopbOCw,10888
+portal/views/registration.py,sha256=9cDKFVXVyJcMJBVZLwHoucMI4UwsOhbUxMdcxIEOixs,10889
 portal/views/teach.py,sha256=nzlyTcgq9ImAjnqrF3esqi212qBLH5Ww1LKE2gSjoRY,210
 portal/views/cron/__init__.py,sha256=5rxXyhJmLOExRdrYZ1VJttTsyRIPRybzdftbUDwFByI,20
 portal/views/cron/user.py,sha256=iKM_FOcSQvrXtRSZUtxSiMFD3M869JP5jvEfRWHLpvM,10731
@@ -628,11 +628,11 @@ portal/views/teacher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 portal/views/teacher/dashboard.py,sha256=pjzOOCz29d4VHukaCI5QhkDsu-RPvy7SXC9dDcPo50k,27422
 portal/views/teacher/teach.py,sha256=-9zzpNLR2oRkyBFXzXjL0_ew_Qpk27w7uca5rKNeCgE,35988
 portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/views/two_factor/core.py,sha256=O_wcBeFqdPYSGNGv-pT_vbs5-Dj1Z-Jfkd6f9-E5yZI,760
+portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
-portal/views/two_factor/profile.py,sha256=tkl_ludo8arMtd5LKNmohM66vpC_YQiP-0nspTSJiJ4,383
-codeforlife_portal-7.4.9.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-7.4.9.dist-info/METADATA,sha256=uWpHk0_w6eliUYC6nAqgBP9jZEO3OBBn4qlreDTiGUk,3317
-codeforlife_portal-7.4.9.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-codeforlife_portal-7.4.9.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-7.4.9.dist-info/RECORD,,
+portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
+codeforlife_portal-8.0.1.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.0.1.dist-info/METADATA,sha256=BAFsVDbndsTRtpvEE-hMJgpxZyEF-bfL8L2CuBMjZs4,3078
+codeforlife_portal-8.0.1.dist-info/WHEEL,sha256=QyeGbh-t8WT0nt0_LNSP02jN-g4ymd1egk1U3osCGMU,110
+codeforlife_portal-8.0.1.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.0.1.dist-info/RECORD,,

{codeforlife_portal-7.4.9.dist-info → codeforlife_portal-8.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

deploy/middleware/security.py

@@ -4,8 +4,8 @@ from django.middleware.security import SecurityMiddleware
 class CustomSecurityMiddleware(SecurityMiddleware):
     """
     Extends Django's Security Middleware.
-    See https://docs.djangoproject.com/en/3.2/_modules/django/middleware/security/ for
-    the source code, as well as https://docs.djangoproject.com/en/3.2/ref/middleware/#module-django.middleware.security
+    See https://docs.djangoproject.com/en/4.2/_modules/django/middleware/security/ for
+    the source code, as well as https://docs.djangoproject.com/en/4.2/ref/middleware/#module-django.middleware.security
     for docs on security middleware.
     """
 
@@ -13,10 +13,9 @@ class CustomSecurityMiddleware(SecurityMiddleware):
         """
         Extends the original security middleware to ensure the X-XSS-Protection header
         is set to 1.
+        https://docs.djangoproject.com/en/5.1/releases/4.0/#securitymiddleware-no-longer-sets-the-x-xss-protection-header
         """
         super().process_response(request, response)
-
-        if self.xss_filter:
-            response["X-XSS-Protection"] = "1"
+        response.headers.setdefault("X-XSS-Protection", "1; mode=block")
 
         return response

example_project/portal_test_settings.py

@@ -86,7 +86,7 @@ INSTALLED_APPS = [
     "game",
     "pipeline",
     "portal",
-    "captcha",
+    "django_recaptcha",
     "common",
     "django.contrib.admin",
     "django.contrib.admindocs",

example_project/settings.py

@@ -36,13 +36,13 @@ LOGIN_REDIRECT_URL = "/teach/dashboard/"
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
-SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]
+SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"]
 
 INSTALLED_APPS = [
     "game",
     "pipeline",
     "portal",
-    "captcha",
+    "django_recaptcha",
     "common",
     "django.contrib.admin",
     "django.contrib.admindocs",

example_project/urls.py

@@ -1,6 +1,5 @@
-from django.conf.urls import include, url
 from django.contrib import admin
-from django.urls import path
+from django.urls import include, path, re_path
 from game import python_den_urls
 from game import urls as game_urls
 
@@ -9,8 +8,8 @@ from portal import urls as portal_urls
 admin.autodiscover()
 
 urlpatterns = [
-    url(r"^", include(portal_urls)),
+    re_path(r"^", include(portal_urls)),
     path("administration/", admin.site.urls),
-    url(r"^rapidrouter/", include(game_urls)),
-    url(r"^pythonden/", include(python_den_urls)),
+    re_path(r"^rapidrouter/", include(game_urls)),
+    re_path(r"^pythonden/", include(python_den_urls)),
 ]

portal/__init__.py

@@ -1 +1 @@
-__version__ = "7.4.9"
+__version__ = "8.0.1"

portal/admin.py

@@ -12,7 +12,7 @@ from common.models import (
     UserProfile,
 )
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import UserAdmin as _UserAdmin
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from import_export.admin import ExportActionMixin
@@ -172,38 +172,40 @@ class TotalActivityAdmin(admin.ModelAdmin, ExportActionMixin):
         return False
 
 
-def anonymise_user(user_admin, request, queryset):
-    for user in queryset:
-        anonymise(user)
+_UserAdmin.list_display += ("date_joined", "id")
+_UserAdmin.list_filter += ("date_joined",)
 
 
-def export_as_csv(self, request, queryset):
-    meta = self.model._meta
-    field_names = [
-        field.name for field in meta.fields if field.name != "password"
-    ]
+class UserAdmin(_UserAdmin):
+    actions = ["anonymise_user", "export_as_csv"]
+    add_form = AdminUserCreationForm
+    change_password_form = AdminChangeUserPasswordForm
 
-    response = HttpResponse(content_type="text/csv")
-    response["Content-Disposition"] = "attachment; filename={}.csv".format(meta)
-    writer = csv.writer(response)
+    def anonymise_user(self, request, queryset):
+        for user in queryset:
+            anonymise(user)
 
-    writer.writerow(field_names)
-    for obj in queryset:
-        writer.writerow([getattr(obj, field) for field in field_names])
+    anonymise_user.short_description = "Anonymise selected users"
 
-    return response
+    def export_as_csv(self, request, queryset):
+        meta = self.model._meta
+        field_names = [
+            field.name for field in meta.fields if field.name != "password"
+        ]
 
+        response = HttpResponse(content_type="text/csv")
+        response["Content-Disposition"] = "attachment; filename={}.csv".format(
+            meta
+        )
+        writer = csv.writer(response)
 
-anonymise_user.short_description = "Anonymise selected users"
-export_as_csv.short_description = "Export selected users data as CSV"
+        writer.writerow(field_names)
+        for obj in queryset:
+            writer.writerow([getattr(obj, field) for field in field_names])
 
+        return response
 
-UserAdmin.list_display += ("date_joined", "id")
-UserAdmin.list_filter += ("date_joined",)
-UserAdmin.add_form = AdminUserCreationForm
-UserAdmin.change_password_form = AdminChangeUserPasswordForm
-UserAdmin.actions.append(anonymise_user)
-UserAdmin.actions.append(export_as_csv)
+    export_as_csv.short_description = "Export selected users data as CSV"
 
 
 admin.site.register(Class, ClassAdmin)

portal/forms/play.py

@@ -1,8 +1,6 @@
 import re
 from datetime import timedelta, date
 
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 from common.helpers.emails import send_verification_email
 from common.models import Class, Student, stripStudentName
 from common.permissions import logged_in_as_independent_student
@@ -10,6 +8,8 @@ from django import forms
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.utils import timezone
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
 from portal.helpers.password import PasswordStrength, form_clean_password

portal/forms/registration.py

@@ -1,5 +1,3 @@
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 from common.mail import campaign_ids, send_dotdigital_email
 from common.models import Student, Teacher
 from django import forms
@@ -10,6 +8,8 @@ from django.contrib.sites.shortcuts import get_current_site
 from django.urls import reverse_lazy
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 
 from portal.helpers.password import PasswordStrength, form_clean_password
 

portal/forms/teach.py

@@ -2,14 +2,14 @@ import itertools
 import re
 from builtins import map, range, str
 
-from captcha.fields import ReCaptchaField
-from captcha.widgets import ReCaptchaV2Invisible
 from common.helpers.emails import send_verification_email
 from common.models import Student, stripStudentName, UserSession, Teacher
 from django import forms
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.models import User
+from django_recaptcha.fields import ReCaptchaField
+from django_recaptcha.widgets import ReCaptchaV2Invisible
 from game.models import Episode
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE

portal/helpers/decorators.py

@@ -1,28 +1,24 @@
 from __future__ import absolute_import
 
 import datetime
-import pytz
-import re
-
+from functools import wraps
 
+import pytz
 from common.models import Teacher, Student
 from django.contrib.auth import logout
 from django.shortcuts import render
-from functools import wraps
 from ratelimit import ALL, UNSAFE
 
 from portal.helpers.ratelimit import is_ratelimited
-from portal.templatetags.app_tags import is_logged_in
-from portal.views.registration import blocked_and_not_expired
-from portal.views.login import has_user_lockout_expired
-from portal.helpers.ratelimit import get_ratelimit_count_for_user
-
 from portal.helpers.request_handlers import get_access_code_from_request
+from portal.templatetags.app_tags import is_logged_in
 
 __all__ = ["ratelimit"]
 
 
-def ratelimit(group=None, key=None, rate=None, method=ALL, block=False, is_teacher=True):
+def ratelimit(
+    group=None, key=None, rate=None, method=ALL, block=False, is_teacher=True
+):
     """
     Ratelimit decorator, adding custom functionality to django-ratelimit's default
     decorator. On block, the user is logged out, redirected to the "locked out" page,
@@ -63,25 +59,29 @@ def ratelimit(group=None, key=None, rate=None, method=ALL, block=False, is_teach
 
                     access_code = get_access_code_from_request(request)
                     model_finder = model.objects.get
-                    # look for school student
-                    # if access code not found (AttributeError)
-                    # if student not found (IndexError)
-                    # move on to another try block
-                    # similar logic followed afterwards
+                    # look for school student if access code not found
+                    # (AttributeError) if student not found (IndexError) move
+                    # on to another try block similar logic followed afterwards
                     if access_code:
                         user_to_lockout = model_finder(
                             new_user__first_name=username,
                             class_field__access_code=access_code,  # extract the found text from regex
                         )
-                        lockout_template = "portal/locked_out_school_student.html"
+                        lockout_template = (
+                            "portal/locked_out_school_student.html"
+                        )
                     # look for indy student or teacher
                     else:
-                        user_to_lockout = model_finder(new_user__username=username)
+                        user_to_lockout = model_finder(
+                            new_user__username=username
+                        )
                 else:
                     user_to_lockout = model.objects.get(new_user=request.user)
 
                 if user_to_lockout:
-                    user_to_lockout.blocked_time = datetime.datetime.now(tz=pytz.utc)
+                    user_to_lockout.blocked_time = datetime.datetime.now(
+                        tz=pytz.utc
+                    )
                     user_to_lockout.save()
 
                     if is_logged_in(request.user):

portal/templates/{captcha → django_recaptcha}/includes/js_v2_invisible.html

@@ -1,8 +1,8 @@
-{# This is adapted from django-recaptcha 2.0.5 to work on multiple reCAPTCHA's on the same page #}
-{# See verifyCaptcha_{{ widget_uuid}} for the edit #}
+<!-- This is adapted from django-recaptcha 4.0.0 to work on multiple
+reCAPTCHA's on the same page
+See verifyCaptcha_{{ widget_uuid}} for the edit #} -->
 <script src="https://{{ recaptcha_domain }}/recaptcha/api.js{% if api_params %}?{{ api_params }}{% endif %}"></script>
 <script type="text/javascript">
-
     // Submit function to be called, after reCAPTCHA was successful.
     var onSubmit_{{ widget_uuid }} = function(token) {
         console.log("reCAPTCHA validated for 'data-widget-uuid=\"{{ widget_uuid }}\"'. Submitting form...")

portal/templates/{captcha → django_recaptcha}/widget_v2_invisible.html

@@ -1,5 +1,5 @@
-{# copied from django-recaptcha 2.0.5 #}
-{% include "captcha/includes/js_v2_invisible.html" %}
+<!-- copied from django-recaptcha 4.0.0 -->
+{% include "django_recaptcha/includes/js_v2_invisible.html" %}
 <div class="g-recaptcha"
     {% for name, value in widget.attrs.items %}{% if value is not False %} {{ name }}{% if value is not True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}{% endfor %}
 >