blah/typescript-core
1
0
Fork 0
mirror of https://github.com/Blah-IM/typescript-core.git synced 2025-04-30 16:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: make public & private key readonly to outside

Browse source
This commit is contained in:
Shibo Lyu 2024-10-11 01:26:43 +08:00
parent afccd120eb
commit 43516e4da6
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
crypto/keypair.ts
View file

@ -19,22 +19,30 @@ export type EncodedBlahKeyPair =
});
export class BlahKeyPair {
publicKey: BlahPublicKey;
private privateKey: CryptoKey;
private internalPublicKey: BlahPublicKey;
private internalPrivateKey: CryptoKey;
get id(): string {
return this.publicKey.id;
return this.internalPublicKey.id;
}
get name(): string {
return this.publicKey.name;
return this.internalPublicKey.name;
}
get publicKey(): BlahPublicKey {
return this.internalPublicKey;
}
get privateKey(): CryptoKey {
return this.internalPrivateKey;
}
private constructor(
publicIdentity: BlahPublicKey,
privateKey: CryptoKey,
) {
this.publicKey = publicIdentity;
this.privateKey = privateKey;
this.internalPublicKey = publicIdentity;
this.internalPrivateKey = privateKey;
}
static async generate(extractable: boolean = true): Promise<BlahKeyPair> {
@ -91,7 +99,7 @@ export class BlahKeyPair {
}
async encode(password?: string): Promise<EncodedBlahKeyPair> {
if (!this.privateKey.extractable) {
if (!this.internalPrivateKey.extractable) {
throw new Error("Private key is not extractable.");
}
@ -107,7 +115,7 @@ export class BlahKeyPair {
const derviedKey = await pbkdf2Key(password, saltBuf);
const wrappedPrivateKey = await crypto.subtle.wrapKey(
"pkcs8",
this.privateKey,
this.internalPrivateKey,
derviedKey,
{
name: "AES-GCM",
@ -117,7 +125,7 @@ export class BlahKeyPair {
return {
v: "0",
id: this.publicKey.id,
id: this.internalPublicKey.id,
passwordProtectedPrivateKey: bufToHex(wrappedPrivateKey),
iv,
salt,
@ -125,8 +133,11 @@ export class BlahKeyPair {
} else {
return {
v: "0",
id: this.publicKey.id,
privateKey: await crypto.subtle.exportKey("jwk", this.privateKey),
id: this.internalPublicKey.id,
privateKey: await crypto.subtle.exportKey(
"jwk",
this.internalPrivateKey,
),
};
}
}
@ -153,7 +164,7 @@ export class BlahKeyPair {
const rawSig = await crypto.subtle.sign(
"Ed25519",
this.privateKey,
this.internalPrivateKey,
signeeBytes,
);
return {

4
identity/identity.test.ts
View file

@ -33,7 +33,7 @@ Deno.test("created identity act key signed correctly", async () => {
expect(record.typ).toBe("user_act_key");
expect(record.expire_time).toBeGreaterThan(Date.now() / 1000);
expect(record.comment).toBe("");
expect(record.act_key).toBe(actKeyPair.publicKey.id);
expect(record.act_key).toBe(actKeyPair.id);
});
Deno.test("created identity profile signed correctly", async () => {
@ -91,7 +91,7 @@ Deno.test("add a second act key", async () => {
expect(record.typ).toBe("user_act_key");
expect(record.expire_time).toBeGreaterThan(Date.now() / 1000);
expect(record.comment).toBe("test");
expect(record.act_key).toBe(actKeyPair2.publicKey.id);
expect(record.act_key).toBe(actKeyPair2.id);
});
Deno.test("update first act key", async () => {