puniko/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'backend: increase requestId max size for GNU Social' (#147) from fix/gnusocial-follow-request-ids into main

Browse source 
Reviewed-on: FoundKeyGang/FoundKey#147
Fixes: #146
Changelog: Fixed
This commit is contained in:
Norm 2022-09-12 17:48:37 +00:00
commit 193674ce03
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/migration/1662943835603-larger-follow-request-ids.js Normal file
View file

@ -0,0 +1,12 @@
export class largerFollowRequestIds1662943835603 {
name = 'largerFollowRequestIds1662943835603';
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "follow_request" ALTER COLUMN "requestId" TYPE VARCHAR(2048)`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "follow_request" ALTER COLUMN "requestId" TYPE VARCHAR(128)`);
}
}

2
packages/backend/src/models/entities/follow-request.ts
View file

@ -40,7 +40,7 @@ export class FollowRequest {
public follower: User | null;
@Column('varchar', {
length: 128, nullable: true,
length: 2048, nullable: true,
comment: 'id of Follow Activity.',
})
public requestId: string | null;

7
packages/backend/src/queue/processors/inbox.ts
View file

@ -127,13 +127,18 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
}
}
// activity.idがあればホストが署名者のホストであることを確認する
if (typeof activity.id === 'string') {
// Verify that activity and actor are from the same host.
const signerHost = extractDbHost(authUser.user.uri!);
const activityIdHost = extractDbHost(activity.id);
if (signerHost !== activityIdHost) {
return `skip: signerHost(${signerHost}) !== activity.id host(${activityIdHost}`;
}
// Verify that the id has a sane length
if (activity.id.length > 2048) {
return `skip: overly long id from ${signerHost}`;
}
}
// Update stats