Merge "Fix typo and add name to not_implemented and mock key_manager"
Jenkins authored 8 years ago
Gerrit Code Review committed 8 years ago
28 | 28 | super(NotImplementedKeyManager, self).__init__(configuration) |
29 | 29 | |
30 | 30 | def create_key(self, context, algorithm='AES', length=256, |
31 | expiration=None, **kwargs): | |
31 | expiration=None, name=None, **kwargs): | |
32 | 32 | raise NotImplementedError() |
33 | 33 | |
34 | def create_key_pair(self, context, algorithm, lengthm, expiration=None): | |
34 | def create_key_pair(self, context, algorithm, length, | |
35 | expiration=None, name=None): | |
35 | 36 | raise NotImplementedError() |
36 | 37 | |
37 | 38 | def store(self, context, managed_object, expiration=None, **kwargs): |
63 | 63 | return hex_encoded |
64 | 64 | |
65 | 65 | def _generate_key(self, **kwargs): |
66 | name = kwargs.get('name', None) | |
66 | 67 | key_length = kwargs.get('key_length', 256) |
67 | 68 | _hex = self._generate_hex_key(key_length) |
68 | 69 | return sym_key.SymmetricKey( |
69 | 70 | 'AES', |
70 | 71 | key_length, |
71 | bytes(binascii.unhexlify(_hex))) | |
72 | bytes(binascii.unhexlify(_hex)), | |
73 | name) | |
72 | 74 | |
73 | 75 | def create_key(self, context, **kwargs): |
74 | 76 | """Creates a symmetric key. |
83 | 85 | key = self._generate_key(**kwargs) |
84 | 86 | return self.store(context, key) |
85 | 87 | |
86 | def _generate_public_and_private_key(self, length): | |
88 | def _generate_public_and_private_key(self, length, name): | |
87 | 89 | crypto_private_key = rsa.generate_private_key( |
88 | 90 | public_exponent=65537, |
89 | 91 | key_size=length, |
103 | 105 | private_key = pri_key.PrivateKey( |
104 | 106 | algorithm='RSA', |
105 | 107 | bit_length=length, |
106 | key=bytearray(private_der)) | |
108 | key=bytearray(private_der), | |
109 | name=name) | |
107 | 110 | |
108 | 111 | public_key = pub_key.PublicKey( |
109 | 112 | algorithm='RSA', |
110 | 113 | bit_length=length, |
111 | key=bytearray(public_der)) | |
114 | key=bytearray(public_der), | |
115 | name=name) | |
112 | 116 | |
113 | 117 | return private_key, public_key |
114 | 118 | |
115 | def create_key_pair(self, context, algorithm, length, expiration=None): | |
119 | def create_key_pair(self, context, algorithm, length, | |
120 | expiration=None, name=None): | |
116 | 121 | """Creates an asymmetric key pair. |
117 | 122 | |
118 | 123 | This implementation returns UUIDs for the created keys in the order: |
133 | 138 | length, valid_lengths) |
134 | 139 | raise ValueError(msg) |
135 | 140 | |
136 | private_key, public_key = self._generate_public_and_private_key(length) | |
141 | private_key, public_key = self._generate_public_and_private_key(length, | |
142 | name) | |
137 | 143 | |
138 | 144 | private_key_uuid = self.store(context, private_key) |
139 | 145 | public_key_uuid = self.store(context, public_key) |
65 | 65 | key = self.key_mgr.get(self.context, key_id) |
66 | 66 | self.assertEqual(length / 8, len(key.get_encoded())) |
67 | 67 | |
68 | def test_create_key_with_name(self): | |
69 | name = 'my key' | |
70 | key_id = self.key_mgr.create_key(self.context, name=name) | |
71 | key = self.key_mgr.get(self.context, key_id) | |
72 | self.assertEqual(name, key.name) | |
73 | ||
68 | 74 | def test_create_key_null_context(self): |
69 | 75 | self.assertRaises(exception.Forbidden, |
70 | 76 | self.key_mgr.create_key, None) |
71 | 77 | |
72 | 78 | def test_create_key_pair(self): |
73 | 79 | for length in [2048, 3072, 4096]: |
80 | name = str(length) + ' key' | |
74 | 81 | private_key_uuid, public_key_uuid = self.key_mgr.create_key_pair( |
75 | self.context, 'RSA', length) | |
82 | self.context, 'RSA', length, name=name) | |
76 | 83 | |
77 | 84 | private_key = self.key_mgr.get(self.context, private_key_uuid) |
78 | 85 | public_key = self.key_mgr.get(self.context, public_key_uuid) |
79 | 86 | |
80 | 87 | crypto_private_key = get_cryptography_private_key(private_key) |
81 | 88 | crypto_public_key = get_cryptography_public_key(public_key) |
89 | ||
90 | self.assertEqual(name, private_key.name) | |
91 | self.assertEqual(name, public_key.name) | |
82 | 92 | |
83 | 93 | self.assertEqual(length, crypto_private_key.key_size) |
84 | 94 | self.assertEqual(length, crypto_public_key.key_size) |