heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

apply fixes from review

Browse source
This commit is contained in:
slonkazoid 2024-07-12 14:28:19 +03:00
parent 7a62e1be31
commit 0b6fb394c0
No known key found for this signature in database
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,11 +42,11 @@ export class WebfingerService {
private genUrl(query: string, template: string): string { private genUrl(query: string, template: string): string {
if (template.indexOf('{uri}') < 0) throw new Error(`Invalid webFingerUrl: ${template}`); if (template.indexOf('{uri}') < 0) throw new Error(`Invalid webFingerUrl: ${template}`);
if (query.match(/^https?:\/\//)) { if (query.match(urlRegex)) {
return template.replace('{uri}', encodeURIComponent(query)); return template.replace('{uri}', encodeURIComponent(query));
} }
const m = query.match(/^([^@]+)@(.*)/); const m = query.match(mRegex);
if (m) { if (m) {
return template.replace('{uri}', encodeURIComponent(`acct:${query}`)); return template.replace('{uri}', encodeURIComponent(`acct:${query}`));
} }
@ -56,12 +56,13 @@ export class WebfingerService {
@bindThis @bindThis
private queryToWebFingerTemplate(query: string): string { private queryToWebFingerTemplate(query: string): string {
if (query.match(/^https?:\/\//)) { if (query.match(urlRegex)) {
const u = new URL(query); const u = new URL(query);
return `${u.protocol}//${u.hostname}/.well-known/webfinger?resource={uri}`; 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/webfinger?resource={uri}`;
} }
const m = query.match(/^([^@]+)@(.*)/); const m = query.match(mRegex);
if (m) { if (m) {
const hostname = m[2]; const hostname = m[2];
return `https://${hostname}/.well-known/webfinger?resource={uri}`; return `https://${hostname}/.well-known/webfinger?resource={uri}`;
@ -74,7 +75,8 @@ 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);
return `${u.protocol}//${u.hostname}/.well-known/host-meta`; 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`;
} }
const m = query.match(mRegex); const m = query.match(mRegex);