nune/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-09-29 19:34:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: fix webfinger for instances without a /host-meta (!593)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/593

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
dakkar 2024-08-06 20:49:11 +00:00
parent f33aedfc9f 8d29df64fa
commit 01958da57f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/core/WebfingerService.ts
View file

@ -22,7 +22,9 @@ export type IWebFinger = {
const urlRegex = /^https?:\/\//; const urlRegex = /^https?:\/\//;
const mRegex = /^([^@]+)@(.*)/; const mRegex = /^([^@]+)@(.*)/;
const defaultProtocol = process.env.MISSKEY_WEBFINGER_USE_HTTP?.toLowerCase() === 'true' ? 'http' : 'https'; // we have the colons here, because URL.protocol does as well, so it's
// more uniform in the places we use both
const defaultProtocol = process.env.MISSKEY_WEBFINGER_USE_HTTP?.toLowerCase() === 'true' ? 'http:' : 'https:';
@Injectable() @Injectable()
export class WebfingerService { export class WebfingerService {
@ -82,7 +84,7 @@ export class WebfingerService {
const m = query.match(mRegex); const m = query.match(mRegex);
if (m) { if (m) {
const hostname = m[2]; const hostname = m[2];
return `${defaultProtocol}://${hostname}/.well-known/host-meta`; return `${defaultProtocol}//${hostname}/.well-known/host-meta`;
} }
throw new Error(`Invalid query (${query})`); throw new Error(`Invalid query (${query})`);
@ -101,7 +103,7 @@ export class WebfingerService {
const template = (hostMeta['XRD']['Link'] as Array<any>).filter(p => p['@_rel'] === 'lrdd')[0]['@_template']; const template = (hostMeta['XRD']['Link'] as Array<any>).filter(p => p['@_rel'] === 'lrdd')[0]['@_template'];
return template.indexOf('{uri}') < 0 ? null : template; return template.indexOf('{uri}') < 0 ? null : template;
} catch (err) { } catch (err) {
console.error(`error while request host-meta for ${url}`); console.error(`error while request host-meta for ${url}: ${err}`);
return null; return null;
} }
} }