Skip to content

Commit

Permalink
throw specific error on decrypt if key not found (#16)
Browse files Browse the repository at this point in the history
* throw specific error on decrypt key not found

* let -> const

* convertToError instead of throwing it directly

* convert error checks to class member
  • Loading branch information
hensur authored Oct 16, 2020
1 parent 4f43bc2 commit e0cf588
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
24 changes: 23 additions & 1 deletion src/Vault.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export class VaultRequestError extends VaultError {
}
}

export class VaultDecryptionKeyNotFoundError extends VaultRequestError {}

export interface VaultRequestOptions {
retryWithTokenRenew?: boolean;
acceptedReturnCodes?: number[];
Expand Down Expand Up @@ -172,12 +174,32 @@ export class Vault {
body: res.body,
};
}
throw new VaultRequestError(
const tmpErr = new VaultRequestError(
`Request to ${requestOptions.uri.toString()} failed (Status ${errorResponse.statusCode})`,
errorResponse,
);

throw this.convertToSpecificError(tmpErr);
}

return res.body;
}

private convertToSpecificError(error: VaultRequestError): VaultRequestError {
if (this.checkError(error, 400, "encryption key not found")) {
return new VaultDecryptionKeyNotFoundError(`DecryptionKeyNotFound: ${error.message}`, error.response);
}
return error;
}

private checkError(error: VaultRequestError, expectedCode: number, expectedMsg: string): boolean {
const { statusCode, body } = error.response;
if (expectedCode !== statusCode) {
return false;
}

const errors = body?.errors ?? [];

return errors.some((e) => e.includes(expectedMsg));
}
}
8 changes: 3 additions & 5 deletions tests/engines/transit.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Vault } from "../../src";
import { Vault, VaultDecryptionKeyNotFoundError } from "../../src";
import { TransitVaultClient } from "../../src";
import * as util from "util";

Expand Down Expand Up @@ -133,8 +133,7 @@ describe("Transit Vault Client", () => {
try {
await client.decryptText("unknownkey", encrypted);
} catch (err) {
testLogger(err.response.body.errors);
expect(err.response.statusCode).toEqual(400);
expect(err).toBeInstanceOf(VaultDecryptionKeyNotFoundError);
}
});

Expand All @@ -153,8 +152,7 @@ describe("Transit Vault Client", () => {
],
});
} catch (err) {
testLogger(err.response.body.errors);
expect(err.response.statusCode).toEqual(400);
expect(err).toBeInstanceOf(VaultDecryptionKeyNotFoundError);
}
});
});
Expand Down

0 comments on commit e0cf588

Please sign in to comment.