X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fwebfinger.ts;h=dd914341e8364c8d5020953ad296c2757c2f2056;hb=c2777c1dfe688c8fab1ef2fed50e360100fa9198;hp=1b9aad444f0ac835d91e0d3b3d2a37816ff59b00;hpb=232f04c809bf25952b790da5685b36f05cb19750;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/webfinger.ts b/server/helpers/custom-validators/webfinger.ts index 1b9aad444..dd914341e 100644 --- a/server/helpers/custom-validators/webfinger.ts +++ b/server/helpers/custom-validators/webfinger.ts @@ -1,7 +1,8 @@ -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 @@ -10,12 +11,11 @@ function isWebfingerResourceValid (value: string) { if (actorParts.length !== 2) return false const host = actorParts[1] - - return host === CONFIG.WEBSERVER.HOSTNAME || host === CONFIG.WEBSERVER.HOST + return sanitizeHost(host, REMOTE_SCHEME.HTTP) === WEBSERVER.HOST } // --------------------------------------------------------------------------- export { - isWebfingerResourceValid + isWebfingerLocalResourceValid }