mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-03-21 11:40:49 +00:00
* enhance: Add a few validation fixes from Sharkey See the original MR on the GitLab instance: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/484 Co-Authored-By: Dakkar <dakkar@thenautilus.net> * fix: primitive 2: acceptance of cross-origin alternate Co-Authored-By: Laura Hausmann <laura@hausmann.dev> * fix: primitive 3: validation of non-final url * fix: primitive 4: missing same-origin identifier validation of collection-wrapped activities * fix: primitives 5 & 8: reject activities with non string identifiers Co-Authored-By: Laura Hausmann <laura@hausmann.dev> * fix: primitive 6: reject anonymous objects that were fetched by their id * fix: primitives 9, 10 & 11: http signature validation doesn't enforce required headers or specify auth header name Co-Authored-By: Laura Hausmann <laura@hausmann.dev> * fix: primitive 14: improper validation of outbox, followers, following & shared inbox collections * fix: code style for primitive 14 * fix: primitive 15: improper same-origin validation for note uri and url Co-Authored-By: Laura Hausmann <laura@hausmann.dev> * fix: primitive 16: improper same-origin validation for user uri and url * fix: primitive 17: note same-origin identifier validation can be bypassed by wrapping the id in an array * fix: code style for primitive 17 * fix: check attribution against actor in notes While this isn't strictly required to fix the exploits at hand, this mirrors the fix in `ApQuestionService` for GHSA-5h8r-gq97-xv69, as a preemptive countermeasure. * fix: primitive 18: `ap/get` bypasses access checks One might argue that we could make this one actually preform access checks against the returned activity object, but I feel like that's a lot more work than just restricting it to administrators, since, to me at least, it seems more like a debugging tool than anything else. * fix: primitive 19 & 20: respect blocks and hide more Ideally, the user property should also be hidden (as leaving it in leaks information slightly), but given the schema of the note endpoint, I don't think that would be possible without introducing some kind of "ghost" user, who is attributed for posts by users who have you blocked. * fix: primitives 21, 22, and 23: reuse resolver This also increases the default `recursionLimit` for `Resolver`, as it theoretically will go higher that it previously would and could possibly fail on non-malicious collection activities. * fix: primitives 25-33: proper local instance checks * revert: fix: primitive 19 & 20 This reverts commit 465a9fe6591de90f78bd3d084e3c01e65dc3cf3c. --------- Co-authored-by: Dakkar <dakkar@thenautilus.net> Co-authored-by: Laura Hausmann <laura@hausmann.dev> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
159 lines
5.2 KiB
TypeScript
159 lines
5.2 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { URL } from 'node:url';
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import chalk from 'chalk';
|
|
import { IsNull } from 'typeorm';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { UsersRepository } from '@/models/_.js';
|
|
import type { MiLocalUser, MiRemoteUser } from '@/models/User.js';
|
|
import type { Config } from '@/config.js';
|
|
import type Logger from '@/logger.js';
|
|
import { UtilityService } from '@/core/UtilityService.js';
|
|
import { ILink, WebfingerService } from '@/core/WebfingerService.js';
|
|
import { RemoteLoggerService } from '@/core/RemoteLoggerService.js';
|
|
import { ApDbResolverService } from '@/core/activitypub/ApDbResolverService.js';
|
|
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
|
|
@Injectable()
|
|
export class RemoteUserResolveService {
|
|
private logger: Logger;
|
|
|
|
constructor(
|
|
@Inject(DI.config)
|
|
private config: Config,
|
|
|
|
@Inject(DI.usersRepository)
|
|
private usersRepository: UsersRepository,
|
|
|
|
private utilityService: UtilityService,
|
|
private webfingerService: WebfingerService,
|
|
private remoteLoggerService: RemoteLoggerService,
|
|
private apDbResolverService: ApDbResolverService,
|
|
private apPersonService: ApPersonService,
|
|
) {
|
|
this.logger = this.remoteLoggerService.logger.createSubLogger('resolve-user');
|
|
}
|
|
|
|
@bindThis
|
|
public async resolveUser(username: string, host: string | null): Promise<MiLocalUser | MiRemoteUser> {
|
|
const usernameLower = username.toLowerCase();
|
|
|
|
if (host == null) {
|
|
this.logger.info(`return local user: ${usernameLower}`);
|
|
return await this.usersRepository.findOneBy({ usernameLower, host: IsNull() }).then(u => {
|
|
if (u == null) {
|
|
throw new Error('user not found');
|
|
} else {
|
|
return u;
|
|
}
|
|
}) as MiLocalUser;
|
|
}
|
|
|
|
host = this.utilityService.punyHost(host);
|
|
|
|
if (host === this.utilityService.toPuny(this.config.host)) {
|
|
this.logger.info(`return local user: ${usernameLower}`);
|
|
return await this.usersRepository.findOneBy({ usernameLower, host: IsNull() }).then(u => {
|
|
if (u == null) {
|
|
throw new Error('user not found');
|
|
} else {
|
|
return u;
|
|
}
|
|
}) as MiLocalUser;
|
|
}
|
|
|
|
const user = await this.usersRepository.findOneBy({ usernameLower, host }) as MiRemoteUser | null;
|
|
|
|
const acctLower = `${usernameLower}@${host}`;
|
|
|
|
if (user == null) {
|
|
const self = await this.resolveSelf(acctLower);
|
|
|
|
if (self.href.startsWith(this.config.url)) {
|
|
const local = this.apDbResolverService.parseUri(self.href);
|
|
if (local.local && local.type === 'users') {
|
|
// the LR points to local
|
|
return (await this.apDbResolverService
|
|
.getUserFromApId(self.href)
|
|
.then((u) => {
|
|
if (u == null) {
|
|
throw new Error('local user not found');
|
|
} else {
|
|
return u;
|
|
}
|
|
})) as MiLocalUser;
|
|
}
|
|
}
|
|
|
|
this.logger.succ(`return new remote user: ${chalk.magenta(acctLower)}`);
|
|
return await this.apPersonService.createPerson(self.href);
|
|
}
|
|
|
|
// ユーザー情報が古い場合は、WebFingerからやりなおして返す
|
|
if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
|
|
// 繋がらないインスタンスに何回も試行するのを防ぐ, 後続の同様処理の連続試行を防ぐ ため 試行前にも更新する
|
|
await this.usersRepository.update(user.id, {
|
|
lastFetchedAt: new Date(),
|
|
});
|
|
|
|
this.logger.info(`try resync: ${acctLower}`);
|
|
const self = await this.resolveSelf(acctLower);
|
|
|
|
if (user.uri !== self.href) {
|
|
// if uri mismatch, Fix (user@host <=> AP's Person id(RemoteUser.uri)) mapping.
|
|
this.logger.info(`uri missmatch: ${acctLower}`);
|
|
this.logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${user.uri} to ${self.href}`);
|
|
|
|
// validate uri
|
|
const uri = new URL(self.href);
|
|
if (uri.hostname !== host) {
|
|
throw new Error('Invalid uri');
|
|
}
|
|
|
|
await this.usersRepository.update({
|
|
usernameLower,
|
|
host: host,
|
|
}, {
|
|
uri: self.href,
|
|
});
|
|
} else {
|
|
this.logger.info(`uri is fine: ${acctLower}`);
|
|
}
|
|
|
|
await this.apPersonService.updatePerson(self.href);
|
|
|
|
this.logger.info(`return resynced remote user: ${acctLower}`);
|
|
return await this.usersRepository.findOneBy({ uri: self.href }).then(u => {
|
|
if (u == null) {
|
|
throw new Error('user not found');
|
|
} else {
|
|
return u as MiLocalUser | MiRemoteUser;
|
|
}
|
|
});
|
|
}
|
|
|
|
this.logger.info(`return existing remote user: ${acctLower}`);
|
|
return user;
|
|
}
|
|
|
|
@bindThis
|
|
private async resolveSelf(acctLower: string): Promise<ILink> {
|
|
this.logger.info(`WebFinger for ${chalk.yellow(acctLower)}`);
|
|
const finger = await this.webfingerService.webfinger(acctLower).catch(err => {
|
|
this.logger.error(`Failed to WebFinger for ${chalk.yellow(acctLower)}: ${ err.statusCode ?? err.message }`);
|
|
throw new Error(`Failed to WebFinger for ${acctLower}: ${ err.statusCode ?? err.message }`);
|
|
});
|
|
const self = finger.links.find(link => link.rel != null && link.rel.toLowerCase() === 'self');
|
|
if (!self) {
|
|
this.logger.error(`Failed to WebFinger for ${chalk.yellow(acctLower)}: self link not found`);
|
|
throw new Error('self link not found');
|
|
}
|
|
return self;
|
|
}
|
|
}
|