2 files changed, 0 insertions, 246 deletions
diff --git a/src/queue/processors/http/deliver.ts b/src/queue/processors/http/deliver.ts
deleted file mode 100644
index 96f6cc07ce..0000000000
--- a/src/queue/processors/http/deliver.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as bq from 'bee-queue';
-
-import request from '../../../remote/activitypub/request';
-import { queueLogger } from '../../logger';
-import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc';
-import Instance from '../../../models/instance';
-import instanceChart from '../../../services/chart/instance';
-
-let latest: string = null;
-
-export default async (job: bq.Job, done: any): Promise<void> => {
-	const { host } = new URL(job.data.to);
-
-	try {
-		if (latest !== (latest = JSON.stringify(job.data.content, null, 2)))
-			queueLogger.debug(`delivering ${latest}`);
-
-		await request(job.data.user, job.data.to, job.data.content);
-
-		// Update stats
-		registerOrFetchInstanceDoc(host).then(i => {
-			Instance.update({ _id: i._id }, {
-				$set: {
-					latestRequestSentAt: new Date(),
-					latestStatus: 200,
-					lastCommunicatedAt: new Date(),
-					isNotResponding: false
-				}
-			});
-
-			instanceChart.requestSent(i.host, true);
-		});
-
-		done();
-	} catch (res) {
-		// Update stats
-		registerOrFetchInstanceDoc(host).then(i => {
-			Instance.update({ _id: i._id }, {
-				$set: {
-					latestRequestSentAt: new Date(),
-					latestStatus: res != null && res.hasOwnProperty('statusCode') ? res.statusCode : null,
-					isNotResponding: true
-				}
-			});
-
-			instanceChart.requestSent(i.host, false);
-		});
-
-		if (res != null && res.hasOwnProperty('statusCode')) {
-			queueLogger.warn(`deliver failed: ${res.statusCode} ${res.statusMessage} to=${job.data.to}`);
-
-			if (res.statusCode >= 400 && res.statusCode < 500) {
-				// HTTPステータスコード4xxはクライアントエラーであり、それはつまり
-				// 何回再送しても成功することはないということなのでエラーにはしないでおく
-				done();
-			} else {
-				done(res.statusMessage);
-			}
-		} else {
-			queueLogger.warn(`deliver failed: ${res} to=${job.data.to}`);
-			done();
-		}
-	}
-};
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
deleted file mode 100644
index cc4e711d00..0000000000
--- a/src/queue/processors/http/process-inbox.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-import * as bq from 'bee-queue';
-import * as httpSignature from 'http-signature';
-import parseAcct from '../../../misc/acct/parse';
-import User, { IRemoteUser } from '../../../models/user';
-import perform from '../../../remote/activitypub/perform';
-import { resolvePerson, updatePerson } from '../../../remote/activitypub/models/person';
-import { toUnicode } from 'punycode';
-import { URL } from 'url';
-import { publishApLogStream } from '../../../services/stream';
-import Logger from '../../../services/logger';
-import { registerOrFetchInstanceDoc } from '../../../services/register-or-fetch-instance-doc';
-import Instance from '../../../models/instance';
-import instanceChart from '../../../services/chart/instance';
-
-const logger = new Logger('inbox');
-
-// ユーザーのinboxにアクティビティが届いた時の処理
-export default async (job: bq.Job, done: any): Promise<void> => {
-	const signature = job.data.signature;
-	const activity = job.data.activity;
-
-	//#region Log
-	const info = Object.assign({}, activity);
-	delete info['@context'];
-	delete info['signature'];
-	logger.debug(JSON.stringify(info, null, 2));
-	//#endregion
-
-	const keyIdLower = signature.keyId.toLowerCase();
-	let user: IRemoteUser;
-
-	if (keyIdLower.startsWith('acct:')) {
-		const { username, host } = parseAcct(keyIdLower.slice('acct:'.length));
-		if (host === null) {
-			logger.warn(`request was made by local user: @${username}`);
-			done();
-			return;
-		}
-
-		// アクティビティ内のホストの検証
-		try {
-			ValidateActivity(activity, host);
-		} catch (e) {
-			logger.warn(e.message);
-			done();
-			return;
-		}
-
-		// ブロックしてたら中断
-		// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
-		const instance = await Instance.findOne({ host: host.toLowerCase() });
-		if (instance && instance.isBlocked) {
-			logger.warn(`Blocked request: ${host}`);
-			done();
-			return;
-		}
-
-		user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
-	} else {
-		// アクティビティ内のホストの検証
-		const host = toUnicode(new URL(signature.keyId).hostname.toLowerCase());
-		try {
-			ValidateActivity(activity, host);
-		} catch (e) {
-			logger.warn(e.message);
-			done();
-			return;
-		}
-
-		// ブロックしてたら中断
-		// TODO: いちいちデータベースにアクセスするのはコスト高そうなのでどっかにキャッシュしておく
-		const instance = await Instance.findOne({ host: host.toLowerCase() });
-		if (instance && instance.isBlocked) {
-			logger.warn(`Blocked request: ${host}`);
-			done();
-			return;
-		}
-
-		user = await User.findOne({
-			host: { $ne: null },
-			'publicKey.id': signature.keyId
-		}) as IRemoteUser;
-	}
-
-	// Update Person activityの場合は、ここで署名検証/更新処理まで実施して終了
-	if (activity.type === 'Update') {
-		if (activity.object && activity.object.type === 'Person') {
-			if (user == null) {
-				logger.warn('Update activity received, but user not registed.');
-			} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
-				logger.warn('Update activity received, but signature verification failed.');
-			} else {
-				updatePerson(activity.actor, null, activity.object);
-			}
-			done();
-			return;
-		}
-	}
-
-	// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
-	if (user === null) {
-		user = await resolvePerson(activity.actor) as IRemoteUser;
-	}
-
-	if (user === null) {
-		done(new Error('failed to resolve user'));
-		return;
-	}
-
-	if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
-		logger.error('signature verification failed');
-		done();
-		return;
-	}
-
-	//#region Log
-	publishApLogStream({
-		direction: 'in',
-		activity: activity.type,
-		host: user.host,
-		actor: user.username
-	});
-	//#endregion
-
-	// Update stats
-	registerOrFetchInstanceDoc(user.host).then(i => {
-		Instance.update({ _id: i._id }, {
-			$set: {
-				latestRequestReceivedAt: new Date(),
-				lastCommunicatedAt: new Date(),
-				isNotResponding: false
-			}
-		});
-
-		instanceChart.requestReceived(i.host);
-	});
-
-	// アクティビティを処理
-	try {
-		await perform(user, activity);
-		done();
-	} catch (e) {
-		done(e);
-	}
-};
-
-/**
- * Validate host in activity
- * @param activity Activity
- * @param host Expect host
- */
-function ValidateActivity(activity: any, host: string) {
-	// id (if exists)
-	if (typeof activity.id === 'string') {
-		const uriHost = toUnicode(new URL(activity.id).hostname.toLowerCase());
-		if (host !== uriHost) {
-			const diag = activity.signature ? '. Has LD-Signature. Forwarded?' : '';
-			throw new Error(`activity.id(${activity.id}) has different host(${host})${diag}`);
-		}
-	}
-
-	// actor (if exists)
-	if (typeof activity.actor === 'string') {
-		const uriHost = toUnicode(new URL(activity.actor).hostname.toLowerCase());
-		if (host !== uriHost) throw new Error('activity.actor has different host');
-	}
-
-	// For Create activity
-	if (activity.type === 'Create' && activity.object) {
-		// object.id (if exists)
-		if (typeof activity.object.id === 'string') {
-			const uriHost = toUnicode(new URL(activity.object.id).hostname.toLowerCase());
-			if (host !== uriHost) throw new Error('activity.object.id has different host');
-		}
-
-		// object.attributedTo (if exists)
-		if (typeof activity.object.attributedTo === 'string') {
-			const uriHost = toUnicode(new URL(activity.object.attributedTo).hostname.toLowerCase());
-			if (host !== uriHost) throw new Error('activity.object.attributedTo has different host');
-		}
-	}
-}