openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Use fernet for barbican crypto key"

This commit is contained in:
Zuul 2018-07-30 04:16:04 +00:00 committed by Gerrit Code Review
parent da9ff22461 b80a63f33f
commit 72dd045ff4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kolla_ansible/cmd/genpwd.py
View File

@ -19,11 +19,11 @@ import random
import string
import sys
from cryptography import fernet
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.asymmetric import rsa
from cryptography.hazmat.primitives import serialization
from hashlib import md5
from hashlib import sha256
from oslo_utils import uuidutils
import yaml
@ -85,8 +85,8 @@ def main():
hmac_md5_keys = ['designate_rndc_key',
'osprofiler_secret']
# HMAC-SHA256 keys
hmac_sha256_keys = ['barbican_crypto_key']
# Fernet keys
fernet_keys = ['barbican_crypto_key']
# length of password
length = 40
@ -114,10 +114,8 @@ def main():
passwords[k] = (hmac.new(
uuidutils.generate_uuid().encode(), ''.encode(), md5)
.hexdigest())
elif k in hmac_sha256_keys:
passwords[k] = (hmac.new(
uuidutils.generate_uuid().encode(), ''.encode(), sha256)
.hexdigest())
elif k in fernet_keys:
passwords[k] = fernet.Fernet.generate_key()
else:
passwords[k] = ''.join([
random.SystemRandom().choice(