X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fwebfinger.ts;h=dd914341e8364c8d5020953ad296c2757c2f2056;hb=de6310b2fcbb8a6b79c546b23dfa1920724faaa7;hp=38f6b938d5225441c474b9a74a311a3a55bd846d;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/webfinger.ts b/server/helpers/custom-validators/webfinger.ts index 38f6b938d..dd914341e 100644 --- a/server/helpers/custom-validators/webfinger.ts +++ b/server/helpers/custom-validators/webfinger.ts @@ -1,21 +1,21 @@ -import { CONFIG } from '../../initializers' +import { REMOTE_SCHEME, WEBSERVER } from '../../initializers/constants' +import { sanitizeHost } from '../core-utils' import { exists } from './misc' -function isWebfingerResourceValid (value: string) { +function isWebfingerLocalResourceValid (value: string) { if (!exists(value)) return false if (value.startsWith('acct:') === false) return false - const accountWithHost = value.substr(5) - const accountParts = accountWithHost.split('@') - if (accountParts.length !== 2) return false + const actorWithHost = value.substr(5) + const actorParts = actorWithHost.split('@') + if (actorParts.length !== 2) return false - const host = accountParts[1] - - return host === CONFIG.WEBSERVER.HOST + const host = actorParts[1] + return sanitizeHost(host, REMOTE_SCHEME.HTTP) === WEBSERVER.HOST } // --------------------------------------------------------------------------- export { - isWebfingerResourceValid + isWebfingerLocalResourceValid }