amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace useHttp with defaultProtocol

Browse Source
This commit is contained in:
slonkazoid 2024-07-12 15:46:23 +03:00
parent 6fa6f1ba45
commit d81aadfe23
No known key found for this signature in database
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend/src/core/WebfingerService.ts
View File

@ -22,6 +22,8 @@ export type IWebFinger = {
const urlRegex = /^https?:\/\//; const urlRegex = /^https?:\/\//;
const mRegex = /^([^@]+)@(.*)/; const mRegex = /^([^@]+)@(.*)/;
const defaultProtocol = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true' ? 'http' : 'https';
@Injectable() @Injectable()
export class WebfingerService { export class WebfingerService {
constructor( constructor(
@ -56,16 +58,15 @@ export class WebfingerService {
@bindThis @bindThis
private queryToWebFingerTemplate(query: string): string { 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)) { if (query.match(urlRegex)) {
const u = new URL(query); 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); const m = query.match(mRegex);
if (m) { if (m) {
const hostname = m[2]; 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})`); throw new Error(`Invalid query (${query})`);
@ -75,14 +76,13 @@ export class WebfingerService {
private queryToHostMetaUrl(query: string): string { private queryToHostMetaUrl(query: string): string {
if (query.match(urlRegex)) { if (query.match(urlRegex)) {
const u = new URL(query); const u = new URL(query);
const useHttp = process.env.MISSKEY_WEBFINGER_USE_HTTP && process.env.MISSKEY_WEBFINGER_USE_HTTP.toLowerCase() === 'true'; return `${u.protocol}//${u.hostname}/.well-known/host-meta`;
return `${useHttp ? 'http' : u.protocol}//${u.hostname}/.well-known/host-meta`;
} }
const m = query.match(mRegex); const m = query.match(mRegex);
if (m) { if (m) {
const hostname = m[2]; const hostname = m[2];
return `https://${hostname}/.well-known/host-meta`; return `${defaultProtocol}://${hostname}/.well-known/host-meta`;
} }
throw new Error(`Invalid query (${query})`); throw new Error(`Invalid query (${query})`);