Move middleware utils in middlewares

helpers modules should not import models

1 files changed, 0 insertions, 62 deletions

diff --git a/server/helpers/signup.ts b/server/helpers/signup.ts
deleted file mode 100644
index 8fa81e601..000000000
--- a/server/helpers/signup.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { UserModel } from '../models/user/user'
-import * as ipaddr from 'ipaddr.js'
-import { CONFIG } from '../initializers/config'
-
-const isCidr = require('is-cidr')
-
-async function isSignupAllowed (): Promise<{ allowed: boolean, errorMessage?: string }> {
-  if (CONFIG.SIGNUP.ENABLED === false) {
-    return { allowed: false }
-  }
-
-  // No limit and signup is enabled
-  if (CONFIG.SIGNUP.LIMIT === -1) {
-    return { allowed: true }
-  }
-
-  const totalUsers = await UserModel.countTotal()
-
-  return { allowed: totalUsers < CONFIG.SIGNUP.LIMIT }
-}
-
-function isSignupAllowedForCurrentIP (ip: string) {
-  if (!ip) return false
-
-  const addr = ipaddr.parse(ip)
-  const excludeList = [ 'blacklist' ]
-  let matched = ''
-
-  // if there is a valid, non-empty whitelist, we exclude all unknown adresses too
-  if (CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr(cidr)).length > 0) {
-    excludeList.push('unknown')
-  }
-
-  if (addr.kind() === 'ipv4') {
-    const addrV4 = ipaddr.IPv4.parse(ip)
-    const rangeList = {
-      whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr.v4(cidr))
-                       .map(cidr => ipaddr.IPv4.parseCIDR(cidr)),
-      blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isCidr.v4(cidr))
-                       .map(cidr => ipaddr.IPv4.parseCIDR(cidr))
-    }
-    matched = ipaddr.subnetMatch(addrV4, rangeList, 'unknown')
-  } else if (addr.kind() === 'ipv6') {
-    const addrV6 = ipaddr.IPv6.parse(ip)
-    const rangeList = {
-      whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr.v6(cidr))
-                       .map(cidr => ipaddr.IPv6.parseCIDR(cidr)),
-      blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isCidr.v6(cidr))
-                       .map(cidr => ipaddr.IPv6.parseCIDR(cidr))
-    }
-    matched = ipaddr.subnetMatch(addrV6, rangeList, 'unknown')
-  }
-
-  return !excludeList.includes(matched)
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  isSignupAllowed,
-  isSignupAllowedForCurrentIP
-}