refactor: root key manager (#2344)
This commit is contained in:
@@ -22,7 +22,7 @@ describe('device authentication', function () {
|
||||
await application.addPasscode(passcode)
|
||||
expect(await application.hasPasscode()).to.equal(true)
|
||||
expect(await application.protectionService.createLaunchChallenge()).to.be.ok
|
||||
expect(application.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.WrapperOnly)
|
||||
expect(application.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.WrapperOnly)
|
||||
await Factory.safeDeinit(application)
|
||||
|
||||
/** Recreate application and initialize */
|
||||
@@ -49,10 +49,10 @@ describe('device authentication', function () {
|
||||
tmpApplication.submitValuesForChallenge(challenge, initialValues)
|
||||
}
|
||||
await tmpApplication.prepareForLaunch({ receiveChallenge })
|
||||
expect(await tmpApplication.protocolService.getRootKey()).to.not.be.ok
|
||||
expect(await tmpApplication.encryptionService.getRootKey()).to.not.be.ok
|
||||
await tmpApplication.launch(true)
|
||||
expect(await tmpApplication.protocolService.getRootKey()).to.be.ok
|
||||
expect(tmpApplication.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.WrapperOnly)
|
||||
expect(await tmpApplication.encryptionService.getRootKey()).to.be.ok
|
||||
expect(tmpApplication.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.WrapperOnly)
|
||||
await Factory.safeDeinit(tmpApplication)
|
||||
}).timeout(10000)
|
||||
|
||||
@@ -65,7 +65,7 @@ describe('device authentication', function () {
|
||||
await application.protections.enableBiometrics()
|
||||
expect(await application.hasPasscode()).to.equal(true)
|
||||
expect((await application.protectionService.createLaunchChallenge()).prompts.length).to.equal(2)
|
||||
expect(application.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.WrapperOnly)
|
||||
expect(application.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.WrapperOnly)
|
||||
await Factory.safeDeinit(application)
|
||||
|
||||
/** Recreate application and initialize */
|
||||
@@ -98,11 +98,11 @@ describe('device authentication', function () {
|
||||
}
|
||||
|
||||
await tmpApplication.prepareForLaunch({ receiveChallenge })
|
||||
expect(await tmpApplication.protocolService.getRootKey()).to.not.be.ok
|
||||
expect(await tmpApplication.encryptionService.getRootKey()).to.not.be.ok
|
||||
expect((await tmpApplication.protectionService.createLaunchChallenge()).prompts.length).to.equal(2)
|
||||
await tmpApplication.launch(true)
|
||||
expect(await tmpApplication.protocolService.getRootKey()).to.be.ok
|
||||
expect(tmpApplication.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.WrapperOnly)
|
||||
expect(await tmpApplication.encryptionService.getRootKey()).to.be.ok
|
||||
expect(tmpApplication.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.WrapperOnly)
|
||||
await Factory.safeDeinit(tmpApplication)
|
||||
}).timeout(Factory.TwentySecondTimeout)
|
||||
|
||||
@@ -119,11 +119,11 @@ describe('device authentication', function () {
|
||||
const sampleStorageKey = 'foo'
|
||||
const sampleStorageValue = 'bar'
|
||||
await application.diskStorageService.setValue(sampleStorageKey, sampleStorageValue)
|
||||
expect(application.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.RootKeyOnly)
|
||||
expect(application.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.RootKeyOnly)
|
||||
const passcode = 'foobar'
|
||||
Factory.handlePasswordChallenges(application, password)
|
||||
await application.addPasscode(passcode)
|
||||
expect(application.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.RootKeyPlusWrapper)
|
||||
expect(application.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.RootKeyPlusWrapper)
|
||||
expect(await application.hasPasscode()).to.equal(true)
|
||||
await Factory.safeDeinit(application)
|
||||
|
||||
@@ -154,11 +154,11 @@ describe('device authentication', function () {
|
||||
await tmpApplication.prepareForLaunch({
|
||||
receiveChallenge: receiveChallenge,
|
||||
})
|
||||
expect(await tmpApplication.protocolService.getRootKey()).to.not.be.ok
|
||||
expect(await tmpApplication.encryptionService.getRootKey()).to.not.be.ok
|
||||
await tmpApplication.launch(true)
|
||||
expect(await tmpApplication.diskStorageService.getValue(sampleStorageKey)).to.equal(sampleStorageValue)
|
||||
expect(await tmpApplication.protocolService.getRootKey()).to.be.ok
|
||||
expect(tmpApplication.protocolService.rootKeyEncryption.keyMode).to.equal(KeyMode.RootKeyPlusWrapper)
|
||||
expect(await tmpApplication.encryptionService.getRootKey()).to.be.ok
|
||||
expect(tmpApplication.encryptionService.rootKeyManager.getKeyMode()).to.equal(KeyMode.RootKeyPlusWrapper)
|
||||
await Factory.safeDeinit(tmpApplication)
|
||||
}).timeout(Factory.TwentySecondTimeout)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user