Merge branch 'main' into MDMSetupDetails

constraints.txt

@@ -1,30 +1,30 @@
-aiohappyeyeballs==2.4.0
-aiohttp==3.10.5
+aiohappyeyeballs==2.4.3
+aiohttp==3.10.10
 aiosignal==1.3.1
 amqp==5.2.0
-anyio==4.4.0
+anyio==4.6.2.post1
 asgiref==3.8.1
 asn1crypto==1.5.1
 asttokens==2.4.1
 async-timeout==4.0.3
 attrs==24.2.0
-azure-core==1.30.2
-azure-identity==1.17.1
-billiard==4.2.0
-boto3==1.35.11
-botocore==1.35.11
+azure-core==1.31.0
+azure-identity==1.19.0
+billiard==4.2.1
+boto3==1.35.50
+botocore==1.35.50
 cachetools==5.5.0
-cbor2==5.6.4
+cbor2==5.6.5
 celery==5.4.0
 certifi==2024.8.30
-cffi==1.17.0
-charset-normalizer==3.3.2
+cffi==1.17.1
+charset-normalizer==3.4.0
 click==8.1.7
 click-didyoumean==0.3.1
 click-plugins==1.1.1
 click-repl==0.3.0
-coverage==7.6.1
-cryptography==43.0.1
+coverage==7.6.4
+cryptography==43.0.3
 decorator==5.1.1
 defusedxml==0.7.1
 Deprecated==1.2.14
@@ -36,58 +36,58 @@ django-redis==5.4.0
 django-storages==1.14.4
 djangorestframework==3.15.2
 djangorestframework-yaml==2.0.0
-elastic-transport==8.15.0
-elasticsearch==8.15.0
-elementpath==4.4.0
+elastic-transport==8.15.1
+elasticsearch==8.15.1
+elementpath==4.6.0
 Events==0.5
 exceptiongroup==1.2.2
 executing==2.1.0
-filelock==3.15.4
-frozenlist==1.4.1
+filelock==3.16.1
+frozenlist==1.5.0
 geoip2==4.8.0
-google-api-core==2.19.2
-google-auth==2.34.0
+google-api-core==2.22.0
+google-auth==2.35.0
 google-cloud-core==2.4.1
-google-cloud-kms==2.24.2
-google-cloud-pubsub==2.23.0
-google-cloud-secret-manager==2.20.2
+google-cloud-kms==3.1.0
+google-cloud-pubsub==2.26.1
+google-cloud-secret-manager==2.21.0
 google-cloud-storage==2.18.2
 google-crc32c==1.6.0
 google-resumable-media==2.7.2
 googleapis-common-protos==1.65.0
 grpc-google-iam-v1==0.13.1
-grpcio==1.66.1
-grpcio-status==1.66.1
+grpcio==1.67.1
+grpcio-status==1.67.1
 gunicorn==23.0.0
 h11==0.14.0
 h2==4.1.0
 hpack==4.0.0
-httpcore==1.0.5
+httpcore==1.0.6
 httpx==0.27.2
 hyperframe==6.0.1
-idna==3.8
+idna==3.10
 importlib_metadata==8.4.0
-ipython==8.27.0
+ipython==8.29.0
 jedi==0.19.1
 Jinja2==3.1.4
 jmespath==1.0.1
 josepy==1.14.0
-kombu==5.4.0
-MarkupSafe==2.1.5
+kombu==5.4.2
+MarkupSafe==3.0.2
 matplotlib-inline==0.1.7
 maxminddb==2.6.2
-microsoft-kiota-abstractions==1.3.3
-microsoft-kiota-authentication-azure==1.1.0
-microsoft-kiota-http==1.3.3
-microsoft-kiota-serialization-form==0.1.1
-microsoft-kiota-serialization-json==1.3.1
-microsoft-kiota-serialization-multipart==0.1.0
-microsoft-kiota-serialization-text==1.0.0
-msal==1.30.0
+microsoft-kiota-abstractions==1.6.0
+microsoft-kiota-authentication-azure==1.6.0
+microsoft-kiota-http==1.6.0
+microsoft-kiota-serialization-form==1.6.0
+microsoft-kiota-serialization-json==1.6.0
+microsoft-kiota-serialization-multipart==1.6.0
+microsoft-kiota-serialization-text==1.6.0
+msal==1.31.0
 msal-extensions==1.2.0
-msgraph-core==1.1.3
-msgraph-sdk==1.5.4
-multidict==6.0.5
+msgraph-core==1.1.6
+msgraph-sdk==1.11.0
+multidict==6.1.0
 oauthlib==3.2.2
 opensearch-py==2.7.1
 opentelemetry-api==1.27.0
@@ -97,17 +97,18 @@ packaging==24.1
 parso==0.8.4
 pendulum==3.0.0
 pexpect==4.9.0
-platformdirs==4.2.2
+platformdirs==4.3.6
 portalocker==2.10.1
