From d81c20f163f0884d04cd11e46221bfefc0ac9f22 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 14 Apr 2018 14:39:07 +0900
Subject: hostLowerは廃止してhostにlowerしたものを入れるように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/queue/processors/http/process-inbox.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/queue/processors')

diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index ce5b7d5a89..a2c6bf4f90 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -32,7 +32,7 @@ export default async (job: kue.Job, done): Promise<void> => {
 			return;
 		}
 
-		user = await User.findOne({ usernameLower: username, hostLower: host }) as IRemoteUser;
+		user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
 	} else {
 		user = await User.findOne({
 			host: { $ne: null },
-- 
cgit v1.2.3-freya


From eebd5f62b37a1ed72fd34f2b66dd8f6723c35ee2 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 15 Apr 2018 12:51:05 +0900
Subject: Fix bug

---
 src/queue/processors/http/process-inbox.ts | 4 ++--
 src/server/activitypub.ts                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/queue/processors')

diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index a2c6bf4f90..2c49a67b66 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -1,7 +1,7 @@
 import * as kue from 'kue';
 import * as debug from 'debug';
 
-import { verifySignature } from 'http-signature';
+const httpSignature = require('http-signature');
 import parseAcct from '../../../acct/parse';
 import User, { IRemoteUser } from '../../../models/user';
 import perform from '../../../remote/activitypub/perform';
@@ -50,7 +50,7 @@ export default async (job: kue.Job, done): Promise<void> => {
 		return;
 	}
 
-	if (!verifySignature(signature, user.publicKey.publicKeyPem)) {
+	if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
 		console.warn('signature verification failed');
 		done();
 		return;
diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts
index 954cc7480e..1682fc27d4 100644
--- a/src/server/activitypub.ts
+++ b/src/server/activitypub.ts
@@ -1,6 +1,6 @@
 import * as Router from 'koa-router';
 const koaBody = require('koa-body');
-const parseRequest = require('http-signature');
+const httpSignature = require('http-signature');
 
 import { createHttp } from '../queue';
 import pack from '../remote/activitypub/renderer';
@@ -25,7 +25,7 @@ router.post('/users/:user/inbox', koaBody(), ctx => {
 	ctx.req.headers.authorization = 'Signature ' + ctx.req.headers.signature;
 
 	try {
-		signature = parseRequest(ctx.req);
+		signature = httpSignature.parseRequest(ctx.req);
 	} catch (e) {
 		ctx.status = 401;
 		return;
-- 
cgit v1.2.3-freya