Skip to content

feat: Do not allow importing keystore from cli #1108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashchan merged 1 commit into from
Nov 14, 2019
Merged

feat: Do not allow importing keystore from cli #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/neuron-wallet/src/models/keys/keystore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { UnsupportedCipher, IncorrectPassword, InvalidKeystore } from 'exception
import { ExtendedPrivateKey } from './key'

const CIPHER = 'aes-128-ctr'
const CKB_CLI_ORIGIN = 'ckb-cli'

interface CipherParams {
iv: string
Expand Down Expand Up @@ -42,6 +43,9 @@ export default class Keystore {
static fromJson = (json: string) => {
try {
const object = JSON.parse(json)
if (object.origin === CKB_CLI_ORIGIN) {
throw 'Keystore from CKB CLI is not supported'
}
return new Keystore(object.crypto, object.id)
} catch {
throw new InvalidKeystore()
Expand Down
11 changes: 11 additions & 0 deletions packages/neuron-wallet/tests/models/keys/keystore.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,14 @@ describe('load ckb cli standard keystore', () => {
expect(extendedPrivateKey.chainCode).toEqual('615302e2c93151a55c29121dd02ad554e47908a6df6d7374f357092cec11675b')
})
})

describe('load ckb cli origin keystore', () => {
const keystoreString =
'{"origin":"ckb-cli", "address":"ea22142fa5be326e834681144ca30326f99a6d5a","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"29304e5bcbb1885ef5cdcb40b5312b58"},"ciphertext":"93054530a8fbe5b11995acda856585d7362ac7d2b1e4f268c633d997be2d6532c4962501d0835bf52a4693ae7a091ac9bac9297793f4116ef7c123edb00dbc85","kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"724327e67ca321ccf15035bb78a0a05c816bebbe218a0840abdc26da8453c1f4"},"mac":"1d0e5660ffbfc1f9ff4da97aefcfc2153c0ec1b411e35ffee26ee92815cc06f9"},"id":"43c1116e-efd5-4c9e-a86a-3ec0ab163122","version":3}'

it('does not load', () => {
expect(
() => Keystore.fromJson(keystoreString)
).toThrowError()
})
})