From 3368fe855249f45bdf1e4c1e509d325d44e80fbe Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 13 Apr 2018 06:06:18 +0900
Subject: wip

---
 src/server/api/service/github.ts  | 244 ++++++++++++++++++++------------------
 src/server/api/service/twitter.ts | 173 +++++++++++++--------------
 2 files changed, 213 insertions(+), 204 deletions(-)

(limited to 'src/server/api/service')

diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index bc8d3c6a7d..ee226cc5cc 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -1,140 +1,152 @@
 import * as EventEmitter from 'events';
-import * as express from 'express';
+import * as Router from 'koa-router';
 import * as request from 'request';
 const crypto = require('crypto');
 
-import User from '../../../models/user';
+import User, { IUser } from '../../../models/user';
 import createNote from '../../../services/note/create';
 import config from '../../../config';
 
-module.exports = async (app: express.Application) => {
-	if (config.github_bot == null) return;
+const handler = new EventEmitter();
 
-	const bot = await User.findOne({
-		usernameLower: config.github_bot.username.toLowerCase()
-	});
+let bot: IUser;
 
+const post = async text => {
 	if (bot == null) {
-		console.warn(`GitHub hook bot specified, but not found: @${config.github_bot.username}`);
-		return;
+		const account = await User.findOne({
+			usernameLower: config.github_bot.username.toLowerCase()
+		});
+
+		if (account == null) {
+			console.warn(`GitHub hook bot specified, but not found: @${config.github_bot.username}`);
+			return;
+		} else {
+			bot = account;
+		}
 	}
 
-	const post = text => createNote(bot, { text });
+	createNote(bot, { text });
+};
+
+// Init router
+const router = new Router();
 
-	const handler = new EventEmitter();
+if (config.github_bot != null) {
+	const secret = config.github_bot.hook_secret;
 
-	app.post('/hooks/github', (req, res, next) => {
-		// req.headers['x-hub-signature'] および
-		// req.headers['x-github-event'] は常に string ですが、型定義の都合上
-		// string | string[] になっているので string を明示しています
-		if ((new Buffer(req.headers['x-hub-signature'] as string)).equals(new Buffer(`sha1=${crypto.createHmac('sha1', config.github_bot.hook_secret).update(JSON.stringify(req.body)).digest('hex')}`))) {
-			handler.emit(req.headers['x-github-event'] as string, req.body);
-			res.sendStatus(200);
+	router.post('/hooks/github', ctx => {
+		const sig1 = new Buffer(ctx.headers['x-hub-signature']);
+		const sig2 = new Buffer(`sha1=${crypto.createHmac('sha1', secret).update(JSON.stringify(ctx.body)).digest('hex')}`);
+		if (sig1.equals(sig2)) {
+			handler.emit(ctx.headers['x-github-event'], ctx.body);
+			ctx.status = 204;
 		} else {
-			res.sendStatus(400);
+			ctx.status = 400;
 		}
 	});
+}
 
-	handler.on('status', event => {
-		const state = event.state;
-		switch (state) {
-			case 'error':
-			case 'failure':
-				const commit = event.commit;
-				const parent = commit.parents[0];
-
-				// Fetch parent status
-				request({
-					url: `${parent.url}/statuses`,
-					headers: {
-						'User-Agent': 'misskey'
-					}
-				}, (err, res, body) => {
-					if (err) {
-						console.error(err);
-						return;
-					}
-					const parentStatuses = JSON.parse(body);
-					const parentState = parentStatuses[0].state;
-					const stillFailed = parentState == 'failure' || parentState == 'error';
-					if (stillFailed) {
-						post(`**⚠️BUILD STILL FAILED⚠️**: ?[${commit.commit.message}](${commit.html_url})`);
-					} else {
-						post(`**🚨BUILD FAILED🚨**: →→→?[${commit.commit.message}](${commit.html_url})←←←`);
-					}
-				});
-				break;
-		}
-	});
+module.exports = router;
 
-	handler.on('push', event => {
-		const ref = event.ref;
-		switch (ref) {
-			case 'refs/heads/master':
-				const pusher = event.pusher;
-				const compare = event.compare;
-				const commits = event.commits;
-				post([
-					`Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
-					commits.reverse().map(commit => `・[?[${commit.id.substr(0, 7)}](${commit.url})] ${commit.message.split('\n')[0]}`).join('\n'),
-				].join('\n'));
-				break;
-			case 'refs/heads/release':
-				const commit = event.commits[0];
-				post(`RELEASED: ${commit.message}`);
-				break;
-		}
-	});
+handler.on('status', event => {
+	const state = event.state;
+	switch (state) {
+		case 'error':
+		case 'failure':
+			const commit = event.commit;
+			const parent = commit.parents[0];
 
-	handler.on('issues', event => {
-		const issue = event.issue;
-		const action = event.action;
-		let title: string;
-		switch (action) {
-			case 'opened': title = 'Issue opened'; break;
-			case 'closed': title = 'Issue closed'; break;
-			case 'reopened': title = 'Issue reopened'; break;
-			default: return;
-		}
-		post(`${title}: <${issue.number}>「${issue.title}」\n${issue.html_url}`);
-	});
+			// Fetch parent status
+			request({
+				url: `${parent.url}/statuses`,
+				headers: {
+					'User-Agent': 'misskey'
+				}
+			}, (err, res, body) => {
+				if (err) {
+					console.error(err);
+					return;
+				}
+				const parentStatuses = JSON.parse(body);
+				const parentState = parentStatuses[0].state;
+				const stillFailed = parentState == 'failure' || parentState == 'error';
+				if (stillFailed) {
+					post(`**⚠️BUILD STILL FAILED⚠️**: ?[${commit.commit.message}](${commit.html_url})`);
+				} else {
+					post(`**🚨BUILD FAILED🚨**: →→→?[${commit.commit.message}](${commit.html_url})←←←`);
+				}
+			});
+			break;
+	}
+});
 
-	handler.on('issue_comment', event => {
-		const issue = event.issue;
-		const comment = event.comment;
-		const action = event.action;
-		let text: string;
-		switch (action) {
-			case 'created': text = `Commented to「${issue.title}」:${comment.user.login}「${comment.body}」\n${comment.html_url}`; break;
-			default: return;
-		}
-		post(text);
-	});
+handler.on('push', event => {
+	const ref = event.ref;
+	switch (ref) {
+		case 'refs/heads/master':
+			const pusher = event.pusher;
+			const compare = event.compare;
+			const commits = event.commits;
+			post([
+				`Pushed by **${pusher.name}** with ?[${commits.length} commit${commits.length > 1 ? 's' : ''}](${compare}):`,
+				commits.reverse().map(commit => `・[?[${commit.id.substr(0, 7)}](${commit.url})] ${commit.message.split('\n')[0]}`).join('\n'),
+			].join('\n'));
+			break;
+		case 'refs/heads/release':
+			const commit = event.commits[0];
+			post(`RELEASED: ${commit.message}`);
+			break;
+	}
+});
 
-	handler.on('watch', event => {
-		const sender = event.sender;
-		post(`⭐️ Starred by **${sender.login}** ⭐️`);
-	});
+handler.on('issues', event => {
+	const issue = event.issue;
+	const action = event.action;
+	let title: string;
+	switch (action) {
+		case 'opened': title = 'Issue opened'; break;
+		case 'closed': title = 'Issue closed'; break;
+		case 'reopened': title = 'Issue reopened'; break;
+		default: return;
+	}
+	post(`${title}: <${issue.number}>「${issue.title}」\n${issue.html_url}`);
+});
 
-	handler.on('fork', event => {
-		const repo = event.forkee;
-		post(`🍴 Forked:\n${repo.html_url} 🍴`);
-	});
+handler.on('issue_comment', event => {
+	const issue = event.issue;
+	const comment = event.comment;
+	const action = event.action;
+	let text: string;
+	switch (action) {
+		case 'created': text = `Commented to「${issue.title}」:${comment.user.login}「${comment.body}」\n${comment.html_url}`; break;
+		default: return;
+	}
+	post(text);
+});
 
-	handler.on('pull_request', event => {
-		const pr = event.pull_request;
-		const action = event.action;
-		let text: string;
-		switch (action) {
-			case 'opened': text = `New Pull Request:「${pr.title}」\n${pr.html_url}`; break;
-			case 'reopened': text = `Pull Request Reopened:「${pr.title}」\n${pr.html_url}`; break;
-			case 'closed':
-				text = pr.merged
-					? `Pull Request Merged!:「${pr.title}」\n${pr.html_url}`
-					: `Pull Request Closed:「${pr.title}」\n${pr.html_url}`;
-				break;
-			default: return;
-		}
-		post(text);
-	});
-};
+handler.on('watch', event => {
+	const sender = event.sender;
+	post(`⭐️ Starred by **${sender.login}** ⭐️`);
+});
+
+handler.on('fork', event => {
+	const repo = event.forkee;
+	post(`🍴 Forked:\n${repo.html_url} 🍴`);
+});
+
+handler.on('pull_request', event => {
+	const pr = event.pull_request;
+	const action = event.action;
+	let text: string;
+	switch (action) {
+		case 'opened': text = `New Pull Request:「${pr.title}」\n${pr.html_url}`; break;
+		case 'reopened': text = `Pull Request Reopened:「${pr.title}」\n${pr.html_url}`; break;
+		case 'closed':
+			text = pr.merged
+				? `Pull Request Merged!:「${pr.title}」\n${pr.html_url}`
+				: `Pull Request Closed:「${pr.title}」\n${pr.html_url}`;
+			break;
+		default: return;
+	}
+	post(text);
+});
diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts
index e5239fa171..9fb01b44ef 100644
--- a/src/server/api/service/twitter.ts
+++ b/src/server/api/service/twitter.ts
@@ -1,160 +1,155 @@
-import * as express from 'express';
-import * as cookie from 'cookie';
+import * as Koa from 'koa';
+import * as Router from 'koa-router';
 import * as uuid from 'uuid';
-// import * as Twitter from 'twitter';
-// const Twitter = require('twitter');
 import autwh from 'autwh';
 import redis from '../../../db/redis';
-import User, { pack } from '../../../models/user';
+import User, { pack, ILocalUser } from '../../../models/user';
 import event from '../../../publishers/stream';
 import config from '../../../config';
 import signin from '../common/signin';
 
-module.exports = (app: express.Application) => {
-	function getUserToken(req: express.Request) {
-		// req.headers['cookie'] は常に string ですが、型定義の都合上
-		// string | string[] になっているので string を明示しています
-		return ((req.headers['cookie'] as string || '').match(/i=(!\w+)/) || [null, null])[1];
-	}
-
-	function compareOrigin(req: express.Request) {
-		function normalizeUrl(url: string) {
-			return url[url.length - 1] === '/' ? url.substr(0, url.length - 1) : url;
-		}
-
-		// req.headers['referer'] は常に string ですが、型定義の都合上
-		// string | string[] になっているので string を明示しています
-		const referer = req.headers['referer'] as string;
+function getUserToken(ctx: Koa.Context) {
+	return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1];
+}
 
-		return (normalizeUrl(referer) == normalizeUrl(config.url));
+function compareOrigin(ctx: Koa.Context) {
+	function normalizeUrl(url: string) {
+		return url[url.length - 1] === '/' ? url.substr(0, url.length - 1) : url;
 	}
 
-	app.get('/disconnect/twitter', async (req, res): Promise<any> => {
-		if (!compareOrigin(req)) {
-			res.status(400).send('invalid origin');
-			return;
-		}
+	const referer = ctx.headers['referer'];
 
-		const userToken = getUserToken(req);
-		if (userToken == null) return res.send('plz signin');
+	return (normalizeUrl(referer) == normalizeUrl(config.url));
+}
 
-		const user = await User.findOneAndUpdate({
-			host: null,
-			'token': userToken
-		}, {
-			$set: {
-				'twitter': null
-			}
-		});
+// Init router
+const router = new Router();
+
+router.get('/disconnect/twitter', async ctx => {
+	if (!compareOrigin(ctx)) {
+		ctx.throw(400, 'invalid origin');
+		return;
+	}
 
-		res.send(`Twitterの連携を解除しました :v:`);
+	const userToken = getUserToken(ctx);
+	if (userToken == null) {
+		ctx.throw(400, 'signin required');
+		return;
+	}
 
-		// Publish i updated event
-		event(user._id, 'i_updated', await pack(user, user, {
-			detail: true,
-			includeSecrets: true
-		}));
+	const user = await User.findOneAndUpdate({
+		host: null,
+		'token': userToken
+	}, {
+		$set: {
+			'twitter': null
+		}
 	});
 
-	if (config.twitter == null) {
-		app.get('/connect/twitter', (req, res) => {
-			res.send('現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)');
-		});
+	ctx.body = `Twitterの連携を解除しました :v:`;
 
-		app.get('/signin/twitter', (req, res) => {
-			res.send('現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)');
-		});
+	// Publish i updated event
+	event(user._id, 'i_updated', await pack(user, user, {
+		detail: true,
+		includeSecrets: true
+	}));
+});
 
-		return;
-	}
+if (config.twitter == null) {
+	router.get('/connect/twitter', ctx => {
+		ctx.body = '現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)';
+	});
 
+	router.get('/signin/twitter', ctx => {
+		ctx.body = '現在Twitterへ接続できません (このインスタンスではTwitterはサポートされていません)';
+	});
+} else {
 	const twAuth = autwh({
 		consumerKey: config.twitter.consumer_key,
 		consumerSecret: config.twitter.consumer_secret,
 		callbackUrl: `${config.url}/api/tw/cb`
 	});
 
-	app.get('/connect/twitter', async (req, res): Promise<any> => {
-		if (!compareOrigin(req)) {
-			res.status(400).send('invalid origin');
+	router.get('/connect/twitter', async ctx => {
+		if (!compareOrigin(ctx)) {
+			ctx.throw(400, 'invalid origin');
 			return;
 		}
 
-		const userToken = getUserToken(req);
-		if (userToken == null) return res.send('plz signin');
+		const userToken = getUserToken(ctx);
+		if (userToken == null) {
+			ctx.throw(400, 'signin required');
+			return;
+		}
 
-		const ctx = await twAuth.begin();
-		redis.set(userToken, JSON.stringify(ctx));
-		res.redirect(ctx.url);
+		const twCtx = await twAuth.begin();
+		redis.set(userToken, JSON.stringify(twCtx));
+		ctx.redirect(twCtx.url);
 	});
 
-	app.get('/signin/twitter', async (req, res): Promise<any> => {
-		const ctx = await twAuth.begin();
+	router.get('/signin/twitter', async ctx => {
+		const twCtx = await twAuth.begin();
 
 		const sessid = uuid();
 
-		redis.set(sessid, JSON.stringify(ctx));
+		redis.set(sessid, JSON.stringify(twCtx));
 
 		const expires = 1000 * 60 * 60; // 1h
-		res.cookie('signin_with_twitter_session_id', sessid, {
+		ctx.cookies.set('signin_with_twitter_session_id', sessid, {
 			path: '/',
-			domain: `.${config.host}`,
-			secure: config.url.substr(0, 5) === 'https',
+			domain: config.host,
+			secure: config.url.startsWith('https'),
 			httpOnly: true,
 			expires: new Date(Date.now() + expires),
 			maxAge: expires
 		});
 
-		res.redirect(ctx.url);
+		ctx.redirect(twCtx.url);
 	});
 
-	app.get('/tw/cb', (req, res): any => {
-		const userToken = getUserToken(req);
+	router.get('/tw/cb', ctx => {
+		const userToken = getUserToken(ctx);
 
 		if (userToken == null) {
-			// req.headers['cookie'] は常に string ですが、型定義の都合上
-			// string | string[] になっているので string を明示しています
-			const cookies = cookie.parse((req.headers['cookie'] as string || ''));
+			const sessid = ctx.cookies.get('signin_with_twitter_session_id');
 
-			const sessid = cookies['signin_with_twitter_session_id'];
-
-			if (sessid == undefined) {
-				res.status(400).send('invalid session');
+			if (sessid == null) {
+				ctx.throw(400, 'invalid session');
 				return;
 			}
 
-			redis.get(sessid, async (_, ctx) => {
-				const result = await twAuth.done(JSON.parse(ctx), req.query.oauth_verifier);
+			redis.get(sessid, async (_, twCtx) => {
+				const result = await twAuth.done(JSON.parse(twCtx), ctx.query.oauth_verifier);
 
 				const user = await User.findOne({
 					host: null,
 					'twitter.userId': result.userId
-				});
+				}) as ILocalUser;
 
 				if (user == null) {
-					res.status(404).send(`@${result.screenName}と連携しているMisskeyアカウントはありませんでした...`);
+					ctx.throw(404, `@${result.screenName}と連携しているMisskeyアカウントはありませんでした...`);
 					return;
 				}
 
-				signin(res, user, true);
+				signin(ctx, user, true);
 			});
 		} else {
-			const verifier = req.query.oauth_verifier;
+			const verifier = ctx.query.oauth_verifier;
 
 			if (verifier == null) {
-				res.status(400).send('invalid session');
+				ctx.throw(400, 'invalid session');
 				return;
 			}
 
-			redis.get(userToken, async (_, ctx) => {
-				const result = await twAuth.done(JSON.parse(ctx), verifier);
+			redis.get(userToken, async (_, twCtx) => {
+				const result = await twAuth.done(JSON.parse(twCtx), verifier);
 
 				const user = await User.findOneAndUpdate({
 					host: null,
-					'token': userToken
+					token: userToken
 				}, {
 					$set: {
-						'twitter': {
+						twitter: {
 							accessToken: result.accessToken,
 							accessTokenSecret: result.accessTokenSecret,
 							userId: result.userId,
@@ -163,7 +158,7 @@ module.exports = (app: express.Application) => {
 					}
 				});
 
-				res.send(`Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`);
+				ctx.body = `Twitter: @${result.screenName} を、Misskey: @${user.username} に接続しました！`;
 
 				// Publish i updated event
 				event(user._id, 'i_updated', await pack(user, user, {
@@ -173,4 +168,6 @@ module.exports = (app: express.Application) => {
 			});
 		}
 	});
-};
+}
+
+module.exports = router;
-- 
cgit v1.2.3-freya


From 22d2f2051c4cbe3da5b9ece674f36a6555f8c953 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 13 Apr 2018 09:44:00 +0900
Subject: wip

---
 src/client/app/common/mios.ts         |  5 +++--
 src/server/api/api-handler.ts         | 16 +++++++++++++---
 src/server/api/bot/interfaces/line.ts |  2 +-
 src/server/api/call.ts                |  4 +---
 src/server/api/index.ts               |  4 +++-
 src/server/api/private/signin.ts      |  6 +++---
 src/server/api/private/signup.ts      |  6 +++---
 src/server/api/service/github.ts      |  8 ++++++--
 src/server/file/index.ts              |  7 ++++++-
 src/server/file/pour.ts               |  8 +-------
 10 files changed, 40 insertions(+), 26 deletions(-)

(limited to 'src/server/api/service')

diff --git a/src/client/app/common/mios.ts b/src/client/app/common/mios.ts
index a09af799be..ccc73eebc3 100644
--- a/src/client/app/common/mios.ts
+++ b/src/client/app/common/mios.ts
@@ -444,9 +444,10 @@ export default class MiOS extends EventEmitter {
 		// Append a credential
 		if (this.isSignedIn) (data as any).i = this.i.token;
 
-		const viaStream = localStorage.getItem('apiViaStream') ? localStorage.getItem('apiViaStream') == 'true' : true;
-
 		return new Promise((resolve, reject) => {
+			const viaStream = this.stream.hasConnection &&
+				(localStorage.getItem('apiViaStream') ? localStorage.getItem('apiViaStream') == 'true' : true);
+
 			if (viaStream) {
 				const stream = this.stream.borrow();
 				const id = Math.random().toString();
diff --git a/src/server/api/api-handler.ts b/src/server/api/api-handler.ts
index 2c50234317..947794a20e 100644
--- a/src/server/api/api-handler.ts
+++ b/src/server/api/api-handler.ts
@@ -25,11 +25,21 @@ export default async (endpoint: Endpoint, ctx: Koa.Context) => {
 
 	// Authentication
 	try {
-		[user, app] = await authenticate(ctx.body['i']);
+		[user, app] = await authenticate(ctx.request.body['i']);
 	} catch (e) {
-		return reply(403, 'AUTHENTICATION_FAILED');
+		reply(403, 'AUTHENTICATION_FAILED');
+		return;
 	}
 
+	let res;
+
 	// API invoking
-	call(endpoint, user, app, ctx.body, ctx.req).then(reply).catch(e => reply(400, e));
+	try {
+		res = await call(endpoint, user, app, ctx.request.body, ctx.req);
+	} catch (e) {
+		reply(400, e);
+		return;
+	}
+
+	reply(res);
 };
diff --git a/src/server/api/bot/interfaces/line.ts b/src/server/api/bot/interfaces/line.ts
index 454630161a..733315391d 100644
--- a/src/server/api/bot/interfaces/line.ts
+++ b/src/server/api/bot/interfaces/line.ts
@@ -226,7 +226,7 @@ if (config.line_bot) {
 
 		// シグネチャ比較
 		if (sig1 === sig2) {
-			ctx.body.events.forEach(ev => {
+			ctx.request.body.events.forEach(ev => {
 				handler.emit('event', ev);
 			});
 		} else {
diff --git a/src/server/api/call.ts b/src/server/api/call.ts
index c25f55ed3f..cc40294657 100644
--- a/src/server/api/call.ts
+++ b/src/server/api/call.ts
@@ -6,11 +6,9 @@ import limitter from './limitter';
 import { IUser } from '../../models/user';
 import { IApp } from '../../models/app';
 
-export default (endpoint: string | Endpoint, user: IUser, app: IApp, data: any, req?: http.IncomingMessage) => new Promise(async (ok, rej) => {
+export default (endpoint: string | Endpoint, user: IUser, app: IApp, data: any, req?: http.IncomingMessage) => new Promise<any>(async (ok, rej) => {
 	const isSecure = user != null && app == null;
 
-	//console.log(endpoint, user, app, data);
-
 	const ep = typeof endpoint == 'string' ? endpoints.find(e => e.name == endpoint) : endpoint;
 
 	if (ep.secure && !isSecure) {
diff --git a/src/server/api/index.ts b/src/server/api/index.ts
index c383e1cf8d..2ea5fccb5b 100644
--- a/src/server/api/index.ts
+++ b/src/server/api/index.ts
@@ -13,7 +13,9 @@ const handler = require('./api-handler').default;
 
 // Init app
 const app = new Koa();
-app.use(bodyParser);
+app.use(bodyParser({
+	detectJSON: () => true
+}));
 
 // Init multer instance
 const upload = multer({
diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts
index 55326deeaf..1737007206 100644
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -11,9 +11,9 @@ export default async (ctx: Koa.Context) => {
 	ctx.set('Access-Control-Allow-Origin', config.url);
 	ctx.set('Access-Control-Allow-Credentials', 'true');
 
-	const username = ctx.body['username'];
-	const password = ctx.body['password'];
-	const token = ctx.body['token'];
+	const username = ctx.request.body['username'];
+	const password = ctx.request.body['password'];
+	const token = ctx.request.body['token'];
 
 	if (typeof username != 'string') {
 		ctx.status = 400;
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index a4554be4ae..15257b869f 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -37,7 +37,7 @@ export default async (ctx: Koa.Context) => {
 	// Verify recaptcha
 	// ただしテスト時はこの機構は障害となるため無効にする
 	if (process.env.NODE_ENV !== 'test') {
-		const success = await recaptcha(ctx.body['g-recaptcha-response']);
+		const success = await recaptcha(ctx.request.body['g-recaptcha-response']);
 
 		if (!success) {
 			ctx.throw(400, 'recaptcha-failed');
@@ -45,8 +45,8 @@ export default async (ctx: Koa.Context) => {
 		}
 	}
 
-	const username = ctx.body['username'];
-	const password = ctx.body['password'];
+	const username = ctx.request.body['username'];
+	const password = ctx.request.body['password'];
 
 	// Validate username
 	if (!validateUsername(username)) {
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index ee226cc5cc..cd9760a36d 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -35,10 +35,14 @@ if (config.github_bot != null) {
 	const secret = config.github_bot.hook_secret;
 
 	router.post('/hooks/github', ctx => {
+		const body = JSON.stringify(ctx.request.body);
+		const hash = crypto.createHmac('sha1', secret).update(body).digest('hex');
 		const sig1 = new Buffer(ctx.headers['x-hub-signature']);
-		const sig2 = new Buffer(`sha1=${crypto.createHmac('sha1', secret).update(JSON.stringify(ctx.body)).digest('hex')}`);
+		const sig2 = new Buffer(`sha1=${hash}`);
+
+		// シグネチャ比較
 		if (sig1.equals(sig2)) {
-			handler.emit(ctx.headers['x-github-event'], ctx.body);
+			handler.emit(ctx.headers['x-github-event'], ctx.request.body);
 			ctx.status = 204;
 		} else {
 			ctx.status = 400;
diff --git a/src/server/file/index.ts b/src/server/file/index.ts
index d58939f1be..d305286d12 100644
--- a/src/server/file/index.ts
+++ b/src/server/file/index.ts
@@ -13,6 +13,11 @@ import sendDriveFile from './send-drive-file';
 const app = new Koa();
 app.use(cors());
 
+app.use(async (ctx, next) => {
+	ctx.set('Cache-Control', 'max-age=31536000, immutable');
+	await next();
+});
+
 // Init router
 const router = new Router();
 
@@ -27,7 +32,7 @@ router.get('/app-default.jpg', ctx => {
 });
 
 router.get('/:id', sendDriveFile);
-router.get('/:id/:name', sendDriveFile);
+router.get('/:id/*', sendDriveFile);
 
 // Register router
 app.use(router.routes());
diff --git a/src/server/file/pour.ts b/src/server/file/pour.ts
index b38b969c2d..0fd0ad0e60 100644
--- a/src/server/file/pour.ts
+++ b/src/server/file/pour.ts
@@ -83,12 +83,6 @@ export default function(readable: stream.Readable, type: string, ctx: Koa.Contex
 		ctx.set('Content-Disposition', 'attachment');
 	}
 
-	ctx.set('Cache-Control', 'max-age=31536000, immutable');
 	ctx.set('Content-Type', data.contentType);
-
-	data.stream.pipe(ctx.res);
-
-	data.stream.on('end', () => {
-		ctx.res.end();
-	});
+	ctx.body = data.stream;
 }
-- 
cgit v1.2.3-freya