Commit d1e7c67

authored

Ensure different key ids use different client instances (#196)

1 parent 5e79eef commit d1e7c67Copy full SHA for d1e7c67

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,14 @@ import {AwsCredentialIdentity, AwsCredentialIdentityProvider} from "@smithy/type`
`10`	`10`	`export class AwsKmsClient implements KmsClient {`
`11`	`11`
`12`	`12`	`private kmsClient: KMSClient`
	`13`	`+ private keyUri: string`
`13`	`14`	`private keyId: string`
`14`	`15`
`15`	`16`	`constructor(keyUri: string, creds?: AwsCredentialIdentity \| AwsCredentialIdentityProvider) {`
`16`	`17`	`if (!keyUri.startsWith(AwsKmsDriver.PREFIX)) {`
`17`	`18`	throw new Error(`key uri must start with ${AwsKmsDriver.PREFIX}`)
`18`	`19`	`}`
	`20`	`+ this.keyUri = keyUri`
`19`	`21`	`this.keyId = keyUri.substring(AwsKmsDriver.PREFIX.length)`
`20`	`22`	`const tokens = this.keyId.split(':')`
`21`	`23`	`if (tokens.length < 4) {`
`@@ -29,7 +31,7 @@ export class AwsKmsClient implements KmsClient {`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`supported(keyUri: string): boolean {`
`32`		`- return keyUri.startsWith(AwsKmsDriver.PREFIX)`
	`34`	`+ return this.keyUri===keyUri`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`async encrypt(plaintext: Buffer): Promise<Buffer> {`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,20 @@ export class AzureKmsClient implements KmsClient {`
`7`	`7`	`private static ALGORITHM: EncryptionAlgorithm = 'RSA-OAEP-256'`
`8`	`8`
`9`	`9`	`private kmsClient: CryptographyClient`
	`10`	`+ private keyUri: string`
`10`	`11`	`private keyId: string`
`11`	`12`
`12`	`13`	`constructor(keyUri: string, creds: TokenCredential) {`
`13`	`14`	`if (!keyUri.startsWith(AzureKmsDriver.PREFIX)) {`
`14`	`15`	throw new Error(`key uri must start with ${AzureKmsDriver.PREFIX}`)
`15`	`16`	`}`
	`17`	`+ this.keyUri = keyUri`
`16`	`18`	`this.keyId = keyUri.substring(AzureKmsDriver.PREFIX.length)`
`17`	`19`	`this.kmsClient = new CryptographyClient(this.keyId, creds)`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`supported(keyUri: string): boolean {`
`21`		`- return keyUri.startsWith(AzureKmsDriver.PREFIX)`
	`23`	`+ return this.keyUri===keyUri`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`async encrypt(plaintext: Buffer): Promise<Buffer> {`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,20 +5,22 @@ import {KeyManagementServiceClient} from "@google-cloud/kms";`
`5`	`5`	`export class GcpKmsClient implements KmsClient {`
`6`	`6`
`7`	`7`	`private kmsClient: KeyManagementServiceClient`
	`8`	`+ private keyUri: string`
`8`	`9`	`private keyId: string`
`9`	`10`
`10`	`11`	`constructor(keyUri: string, creds?: GcpCredentials) {`
`11`	`12`	`if (!keyUri.startsWith(GcpKmsDriver.PREFIX)) {`
`12`	`13`	throw new Error(`key uri must start with ${GcpKmsDriver.PREFIX}`)
`13`	`14`	`}`
	`15`	`+ this.keyUri = keyUri`
`14`	`16`	`this.keyId = keyUri.substring(GcpKmsDriver.PREFIX.length)`
`15`	`17`	`this.kmsClient = creds != null`
`16`	`18`	`? new KeyManagementServiceClient({credentials: creds})`
`17`	`19`	`: new KeyManagementServiceClient()`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`supported(keyUri: string): boolean {`
`21`		`- return keyUri.startsWith(GcpKmsDriver.PREFIX)`
	`23`	`+ return this.keyUri===keyUri`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`async encrypt(plaintext: Buffer): Promise<Buffer> {`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,15 @@ import NodeVault from "node-vault";`
`5`	`5`	`export class HcVaultClient implements KmsClient {`
`6`	`6`
`7`	`7`	`private kmsClient: NodeVault.client`
	`8`	`+ private keyUri: string`
`8`	`9`	`private keyId: string`
`9`	`10`	`private keyName: string`
`10`	`11`
`11`	`12`	`constructor(keyUri: string, namespace?: string, token?: string) {`
`12`	`13`	`if (!keyUri.startsWith(HcVaultDriver.PREFIX)) {`
`13`	`14`	throw new Error(`key uri must start with ${HcVaultDriver.PREFIX}`)
`14`	`15`	`}`
	`16`	`+ this.keyUri = keyUri`
`15`	`17`	`this.keyId = keyUri.substring(HcVaultDriver.PREFIX.length)`
`16`	`18`	`let url = new URL(this.keyId)`
`17`	`19`	`let parts = url.pathname.split('/')`
`@@ -28,7 +30,7 @@ export class HcVaultClient implements KmsClient {`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`supported(keyUri: string): boolean {`
`31`		`- return keyUri.startsWith(HcVaultDriver.PREFIX)`
	`33`	`+ return this.keyUri===keyUri`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`async encrypt(plaintext: Buffer): Promise<Buffer> {`

Comments

(0)