Merge ~andreserl/maas:lp1758760_random_random into maas:master

[Andres Rodriguez]

LP: #1758760 - Ensure there's no two consecutive occurrences of the same character

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1758760_random_random lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d1568e5240eb620bd1149509b1596be3d9653d8a

review: Approve

[Newell Jensen (newell-jensen)]

Are we unit testing this? We should try and unit test this new way of making sure there are no consecutive occurrences of the same character.

review: Needs Information

[Andres Rodriguez (andreserl)]

I'm happy to add a test for it, but is it really necessary to add yet another that brings no value to test a password that we already test?

[Newell Jensen (newell-jensen)]

Will let you make the call. Tested your regex loop quickly and seems to work. +1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1758760_random_random lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2137/consoleText

diff --git a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
index 72e2496..e2c3ce5 100644
--- a/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
+++ b/src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py
@@ -303,8 +303,12 @@ def generate_random_password(
         # Create the extra characters to fullfill max_length
         letters += ''.join([
             random.choice(string.ascii_letters) for _ in range(length - 7)])
-        # Randomly mix the password
-        return ''.join(random.sample(letters, len(letters)))
+        # LP: #1758760 - Randomly mix the password until we ensure there's
+        # not consecutive occurrences of the same character.
+        password = ''.join(random.sample(letters, len(letters)))
+        while (bool(re.search(r'(.)\1', password))):
+            password = ''.join(random.sample(letters, len(letters)))
+        return password
     else:
         letters = string.ascii_letters + string.digits
         return ''.join([random.choice(letters) for _ in range(length)])
diff --git a/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py b/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
index 86803eb..9d5fc50 100644
--- a/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
+++ b/src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py
@@ -515,6 +515,10 @@ class TestGeneratesAcceptablePasswords(MAASTestCase):
                 required_character_sets += 1
             if required_character_sets < 2:
                 return False
+            # Test password doesn't have two or more occurrences of the
+            # the same consecutive character.
+            if bool(re.search(r'(.)\1', password)):
+                return False
             return True
         max_attempts = 100
         acceptable = 0