diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 02:00:54 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 02:00:54 +0900 |
| commit | d3edf0312572d765c379580766d8153e6fb7f9c4 (patch) | |
| tree | b76389c004b8add34a770a4d5f9d4ca73aa87fe7 /src/server | |
| parent | Create partial type definition for 'jsrsasign' (#5092) (diff) | |
| download | misskey-d3edf0312572d765c379580766d8153e6fb7f9c4.tar.gz misskey-d3edf0312572d765c379580766d8153e6fb7f9c4.tar.bz2 misskey-d3edf0312572d765c379580766d8153e6fb7f9c4.zip | |
Fix errors
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/2fa.ts | 8 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/2fa/key-done.ts | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/api/2fa.ts b/src/server/api/2fa.ts index bc5f6e6d7d..3bc4627a62 100644 --- a/src/server/api/2fa.ts +++ b/src/server/api/2fa.ts @@ -63,15 +63,15 @@ function verifyCertificateChain(certificates: string[]) { const CACert = i + 1 >= certificates.length ? Cert : certificates[i + 1]; - const certStruct = jsrsasign.ASN1HEX.getTLVbyList(certificate.hex, 0, [0]); + const certStruct = jsrsasign.ASN1HEX.getTLVbyList(certificate.hex!, 0, [0]); const algorithm = certificate.getSignatureAlgorithmField(); const signatureHex = certificate.getSignatureValueHex(); // Verify against CA - const Signature = new jsrsasign.crypto.Signature({alg: algorithm}); + const Signature = new jsrsasign.KJUR.crypto.Signature({alg: algorithm}); Signature.init(CACert); Signature.updateHex(certStruct); - valid = valid && Signature.verify(signatureHex); // true if CA signed the certificate + valid = valid && !!Signature.verify(signatureHex); // true if CA signed the certificate } return valid; @@ -260,7 +260,7 @@ export const procedures = { } const certificateChain = header.x5c - .map(key => PEMString(key)) + .map((key: any) => PEMString(key)) .concat([GSR2]); if (getCertSubject(certificateChain[0]).CN != 'attest.android.com') { diff --git a/src/server/api/endpoints/i/2fa/key-done.ts b/src/server/api/endpoints/i/2fa/key-done.ts index 074ab22bf0..d751dabc41 100644 --- a/src/server/api/endpoints/i/2fa/key-done.ts +++ b/src/server/api/endpoints/i/2fa/key-done.ts @@ -14,7 +14,7 @@ import config from '../../../../../config'; import { procedures, hash } from '../../../2fa'; import { publishMainStream } from '../../../../../services/stream'; -const cborDecodeFirst = promisify(cbor.decodeFirst); +const cborDecodeFirst = promisify(cbor.decodeFirst) as any; export const meta = { requireCredential: true, @@ -90,11 +90,11 @@ export default define(meta, async (ps, user) => { throw new Error('alg mismatch'); } - if (!procedures[attestation.fmt]) { + if (!(procedures as any)[attestation.fmt]) { throw new Error('unsupported fmt'); } - const verificationData = procedures[attestation.fmt].verify({ + const verificationData = (procedures as any)[attestation.fmt].verify({ attStmt: attestation.attStmt, authenticatorData: authData, clientDataHash: clientDataJSONHash, |