summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-08-06 19:07:01 +0100
committerdakkar <dakkar@thenautilus.net>2024-08-06 19:07:01 +0100
commit8d29df64faf6774cc5062396ad45a02f4b544c32 (patch)
treee3023c1ce5a6f790e9ff9a955b59b1eae62c3059
parentmerge: Remove infinite caches to prevent memory leak (!587) (diff)
downloadsharkey-8d29df64faf6774cc5062396ad45a02f4b544c32.tar.gz
sharkey-8d29df64faf6774cc5062396ad45a02f4b544c32.tar.bz2
sharkey-8d29df64faf6774cc5062396ad45a02f4b544c32.zip
fix webfinger for instances without a `/host-meta`
we were inconsistent with the colons, thanks to usedbunny for noticing!
-rw-r--r--packages/backend/src/core/WebfingerService.ts8
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;
}
}