-prometheus_client==0.20.0
-prompt_toolkit==3.0.47
-proto-plus==1.24.0
-protobuf==5.28.0
-psycopg2==2.9.9
+prometheus_client==0.21.0
+prompt_toolkit==3.0.48
+propcache==0.2.0
+proto-plus==1.25.0
+protobuf==5.28.3
+psycopg2==2.9.10
 ptyprocess==0.7.0
 pure_eval==0.2.3
-pyasn1==0.6.0
-pyasn1_modules==0.4.0
+pyasn1==0.6.1
+pyasn1_modules==0.4.1
 pycparser==2.22
 pycurl==7.45.3
 Pygments==2.18.0
@@ -117,33 +118,33 @@ pyotp==2.9.0
 pysaml2==7.5.0
 python-dateutil==2.9.0.post0
 python-ldap==3.4.4
-pytz==2024.1
+pytz==2024.2
 PyYAML==6.0.2
-redis==5.0.8
+redis==5.2.0
 requests==2.32.3
 requests-oauthlib==2.0.0
 rsa==4.9
-s3transfer==0.10.2
+s3transfer==0.10.3
 six==1.16.0
 sniffio==1.3.1
-snowflake-connector-python==3.12.1
+snowflake-connector-python==3.12.3
 sortedcontainers==2.4.0
 sqlparse==0.5.1
 stack-data==0.6.3
 std-uritemplate==1.0.6
-time-machine==2.15.0
+time-machine==2.16.0
 tomlkit==0.13.2
-tqdm==4.66.5
+tqdm==4.66.6
 traitlets==5.14.3
 typing_extensions==4.12.2
-tzdata==2024.1
-urllib3==2.2.2
+tzdata==2024.2
+urllib3==2.2.3
 vine==5.1.0
 wcwidth==0.2.13
 webauthn==2.2.0
-whitenoise==6.7.0
+whitenoise==6.8.1
 wrapt==1.16.0
 XlsxWriter==3.2.0
 xmlschema==2.5.1
-yarl==1.9.8
-zipp==3.20.1
+yarl==1.17.0
+zipp==3.20.2

server/templates/registration/invitation_email.html

@@ -1,7 +1,7 @@
 {% load i18n %}{% autoescape off %}
 {% blocktrans %}You're receiving this email because you have been invited to use Zentral.{% endblocktrans %}
 
-{% trans "Please go to the following page and choose a new password:" %}
+{% trans "Please go to the following page and set a new password:" %}
 {% block reset_link %}
 {{ reset_url }}
 {% endblock %}

server/templates/registration/login.html

@@ -33,7 +33,7 @@ <h1 class="reg-title">
     </div>
     {% endfor %}
     <div class="text-start my-3">
-      <p><a href="{% url 'password_reset' %}">Password forgotten?</a></p>
+      <p><a href="{% url 'password_reset' %}">Forgot password?</a></p>
     </div>
     <button class="reg-btn-primary" type="submit">
       Sign in{% if login_realms %} with local credentials{% endif %}

server/templates/registration/password_reset_email.html

@@ -1,11 +1,11 @@
 {% load i18n %}{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your Zentral account.{% endblocktrans %}
+{% blocktrans %}You're receiving this email because a password reset has been initiated for your Zentral account.{% endblocktrans %}
 
-{% trans "Please go to the following page and choose a new password:" %}
+{% trans "Please go to the following page and set a new password:" %}
 {% block reset_link %}
 {{ reset_url }}
 {% endblock %}
-{% trans "Your username, in case you've forgotten:" %} {{ username }}
+{% trans "Your username, just in case:" %} {{ username }}
 
 {% trans "Thanks!" %}
 

server/templates/registration/password_reset_subject.txt

@@ -1 +1 @@
-Password reset on Zentral
+Password reset for Zentral

tests/server_accounts/test_password_reset.py

@@ -32,8 +32,8 @@ def test_email_send_password_reset(self):
         handler.send_password_reset(self.user)
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.subject, "Password reset on Zentral")
-        self.assertIn(f"Your username, in case you've forgotten: {self.user.username}", email.body)
+        self.assertEqual(email.subject, "Password reset for Zentral")
+        self.assertIn(f"Your username, just in case: {self.user.username}", email.body)
 
     def test_email_send_invitation(self):
         handler = EmailPasswordResetHandler({})

tests/server_accounts/test_users_views.py

@@ -813,8 +813,8 @@ def test_password_reset_post(self):
         self.assertTemplateUsed(response, "registration/password_reset_done.html")
         self.assertEqual(len(mail.outbox), 1)
         email = mail.outbox[0]
-        self.assertEqual(email.subject, "Password reset on Zentral")
-        self.assertIn(f"Your username, in case you've forgotten: {self.ui_user.username}", email.body)
+        self.assertEqual(email.subject, "Password reset for Zentral")
+        self.assertIn(f"Your username, just in case: {self.ui_user.username}", email.body)
 
     # password change