usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Acctのパースを既存のパーサーでするように修正

This commit is contained in:
momoirodouhu 2024-11-06 15:06:46 +00:00
parent b5b59c61fa
commit 4ca5715945
No known key found for this signature in database
GPG Key ID: 6D6069FB91D619C0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/backend/src/server/ActivityPubServerService.ts
View File

@ -29,6 +29,7 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { IActivity } from '@/core/activitypub/type.js'; import { IActivity } from '@/core/activitypub/type.js';
import { isQuote, isRenote } from '@/misc/is-renote.js'; import { isQuote, isRenote } from '@/misc/is-renote.js';
import * as Acct from '@/misc/acct.js';
import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify'; import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify';
import type { FindOptionsWhere } from 'typeorm'; import type { FindOptionsWhere } from 'typeorm';
@ -673,18 +674,11 @@ export class ActivityPubServerService {
fastify.get<{ Params: { acct: string; } }>('/@:acct', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => { fastify.get<{ Params: { acct: string; } }>('/@:acct', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
vary(reply.raw, 'Accept'); vary(reply.raw, 'Accept');
const spritedAcct = request.params.acct.toLowerCase().split('@'); const acct = Acct.parse(request.params.acct)
//@foo@bar@baz なんてないはず
if (spritedAcct.length > 2) {
reply.code(400);
}
console.log(spritedAcct);
const user = await this.usersRepository.findOneBy({ const user = await this.usersRepository.findOneBy({
usernameLower: spritedAcct[0], usernameLower: acct.username,
host: spritedAcct[1] ?? IsNull(), host: acct.host ?? IsNull(),
isSuspended: false, isSuspended: false,
}); });