usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1372 from akihikodaki/misc 

Improve WebFinger verification
This commit is contained in:
syuilo 2018-04-02 19:38:47 +09:00 committed by GitHub
parent 5ceb808c6f 8361289b4e
commit da36d50cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/remote/webfinger.ts
View File

@ -20,14 +20,19 @@ export default async function resolve(query, verifier?: string): Promise<IWebFin
res(result.object);
})) as IWebFinger;
const subject = finger.subject.toLowerCase().replace(/^acct:/, '');
if (verifier) {
if (finger.subject.toLowerCase().replace(/^acct:/, '') !== verifier) {
throw 'WebFinger verfification failed';
if (typeof verifier === 'string') {
if (subject !== verifier) {
throw new Error;
}
return finger;
}
return resolve(finger.subject, finger.subject.toLowerCase());
if (typeof subject === 'string') {
return resolve(subject, subject);
}
throw new Error;
}