diff options
| author | slonkazoid <slonkazoid@slonk.ing> | 2024-07-12 15:46:23 +0300 |
|---|---|---|
| committer | slonkazoid <slonkazoid@slonk.ing> | 2024-07-12 15:46:23 +0300 |
| commit | d81aadfe232c5d4ec1f8551df75cfc7d8fa7a338 (patch) | |
| tree | 2c29773c0491d21adbd59ed7f411f4ad946a85f0 | |
| parent | i re-read the code several times but oh well (diff) | |
| download | sharkey-d81aadfe232c5d4ec1f8551df75cfc7d8fa7a338.tar.gz sharkey-d81aadfe232c5d4ec1f8551df75cfc7d8fa7a338.tar.bz2 sharkey-d81aadfe232c5d4ec1f8551df75cfc7d8fa7a338.zip | |
replace useHttp with defaultProtocol
| -rw-r--r-- | packages/backend/src/core/WebfingerService.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/src/core/WebfingerService.ts b/packages/backend/src/core/WebfingerService.ts index 334c5999af..12f2bba624 100644 --- a/packages/backend/src/core/WebfingerService.ts +++ b/packages/backend/src/core/WebfingerService.ts @@ -22,6 +22,8 @@ export type IWebFinger = { const urlRegex = /^https?:\/\//; const mRegex = /^([^@]+)@(.*)/; +const defaultProtocol = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true' ? 'http' : 'https'; + @Injectable() export class WebfingerService { constructor( @@ -56,16 +58,15 @@ export class WebfingerService { @bindThis private queryToWebFingerTemplate(query: string): string { - const useHttp = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true'; if (query.match(urlRegex)) { const u = new URL(query); - return `${useHttp ? 'http' : u.protocol}//${u.hostname}/.well-known/webfinger?resource={uri}`; + return `${u.protocol}//${u.hostname}/.well-known/webfinger?resource={uri}`; } const m = query.match(mRegex); if (m) { const hostname = m[2]; - return `http${useHttp ? '' : 's'}//${hostname}/.well-known/webfinger?resource={uri}`; + return `${defaultProtocol}//${hostname}/.well-known/webfinger?resource={uri}`; } throw new Error(`Invalid query (${query})`); @@ -75,14 +76,13 @@ export class WebfingerService { private queryToHostMetaUrl(query: string): string { if (query.match(urlRegex)) { const u = new URL(query); - const useHttp = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true'; - return `${useHttp ? 'http' : u.protocol}//${u.hostname}/.well-known/host-meta`; + return `${u.protocol}//${u.hostname}/.well-known/host-meta`; } const m = query.match(mRegex); if (m) { const hostname = m[2]; - return `https://${hostname}/.well-known/host-meta`; + return `${defaultProtocol}://${hostname}/.well-known/host-meta`; } throw new Error(`Invalid query (${query})`); |