diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-06 20:49:11 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-06 20:49:11 +0000 |
| commit | 01958da57fde952a5fae1eb0dd18f5f2cd419c37 (patch) | |
| tree | 52bc493213258bf0afc03f010db9515f2b50f021 | |
| parent | merge: fix env variable type (!592) (diff) | |
| parent | fix webfinger for instances without a `/host-meta` (diff) | |
| download | sharkey-01958da57fde952a5fae1eb0dd18f5f2cd419c37.tar.gz sharkey-01958da57fde952a5fae1eb0dd18f5f2cd419c37.tar.bz2 sharkey-01958da57fde952a5fae1eb0dd18f5f2cd419c37.zip | |
merge: fix webfinger for instances without a `/host-meta` (!593)
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>
| -rw-r--r-- | packages/backend/src/core/WebfingerService.ts | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts index cbbac52cdb..1517dd0074 100644 --- a/packages/backend/src/core/WebfingerService.ts +++ b/packages/backend/src/core/WebfingerService.ts @@ -22,7 +22,9 @@ export type IWebFinger = { const urlRegex = /^https?:\/\//; 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() export class WebfingerService { @@ -82,7 +84,7 @@ export class WebfingerService { const m = query.match(mRegex); if (m) { const hostname = m[2]; - return `${defaultProtocol}://${hostname}/.well-known/host-meta`; + return `${defaultProtocol}//${hostname}/.well-known/host-meta`; } 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']; return template.indexOf('{uri}') < 0 ? null : template; } catch (err) { - console.error(`error while request host-meta for ${url}`); + console.error(`error while request host-meta for ${url}: ${err}`); return null; } } |