Set port if not specified in webfinger

diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index ef6a878cfebe1ee0abf4f0c4426f81673cf69b49..769aa83c6a0b94f19b2956bc702e4f3d1852f213 100644 (file)
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -2,13 +2,26 @@ import * as express from 'express'
 import { Model } from 'sequelize-typescript'
 import { ResultList } from '../../shared'
 import { VideoResolution } from '../../shared/models/videos'
-import { CONFIG } from '../initializers'
+import { CONFIG, REMOTE_SCHEME } from '../initializers'
 import { UserModel } from '../models/account/user'
 import { ActorModel } from '../models/activitypub/actor'
 import { ApplicationModel } from '../models/application/application'
 import { pseudoRandomBytesPromise } from './core-utils'
 import { logger } from './logger'
 
+function getHostWithPort (host: string) {
+  const splitted = host.split(':')
+
+  // The port was not specified
+  if (splitted.length === 1) {
+    if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
+
+    return host + ':80'
+  }
+
+  return host
+}
+
 function badRequest (req: express.Request, res: express.Response, next: express.NextFunction) {
   return res.type('json').status(400).end()
 }
@@ -108,5 +121,6 @@ export {
   computeResolutionsToTranscode,
   resetSequelizeInstance,
   getServerActor,
-  SortType
+  SortType,
+  getHostWithPort
 }

diff --git a/server/middlewares/servers.ts b/server/middlewares/servers.ts
index 488f9c36848dab2c6c97925a7da525032ecacfd8..87bbe9fd79f1b6c8b29babd97f31a373f347d5f3 100644 (file)
--- a/server/middlewares/servers.ts
+++ b/server/middlewares/servers.ts
@@ -1,5 +1,6 @@
 import 'express-validator'
 import * as express from 'express'
+import { getHostWithPort } from '../helpers'
 
 import { REMOTE_SCHEME } from '../initializers'
 
@@ -25,18 +26,3 @@ function setBodyHostsPort (req: express.Request, res: express.Response, next: ex
 export {
   setBodyHostsPort
 }
-
-// ---------------------------------------------------------------------------
-
-function getHostWithPort (host: string) {
-  const splitted = host.split(':')
-
-  // The port was not specified
-  if (splitted.length === 1) {
-    if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
-
-    return host + ':80'
-  }
-
-  return host
-}

diff --git a/server/middlewares/validators/webfinger.ts b/server/middlewares/validators/webfinger.ts
index 2c8351799a46a75a7a278609dc2043cb73bbb770..894c724982004e03b042eec673b61864917bbea6 100644 (file)
--- a/server/middlewares/validators/webfinger.ts
+++ b/server/middlewares/validators/webfinger.ts
@@ -1,6 +1,6 @@
 import * as express from 'express'
 import { query } from 'express-validator/check'
-import { logger } from '../../helpers'
+import { getHostWithPort, logger } from '../../helpers'
 import { isWebfingerResourceValid } from '../../helpers/custom-validators/webfinger'
 import { ActorModel } from '../../models/activitypub/actor'
 import { areValidationErrors } from './utils'
@@ -14,7 +14,7 @@ const webfingerValidator = [
     if (areValidationErrors(req, res)) return
 
     // Remove 'acct:' from the beginning of the string
-    const nameWithHost = req.query.resource.substr(5)
+    const nameWithHost = getHostWithPort(req.query.resource.substr(5))
     const [ name ] = nameWithHost.split('@')
 
     const actor = await ActorModel.loadLocalByName(name)