erp5_core: fix variables in formatted strings

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testPasswordTool.py

@@ -434,6 +434,32 @@ class TestPasswordTool(ERP5TypeTestCase):
     # But no mail has been sent
     self.stepCheckNoMailSent()
 
+  def test_unreachable_email_on_person(self):
+    person = self.portal.person_module.newContent(
+      portal_type="Person",
+      reference="user",
+      default_email_text="user@example.invalid",
+    )
+    person.getDefaultEmailValue().declareUnreachable()
+    assignment = person.newContent(portal_type='Assignment')
+    assignment.open()
+    login = person.newContent(
+      portal_type='ERP5 Login',
+      reference='user-login',
+      password='password',
+    )
+    login.validate()
+
+    self.tic()
+    self.logout()
+    ret = self.portal.portal_password.mailPasswordResetRequest(
+                  user_login='user-login', REQUEST=self.portal.REQUEST)
+
+    # For security reasons, the message should always be the same
+    self.assertTrue("portal_status_message=An+email+has+been+sent+to+you." in str(ret))
+    # But no mail has been sent
+    self.stepCheckNoMailSent()
+
   def test_acquired_email_on_person(self):
     organisation = self.portal.organisation_module.newContent(
                                     portal_type='Organisation',

product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.PasswordTool.py

@@ -161,7 +161,7 @@ class PasswordTool(BaseTool):
       error_encountered = True
       LOG(
         'ERP5.PasswordTool', INFO,
-        "User ${user} does not exist.".format(user=user_login)
+        "User {user} does not exist.".format(user=user_login)
       )
     else:
       # We use checked_permission to prevent errors when trying to acquire
@@ -174,13 +174,19 @@ class PasswordTool(BaseTool):
       if email_value is None or not email_value.asText():
         if credential_request_exists:
           raise RuntimeError(
-            "User ${user} does not have an email address, "
+            "User {user} does not have an email address, "
             "please contact site administrator directly".format(user=user_login)
           )
         error_encountered = True
         LOG(
           'ERP5.PasswordTool', INFO,
-          "User ${user} does not have an email address".format(user=user_login)
+          "User {user} does not have an email address".format(user=user_login)
+        )
+      elif email_value.getValidationState() != "reachable":
+        error_encountered = True
+        LOG(
+          'ERP5.PasswordTool', INFO,
+          "User {user} does not have a valid email address".format(user=user_login)
         )
     if error_encountered:
       if batch: