Merge remote-tracking branch 'misskey-dev/develop' into io
This commit is contained in:
まっちゃとーにゅ
commit
f2743a09e2
23 changed files with 1001 additions and 1106 deletions
|
|
@ -35,17 +35,17 @@
|
|||
},
|
||||
"optionalDependencies": {
|
||||
"@swc/core-android-arm64": "1.3.11",
|
||||
"@swc/core-darwin-arm64": "1.5.2",
|
||||
"@swc/core-darwin-x64": "1.5.0",
|
||||
"@swc/core-darwin-arm64": "1.5.5",
|
||||
"@swc/core-darwin-x64": "1.5.5",
|
||||
"@swc/core-freebsd-x64": "1.3.11",
|
||||
"@swc/core-linux-arm-gnueabihf": "1.5.2",
|
||||
"@swc/core-linux-arm64-gnu": "1.5.2",
|
||||
"@swc/core-linux-arm64-musl": "1.5.2",
|
||||
"@swc/core-linux-x64-gnu": "1.5.2",
|
||||
"@swc/core-linux-x64-musl": "1.5.2",
|
||||
"@swc/core-win32-arm64-msvc": "1.5.2",
|
||||
"@swc/core-win32-ia32-msvc": "1.5.2",
|
||||
"@swc/core-win32-x64-msvc": "1.5.2",
|
||||
"@swc/core-linux-arm-gnueabihf": "1.5.5",
|
||||
"@swc/core-linux-arm64-gnu": "1.5.5",
|
||||
"@swc/core-linux-arm64-musl": "1.5.5",
|
||||
"@swc/core-linux-x64-gnu": "1.5.5",
|
||||
"@swc/core-linux-x64-musl": "1.5.5",
|
||||
"@swc/core-win32-arm64-msvc": "1.5.5",
|
||||
"@swc/core-win32-ia32-msvc": "1.5.5",
|
||||
"@swc/core-win32-x64-msvc": "1.5.5",
|
||||
"@tensorflow/tfjs": "4.19.0",
|
||||
"@tensorflow/tfjs-node": "4.19.0",
|
||||
"bufferutil": "4.0.8",
|
||||
|
|
@ -68,9 +68,9 @@
|
|||
"@authenio/samlify-node-xmllint": "2.0.0",
|
||||
"@aws-sdk/client-s3": "3.569.0",
|
||||
"@aws-sdk/lib-storage": "3.569.0",
|
||||
"@bull-board/api": "5.17.0",
|
||||
"@bull-board/fastify": "5.17.0",
|
||||
"@bull-board/ui": "5.17.0",
|
||||
"@bull-board/api": "5.17.1",
|
||||
"@bull-board/fastify": "5.17.1",
|
||||
"@bull-board/ui": "5.17.1",
|
||||
"@discordapp/twemoji": "15.0.3",
|
||||
"@fastify/accepts": "4.3.0",
|
||||
"@fastify/cookie": "9.3.1",
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
"@fastify/formbody": "7.4.0",
|
||||
"@fastify/http-proxy": "9.5.0",
|
||||
"@fastify/multipart": "8.2.0",
|
||||
"@fastify/static": "7.0.3",
|
||||
"@fastify/static": "7.0.4",
|
||||
"@fastify/view": "9.1.0",
|
||||
"@misskey-dev/sharp-read-bmp": "1.2.0",
|
||||
"@misskey-dev/summaly": "5.1.0",
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
"@sinonjs/fake-timers": "11.2.2",
|
||||
"@smithy/node-http-handler": "2.5.0",
|
||||
"@swc/cli": "0.3.12",
|
||||
"@swc/core": "1.4.17",
|
||||
"@swc/core": "1.5.5",
|
||||
"@twemoji/parser": "15.1.1",
|
||||
"accepts": "1.3.8",
|
||||
"ajv": "8.13.0",
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
"content-disposition": "0.5.4",
|
||||
"date-fns": "3.6.0",
|
||||
"deep-email-validator": "0.1.21",
|
||||
"fastify": "4.26.2",
|
||||
"fastify": "4.27.0",
|
||||
"fastify-http-errors-enhanced": "5.0.4",
|
||||
"fastify-raw-body": "4.3.0",
|
||||
"feed": "4.2.2",
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
"fluent-ffmpeg": "2.1.2",
|
||||
"form-data": "4.0.0",
|
||||
"got": "14.2.1",
|
||||
"happy-dom": "14.7.1",
|
||||
"happy-dom": "14.10.1",
|
||||
"hpagent": "1.2.0",
|
||||
"htmlescape": "1.1.1",
|
||||
"http-link-header": "1.1.3",
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
"json5": "2.2.3",
|
||||
"jsonld": "8.3.2",
|
||||
"jsrsasign": "11.1.0",
|
||||
"meilisearch": "0.38.0",
|
||||
"meilisearch": "0.39.0",
|
||||
"mfm-js": "0.24.0",
|
||||
"microformats-parser": "2.0.2",
|
||||
"mime-types": "2.1.35",
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
"oauth2orize": "1.12.0",
|
||||
"oauth2orize-pkce": "0.1.2",
|
||||
"os-utils": "0.0.14",
|
||||
"otpauth": "9.2.3",
|
||||
"otpauth": "9.2.4",
|
||||
"parse5": "7.1.2",
|
||||
"pg": "8.11.5",
|
||||
"pino": "9.0.0",
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
"qrcode": "1.5.3",
|
||||
"random-seed": "0.3.0",
|
||||
"ratelimiter": "3.4.1",
|
||||
"re2": "1.20.10",
|
||||
"re2": "1.20.11",
|
||||
"redis-lock": "0.1.4",
|
||||
"reflect-metadata": "0.2.2",
|
||||
"rename": "1.0.4",
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
"slacc": "0.0.10",
|
||||
"strict-event-emitter-types": "2.0.0",
|
||||
"stringz": "2.1.0",
|
||||
"systeminformation": "5.22.7",
|
||||
"systeminformation": "5.22.8",
|
||||
"tinycolor2": "1.6.0",
|
||||
"tmp": "0.2.3",
|
||||
"tsc-alias": "1.8.8",
|
||||
|
|
@ -213,13 +213,13 @@
|
|||
"@types/jsrsasign": "10.5.14",
|
||||
"@types/mime-types": "2.1.4",
|
||||
"@types/ms": "0.7.34",
|
||||
"@types/node": "20.12.8",
|
||||
"@types/node": "20.12.11",
|
||||
"@types/node-forge": "1.3.11",
|
||||
"@types/nodemailer": "6.4.15",
|
||||
"@types/oauth": "0.9.4",
|
||||
"@types/oauth2orize": "1.11.5",
|
||||
"@types/oauth2orize-pkce": "0.1.2",
|
||||
"@types/pg": "8.11.5",
|
||||
"@types/pg": "8.11.6",
|
||||
"@types/pug": "2.0.10",
|
||||
"@types/punycode": "2.1.4",
|
||||
"@types/qrcode": "1.5.5",
|
||||
|
|
|
|||
|
|
@ -96,9 +96,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
|||
}
|
||||
|
||||
const keyInfo = await this.webAuthnService.verifyRegistration(me.id, ps.credential);
|
||||
const keyId = keyInfo.credentialID;
|
||||
|
||||
await this.userSecurityKeysRepository.insert({
|
||||
id: keyInfo.credentialID,
|
||||
id: keyId,
|
||||
userId: me.id,
|
||||
name: ps.name,
|
||||
publicKey: Buffer.from(keyInfo.credentialPublicKey).toString('base64url'),
|
||||
|
|
@ -115,7 +116,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
|||
}));
|
||||
|
||||
return {
|
||||
id: keyInfo.credentialID,
|
||||
id: keyId,
|
||||
name: ps.name,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -199,6 +199,11 @@ export class ClientServerService {
|
|||
|
||||
// Authenticate
|
||||
fastify.addHook('onRequest', async (request, reply) => {
|
||||
if (request.routeOptions.url == null) {
|
||||
reply.code(404).send('Not found');
|
||||
return;
|
||||
}
|
||||
|
||||
// %71ueueとかでリクエストされたら困るため
|
||||
const url = decodeURI(request.routeOptions.url ?? '');
|
||||
if (url === bullBoardPath || url.startsWith(bullBoardPath + '/')) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue