profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #1438

Browse source
This commit is contained in:
syuilo 2018-04-18 19:24:09 +09:00
parent ea9c4de45b
commit 7410aa9b37
1 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/server/webfinger.ts
View file

@ -1,8 +1,9 @@
import * as mongo from 'mongodb';
import * as Router from 'koa-router'; import * as Router from 'koa-router';
import config from '../config'; import config from '../config';
import parseAcct from '../acct/parse'; import parseAcct from '../acct/parse';
import User from '../models/user'; import User, { IUser } from '../models/user';
// Init router // Init router
const router = new Router(); const router = new Router();
@ -14,27 +15,38 @@ router.get('/.well-known/webfinger', async ctx => {
} }
const resourceLower = ctx.query.resource.toLowerCase(); const resourceLower = ctx.query.resource.toLowerCase();
const webPrefix = config.url.toLowerCase() + '/@';
let acctLower; let acctLower;
let id;
if (resourceLower.startsWith(webPrefix)) { if (resourceLower.startsWith(config.url.toLowerCase() + '/@')) {
acctLower = resourceLower.slice(webPrefix.length); acctLower = resourceLower.split('/').pop();
} else if (resourceLower.startsWith(config.url.toLowerCase() + '/users/')) {
id = new mongo.ObjectID(resourceLower.split('/').pop());
} else if (resourceLower.startsWith('acct:')) { } else if (resourceLower.startsWith('acct:')) {
acctLower = resourceLower.slice('acct:'.length); acctLower = resourceLower.slice('acct:'.length);
} else { } else {
acctLower = resourceLower; acctLower = resourceLower;
} }
let user: IUser;
if (acctLower) {
const parsedAcctLower = parseAcct(acctLower); const parsedAcctLower = parseAcct(acctLower);
if (![null, config.host.toLowerCase()].includes(parsedAcctLower.host)) { if (![null, config.host.toLowerCase()].includes(parsedAcctLower.host)) {
ctx.status = 422; ctx.status = 422;
return; return;
} }
const user = await User.findOne({ user = await User.findOne({
usernameLower: parsedAcctLower.username, usernameLower: parsedAcctLower.username,
host: null host: null
}); });
} else {
user = await User.findOne({
_id: id,
host: null
});
}
if (user === null) { if (user === null) {
ctx.status = 404; ctx.status = 404;