From 58e9a8893bde254cd59bc51c9fb5f832a5ca36a8 Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 20 Sep 2023 05:52:16 +0800 Subject: [PATCH] webauthn@8 --- packages/eslint-config/package.json | 4 ++-- packages/hydrojudge/package.json | 4 ++-- packages/hydrooj/package.json | 8 ++++---- packages/hydrooj/src/handler/home.ts | 2 +- packages/hydrooj/src/handler/user.ts | 2 +- packages/hydrooj/src/interface.ts | 4 ++-- packages/migrate/package.json | 2 +- packages/ui-default/package.json | 6 +++--- packages/utils/package.json | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index fff0338a..00a6843b 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -4,8 +4,8 @@ "license": "MIT", "main": "react.yaml", "dependencies": { - "@typescript-eslint/eslint-plugin": "^6.7.0", - "@typescript-eslint/parser": "^6.7.0", + "@typescript-eslint/eslint-plugin": "^6.7.2", + "@typescript-eslint/parser": "^6.7.2", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-plugin-import": "2.28.1", diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index bcb43f0f..a9adcc80 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -10,10 +10,10 @@ "cac": "^6.7.14", "mongodb": "^5.9.0", "p-queue": "^7.4.1", - "schemastery": "^3.12.0", + "schemastery": "^3.13.0", "shell-quote": "^1.8.1", "superagent": "^8.1.2", - "ws": "^8.14.1" + "ws": "^8.14.2" }, "preferUnplugged": true, "license": "AGPL-3.0-or-later", diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 0555487e..6bdd952f 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -27,7 +27,7 @@ "emoji-regex": "^10.2.1", "emojis-list": "2.1.0", "fs-extra": "^11.1.1", - "graphql": "^16.8.0", + "graphql": "^16.8.1", "graphql-scalars": "^1.22.2", "js-yaml": "^4.1.0", "koa": "^2.14.2", @@ -41,20 +41,20 @@ "mime-types": "^2.1.35", "moment-timezone": "^0.5.43", "mongodb": "^5.9.0", - "nanoid": "^4.0.2", + "nanoid": "^5.0.1", "nodemailer": "^6.9.5", "notp": "^2.0.3", "p-queue": "^7.4.1", "path-to-regexp": "^6.2.1", "require-resolve-hook": "^1.1.0", "saslprep": "^1.0.3", - "schemastery": "^3.12.0", + "schemastery": "^3.13.0", "semver": "^7.5.4", "serialize-javascript": "^6.0.1", "superagent": "^8.1.2", "tar": "^6.2.0", "thirty-two": "^1.0.2", - "ws": "^8.14.1" + "ws": "^8.14.2" }, "devDependencies": { "@types/adm-zip": "^0.4.34", diff --git a/packages/hydrooj/src/handler/home.ts b/packages/hydrooj/src/handler/home.ts index 1ba97063..10b5d5ad 100644 --- a/packages/hydrooj/src/handler/home.ts +++ b/packages/hydrooj/src/handler/home.ts @@ -283,7 +283,7 @@ class HomeSecurityHandler extends Handler { @requireSudo @param('type', Types.Range(['cross-platform', 'platform'])) async postRegister(domainId: string, type: 'cross-platform' | 'platform') { - const options = generateRegistrationOptions({ + const options = await generateRegistrationOptions({ rpName: system.get('server.name'), rpID: this.request.hostname, userID: this.user._id.toString(), diff --git a/packages/hydrooj/src/handler/user.ts b/packages/hydrooj/src/handler/user.ts index 8ce4b64d..2cd18f6a 100644 --- a/packages/hydrooj/src/handler/user.ts +++ b/packages/hydrooj/src/handler/user.ts @@ -172,7 +172,7 @@ class UserWebauthnHandler extends Handler { const udoc = this.user._id ? this.user : ((await user.getByEmail(domainId, uname)) || await user.getByUname(domainId, uname)); if (!udoc._id) throw new UserNotFoundError(uname || 'user'); if (!udoc.authn) throw new AuthOperationError('authn', 'disabled'); - const options = generateAuthenticationOptions({ + const options = await generateAuthenticationOptions({ allowCredentials: udoc._authenticators.map((authenticator) => ({ id: authenticator.credentialID.buffer, type: 'public-key', diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts index 9d0f77c6..fb57e407 100644 --- a/packages/hydrooj/src/interface.ts +++ b/packages/hydrooj/src/interface.ts @@ -1,5 +1,5 @@ -import { AttestationFormat } from '@simplewebauthn/server/dist/helpers/decodeAttestationObject'; -import { AuthenticationExtensionsAuthenticatorOutputs } from '@simplewebauthn/server/dist/helpers/decodeAuthenticatorExtensions'; +import { AttestationFormat } from '@simplewebauthn/server/script/helpers/decodeAttestationObject'; +import { AuthenticationExtensionsAuthenticatorOutputs } from '@simplewebauthn/server/script/helpers/decodeAuthenticatorExtensions'; import { CredentialDeviceType } from '@simplewebauthn/typescript-types'; import type fs from 'fs'; import type { Dictionary, NumericDictionary } from 'lodash'; diff --git a/packages/migrate/package.json b/packages/migrate/package.json index 78b3ba60..ba657491 100644 --- a/packages/migrate/package.json +++ b/packages/migrate/package.json @@ -6,7 +6,7 @@ "author": "undefined ", "license": "AGPL-3.0-or-later", "dependencies": { - "mariadb": "^3.2.0", + "mariadb": "^3.2.1", "mongodb": "^5.9.0", "turndown": "^7.1.2", "xml2js": "^0.6.2" diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index d23a44dd..11a63a2b 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -33,7 +33,7 @@ "@types/markdown-it": "^13.0.1", "@types/pickadate": "^3.5.32", "@types/qrcode": "^1.5.2", - "@types/react": "^18.2.21", + "@types/react": "^18.2.22", "@types/react-dom": "^18.2.7", "@types/redux-logger": "^3.0.9", "@types/serviceworker": "^0.0.73", @@ -71,7 +71,7 @@ "monaco-editor-nls": "^3.0.0", "monaco-themes": "^0.4.4", "monaco-yaml": "^4.0.4", - "nanoid": "^4.0.2", + "nanoid": "^5.0.1", "normalize.css": "^8.0.1", "nprogress": "^0.2.0", "p-queue": "^7.4.1", @@ -95,7 +95,7 @@ "redux-promise-middleware": "^6.1.3", "redux-thunk": "^2.4.2", "rupture": "^0.7.1", - "schemastery": "^3.12.0", + "schemastery": "^3.13.0", "slideout": "^1.0.1", "sticky-kit": "^1.1.3", "tether": "1.4.7", diff --git a/packages/utils/package.json b/packages/utils/package.json index 65d44ace..5892a664 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -17,7 +17,7 @@ "reggol": "^1.5.1", "search-query-parser": "^1.6.0", "source-map-support": "^0.5.21", - "systeminformation": "^5.21.5" + "systeminformation": "^5.21.7" }, "devDependencies": { "@types/fs-extra": "^11.0.2",