mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-11-19 09:41:29 +01:00
Code Issues Projects Releases Wiki Activity

UI transit date fix (#6827)

Browse Source 
* fix timestamp for aes-gcm and chacha-poly transit keys

* add test for transit-key serializer
This commit is contained in:
Matthew Irish 2019-06-20 08:39:23 -05:00 committed by GitHub
parent 53fd48178b
commit a0f32492d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/serializers/transit-key.js
View File

@ -16,6 +16,12 @@ export default DS.RESTSerializer.extend({
}
assign(payload, payload.data);
delete payload.data;
// timestamps for these two are in seconds...
if (payload.type === 'aes256-gcm96' || payload.type === 'chacha20-poly1305') {
for (let version in payload.keys) {
payload.keys[version] = payload.keys[version] * 1000;
}
}
return [payload];
},

78
ui/tests/unit/serializers/transit-key-test.js Normal file
View File

@ -0,0 +1,78 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
const CHACHA = {
request_id: 'a5695685-584c-6b25-fada-35304d3d583d',
lease_id: '',
renewable: false,
lease_duration: 0,
data: {
allow_plaintext_backup: false,
deletion_allowed: false,
derived: false,
exportable: false,
keys: {
'1': 1559598610,
},
latest_version: 1,
min_available_version: 0,
min_decryption_version: 1,
min_encryption_version: 0,
name: 'anewone',
supports_decryption: true,
supports_derivation: true,
supports_encryption: true,
supports_signing: false,
type: 'chacha20-poly1305',
},
wrap_info: null,
warnings: null,
auth: null,
};
const AES = {
request_id: '90c327a8-9a68-6fab-13a1-f51b68cb24d7',
lease_id: '',
renewable: false,
lease_duration: 0,
data: {
allow_plaintext_backup: false,
deletion_allowed: false,
derived: false,
exportable: false,
keys: {
'1': 1559577523,
},
latest_version: 1,
min_available_version: 0,
min_decryption_version: 1,
min_encryption_version: 0,
name: 'new',
supports_decryption: true,
supports_derivation: true,
supports_encryption: true,
supports_signing: false,
type: 'aes256-gcm96',
},
wrap_info: null,
warnings: null,
auth: null,
};
module('Unit | Serializer | transit-key', function(hooks) {
setupTest(hooks);
test('it expands the timestamp for aes and chacha-poly keys', function(assert) {
let serializer = this.owner.lookup('serializer:transit-key');
let aesExpected = AES.data.keys[1] * 1000;
let chachaExpected = CHACHA.data.keys[1] * 1000;
let aesData = serializer.normalizeSecrets(AES);
assert.equal(aesData.firstObject.keys[1], aesExpected, 'converts seconds to millis for aes keys');
let chachaData = serializer.normalizeSecrets(CHACHA);
assert.equal(
chachaData.firstObject.keys[1],
chachaExpected,
'converts seconds to millis for chacha keys'
);
});
});