summaryrefslogtreecommitdiffhomepage
path: root/packages/server/src
diff options
context:
space:
mode:
authorMatthew Miller <matthew@millerti.me>2023-08-16 12:47:19 -0700
committerMatthew Miller <matthew@millerti.me>2023-08-16 12:47:19 -0700
commitc7610cfef0490d43c0d6a35d3af6d4a461120f08 (patch)
tree4f4cce3483c57a305988e83a5c8f2ec489d9ea6c /packages/server/src
parent44d009ea9f23da7ec7ebbb42cef5e604e18395a7 (diff)
Address `deno lint` issues
Diffstat (limited to 'packages/server/src')
-rw-r--r--packages/server/src/helpers/isCertRevoked.ts4
-rw-r--r--packages/server/src/helpers/iso/isoCBOR.ts2
-rw-r--r--packages/server/src/helpers/iso/isoCrypto/importKey.ts2
-rw-r--r--packages/server/src/helpers/iso/isoCrypto/verify.ts2
-rw-r--r--packages/server/src/helpers/toHash.ts2
-rw-r--r--packages/server/src/helpers/verifySignature.ts2
-rw-r--r--packages/server/src/metadata/verifyJWT.ts2
-rw-r--r--packages/server/src/registration/verifications/tpm/constants.ts2
-rw-r--r--packages/server/src/services/metadataService.test.ts2
-rw-r--r--packages/server/src/services/metadataService.ts6
-rw-r--r--packages/server/src/services/settingsService.test.ts3
-rw-r--r--packages/server/src/setupTests.ts1
12 files changed, 13 insertions, 17 deletions
diff --git a/packages/server/src/helpers/isCertRevoked.ts b/packages/server/src/helpers/isCertRevoked.ts
index 6b0e88e..358965e 100644
--- a/packages/server/src/helpers/isCertRevoked.ts
+++ b/packages/server/src/helpers/isCertRevoked.ts
@@ -90,14 +90,14 @@ export async function isCertRevoked(cert: Certificate): Promise<boolean> {
try {
const respCRL = await fetch(crlURL);
certListBytes = await respCRL.arrayBuffer();
- } catch (err) {
+ } catch (_err) {
return false;
}
let data: CertificateList;
try {
data = AsnParser.parse(certListBytes, CertificateList);
- } catch (err) {
+ } catch (_err) {
// Something was malformed with the CRL, so pass
return false;
}
diff --git a/packages/server/src/helpers/iso/isoCBOR.ts b/packages/server/src/helpers/iso/isoCBOR.ts
index 92113e7..6ab7fdc 100644
--- a/packages/server/src/helpers/iso/isoCBOR.ts
+++ b/packages/server/src/helpers/iso/isoCBOR.ts
@@ -41,6 +41,6 @@ export function decodeFirst<Type>(input: Uint8Array): Type {
/**
* Encode data to CBOR
*/
-export function encode(input: any): Uint8Array {
+export function encode(input: unknown): Uint8Array {
return encoder.encode(input);
}
diff --git a/packages/server/src/helpers/iso/isoCrypto/importKey.ts b/packages/server/src/helpers/iso/isoCrypto/importKey.ts
index 4d2ef2b..be89e55 100644
--- a/packages/server/src/helpers/iso/isoCrypto/importKey.ts
+++ b/packages/server/src/helpers/iso/isoCrypto/importKey.ts
@@ -1,6 +1,6 @@
import WebCrypto from '@simplewebauthn/iso-webcrypto';
-export async function importKey(opts: {
+export function importKey(opts: {
keyData: JsonWebKey;
algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams;
}): Promise<CryptoKey> {
diff --git a/packages/server/src/helpers/iso/isoCrypto/verify.ts b/packages/server/src/helpers/iso/isoCrypto/verify.ts
index d4bfad1..944a7ec 100644
--- a/packages/server/src/helpers/iso/isoCrypto/verify.ts
+++ b/packages/server/src/helpers/iso/isoCrypto/verify.ts
@@ -14,7 +14,7 @@ import { unwrapEC2Signature } from './unwrapEC2Signature.ts';
/**
* Verify signatures with their public key. Supports EC2 and RSA public keys.
*/
-export async function verify(opts: {
+export function verify(opts: {
cosePublicKey: COSEPublicKey;
signature: Uint8Array;
data: Uint8Array;
diff --git a/packages/server/src/helpers/toHash.ts b/packages/server/src/helpers/toHash.ts
index bd5bfea..31845ba 100644
--- a/packages/server/src/helpers/toHash.ts
+++ b/packages/server/src/helpers/toHash.ts
@@ -5,7 +5,7 @@ import { isoUint8Array, isoCrypto } from './iso/index.ts';
* Returns hash digest of the given data, using the given algorithm when provided. Defaults to using
* SHA-256.
*/
-export async function toHash(
+export function toHash(
data: Uint8Array | string,
algorithm: COSEALG = -7,
): Promise<Uint8Array> {
diff --git a/packages/server/src/helpers/verifySignature.ts b/packages/server/src/helpers/verifySignature.ts
index f9a5bc6..752062f 100644
--- a/packages/server/src/helpers/verifySignature.ts
+++ b/packages/server/src/helpers/verifySignature.ts
@@ -6,7 +6,7 @@ import { convertX509PublicKeyToCOSE } from './convertX509PublicKeyToCOSE.ts';
/**
* Verify an authenticator's signature
*/
-export async function verifySignature(opts: {
+export function verifySignature(opts: {
signature: Uint8Array;
data: Uint8Array;
credentialPublicKey?: Uint8Array;
diff --git a/packages/server/src/metadata/verifyJWT.ts b/packages/server/src/metadata/verifyJWT.ts
index 1c78be6..47845c6 100644
--- a/packages/server/src/metadata/verifyJWT.ts
+++ b/packages/server/src/metadata/verifyJWT.ts
@@ -13,7 +13,7 @@ import { verifyRSA } from '../helpers/iso/isoCrypto/verifyRSA.ts';
*
* (Pulled from https://www.rfc-editor.org/rfc/rfc7515#section-4.1.1)
*/
-export async function verifyJWT(jwt: string, leafCert: Uint8Array): Promise<boolean> {
+export function verifyJWT(jwt: string, leafCert: Uint8Array): Promise<boolean> {
const [header, payload, signature] = jwt.split('.');
const certCOSE = convertX509PublicKeyToCOSE(leafCert);
diff --git a/packages/server/src/registration/verifications/tpm/constants.ts b/packages/server/src/registration/verifications/tpm/constants.ts
index 324f013..92e9045 100644
--- a/packages/server/src/registration/verifications/tpm/constants.ts
+++ b/packages/server/src/registration/verifications/tpm/constants.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
+// deno-lint-ignore-file no-dupe-keys
/**
* A whole lotta domain knowledge is captured here, with hazy connections to source
* documents. Good places to start searching for more info on these values are the
diff --git a/packages/server/src/services/metadataService.test.ts b/packages/server/src/services/metadataService.test.ts
index c0add4d..1612de2 100644
--- a/packages/server/src/services/metadataService.test.ts
+++ b/packages/server/src/services/metadataService.test.ts
@@ -58,7 +58,7 @@ describe('Method: getStatement()', () => {
test('should return undefined if aaguid is undefined', async () => {
// TypeScript will prevent you from passing `undefined`, but JS won't so test it
- // @ts-ignore
+ // @ts-ignore 2345
const statement = await MetadataService.getStatement(undefined);
expect(statement).toBeUndefined();
diff --git a/packages/server/src/services/metadataService.ts b/packages/server/src/services/metadataService.ts
index 32b3403..3afbfd7 100644
--- a/packages/server/src/services/metadataService.ts
+++ b/packages/server/src/services/metadataService.ts
@@ -269,9 +269,9 @@ export class BaseMetadataService {
/**
* A helper method to pause execution until the service is ready
*/
- private async pauseUntilReady(): Promise<void> {
+ private pauseUntilReady(): Promise<void> {
if (this.state === SERVICE_STATE.READY) {
- return;
+ return new Promise((resolve) => { resolve(); });
}
// State isn't ready, so set up polling
@@ -281,7 +281,7 @@ export class BaseMetadataService {
let iterations = totalTimeoutMS / intervalMS;
// Check service state every `intervalMS` milliseconds
- const intervalID: NodeJS.Timeout = globalThis.setInterval(() => {
+ const intervalID = globalThis.setInterval(() => {
if (iterations < 1) {
clearInterval(intervalID);
reject(`State did not become ready in ${totalTimeoutMS / 1000} seconds`);
diff --git a/packages/server/src/services/settingsService.test.ts b/packages/server/src/services/settingsService.test.ts
index 42a2904..c66e24a 100644
--- a/packages/server/src/services/settingsService.test.ts
+++ b/packages/server/src/services/settingsService.test.ts
@@ -1,6 +1,3 @@
-import fs from 'fs';
-import path from 'path';
-
import { SettingsService } from './settingsService.ts';
import { GlobalSign_Root_CA } from './defaultRootCerts/android-safetynet.ts';
diff --git a/packages/server/src/setupTests.ts b/packages/server/src/setupTests.ts
index b23ac59..89d9f49 100644
--- a/packages/server/src/setupTests.ts
+++ b/packages/server/src/setupTests.ts
@@ -1,4 +1,3 @@
-import { webcrypto } from 'node:crypto';
// Silence some console output
// jest.spyOn(console, 'log').mockImplementation();
// jest.spyOn(console, 'debug').mockImplementation();