diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-22 22:40:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-22 22:40:49 +0000 |
| commit | 88d7b1e66780c4f16628a7166b96b18a4aa9fc68 (patch) | |
| tree | af22278cca9fc2f369e08a747b23586b17ca1e99 /ironic | |
| parent | 9f07ad1b6eaa5a96c9fec8d6cd57ffe474a33e2e (diff) | |
| parent | 1425adbb0572d6280ae70635baa53b0d9291ac07 (diff) | |
| download | ironic-88d7b1e66780c4f16628a7166b96b18a4aa9fc68.tar.gz | |
Merge "Do not use random to generate token"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/conductor/utils.py | 7 | ||||
| -rw-r--r-- | ironic/tests/unit/conductor/test_utils.py | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index 2d97d655c..ee14dce50 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -15,8 +15,7 @@ import contextlib import datetime from distutils.version import StrictVersion -import random -import string +import secrets import time from openstack.baremetal import configdrive as os_configdrive @@ -1019,9 +1018,7 @@ def add_secret_token(node, pregenerated=False): order to facilitate virtual media booting where the token is embedded into the configuration. """ - characters = string.ascii_letters + string.digits - token = ''.join( - random.SystemRandom().choice(characters) for i in range(128)) + token = secrets.token_urlsafe() i_info = node.driver_internal_info i_info['agent_secret_token'] = token if pregenerated: diff --git a/ironic/tests/unit/conductor/test_utils.py b/ironic/tests/unit/conductor/test_utils.py index 6a437debe..23127efe2 100644 --- a/ironic/tests/unit/conductor/test_utils.py +++ b/ironic/tests/unit/conductor/test_utils.py @@ -2030,8 +2030,7 @@ class AgentTokenUtilsTestCase(tests_base.TestCase): def test_add_secret_token(self): self.assertNotIn('agent_secret_token', self.node.driver_internal_info) conductor_utils.add_secret_token(self.node) - self.assertEqual( - 128, len(self.node.driver_internal_info['agent_secret_token'])) + self.assertIn('agent_secret_token', self.node.driver_internal_info) def test_del_secret_token(self): conductor_utils.add_secret_token(self.node) |