From d8a240185dd199706b071716deb552933127556f Mon Sep 17 00:00:00 2001 From: Bsian Date: Tue, 28 Jul 2020 19:05:53 +0100 Subject: [PATCH] Updates --- package.json | 6 +-- src/commands/cwg_data.ts | 2 +- types/x509.d.ts | 108 +++++++++++++++++++-------------------- yarn.lock | 29 +++++------ 4 files changed, 72 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 5a875c5..f6707f3 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "license": "AGPL-3.0-only", "private": false, "dependencies": { - "@ghaiklor/x509": "^1.0.0", "axios": "^0.19.0", "body-parser": "^1.19.0", "eris": "bsian03/eris#dev", @@ -22,12 +21,13 @@ "helmet": "^3.21.2", "ioredis": "^4.14.1", "jsonwebtoken": "^8.5.1", - "moment": "^2.24.0", + "moment": "^2.27.0", "moment-precise-range-plugin": "^1.3.0", "mongoose": "^5.7.4", "nodemailer": "^6.3.1", "signale": "^1.4.0", - "uuid": "^3.3.3" + "uuid": "^3.3.3", + "x509": "bsian03/node-x509" }, "devDependencies": { "@types/express": "^4.17.6", diff --git a/src/commands/cwg_data.ts b/src/commands/cwg_data.ts index d3f8a8a..ab3a514 100644 --- a/src/commands/cwg_data.ts +++ b/src/commands/cwg_data.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import moment from 'moment'; -import x509 from '@ghaiklor/x509'; +import x509 from 'x509'; import { createPaginationEmbed } from 'eris-pagination'; import { Message } from 'eris'; import { Client, Command, RichEmbed } from '../class'; diff --git a/types/x509.d.ts b/types/x509.d.ts index ff2211b..3327af0 100644 --- a/types/x509.d.ts +++ b/types/x509.d.ts @@ -1,54 +1,54 @@ -declare module '@ghaiklor/x509' { - namespace Certificate { - interface Issuer { - countryName: string, - stateOrProvinceName: string, - localityName: string, - organizationName: string, - organizationalUnitName: string, - commonName: string, - emailAddress: string - } - interface Subject { - countryName: string, - postalCode: string, - stateOrProvinceName: string, - localityName: string, - streetAddress: string, - organizationName: string, - organizationalUnitName: string, - commonName: string, - emailAddress: string - } - interface Extensions { - keyUsage: string, - authorityInformationAccess: string, - certificatePolicies: string, - basicConstraints: string, - cRLDistributionPoints: string, - subjectAlternativeName: string, - extendedKeyUsage: string, - authorityKeyIdentifier: string, - subjectKeyIdentifier: string, - cTPrecertificateSCTs: string - } - } - interface FullCertificate { - version: number, - subject: Certificate.Subject, - issuer: Certificate.Issuer, - fingerPrint: string, - serial: string, - notBefore: Date, - notAfter: Date, - subjectHash: string, - signatureAlgorithm: string, - publicKey: { algorithm: string }; - altNames: string[] - extensions: Certificate.Extensions - } - function getAltNames(cert: string): string[]; - function getIssuer(cert: string): Certificate.Issuer; - function getSubject(cert: string): Certificate.Subject; - function parseCert(cert: string): FullCertificate -} +declare module 'x509' { + namespace Certificate { + interface Issuer { + countryName: string, + stateOrProvinceName: string, + localityName: string, + organizationName: string, + organizationalUnitName: string, + commonName: string, + emailAddress: string + } + interface Subject { + countryName: string, + postalCode: string, + stateOrProvinceName: string, + localityName: string, + streetAddress: string, + organizationName: string, + organizationalUnitName: string, + commonName: string, + emailAddress: string + } + interface Extensions { + keyUsage: string, + authorityInformationAccess: string, + certificatePolicies: string, + basicConstraints: string, + cRLDistributionPoints: string, + subjectAlternativeName: string, + extendedKeyUsage: string, + authorityKeyIdentifier: string, + subjectKeyIdentifier: string, + cTPrecertificateSCTs: string + } + } + interface FullCertificate { + version: number, + subject: Certificate.Subject, + issuer: Certificate.Issuer, + fingerPrint: string, + serial: string, + notBefore: Date, + notAfter: Date, + subjectHash: string, + signatureAlgorithm: string, + publicKey: { algorithm: string }; + altNames: string[] + extensions: Certificate.Extensions + } + function getAltNames(cert: string): string[]; + function getIssuer(cert: string): Certificate.Issuer; + function getSubject(cert: string): Certificate.Subject; + function parseCert(cert: string): FullCertificate +} diff --git a/yarn.lock b/yarn.lock index 7024be9..04b587c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,13 +28,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.3.tgz#7e71d892b0d6e7d04a1af4c3c79d72c1f10f5315" integrity sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA== -"@ghaiklor/x509@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@ghaiklor/x509/-/x509-1.0.0.tgz#d35a9136d13827ddf29a30bcfd9e7fa2f54cda9b" - integrity sha512-IZYf5TrQ/nNxNnvEr5U+XpRXIyNbzek6ZcVIiT8oX9+fUIkuL2qtbodEgva7vUjUhj02a1KkKQwYddgayJnh3g== - dependencies: - nan "2.14.0" - "@types/body-parser@*": version "1.19.0" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" @@ -1896,10 +1889,10 @@ moment-precise-range-plugin@^1.3.0: resolved "https://registry.yarnpkg.com/moment-precise-range-plugin/-/moment-precise-range-plugin-1.3.0.tgz#60ac075fdfd14689f6d102af751d171a80b4ab60" integrity sha1-YKwHX9/RRon20QKvdR0XGoC0q2A= -moment@^2.24.0: - version "2.25.3" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.25.3.tgz#252ff41319cf41e47761a1a88cab30edfe9808c0" - integrity sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg== +moment@^2.27.0: + version "2.27.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" + integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== mongodb@3.5.7: version "3.5.7" @@ -1972,10 +1965,10 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== +nan@2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" + integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== natural-compare@^1.4.0: version "1.4.0" @@ -2985,3 +2978,9 @@ x-xss-protection@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.3.0.tgz#3e3a8dd638da80421b0e9fff11a2dbe168f6d52c" integrity sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg== + +x509@bsian03/node-x509: + version "0.3.4" + resolved "https://codeload.github.com/bsian03/node-x509/tar.gz/cc32d7f590ec43cb856effbb4202921f3fa9aef3" + dependencies: + nan "2.14.1"