Merge branch 'release/5.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / lib / signup.ts

diff --git a/server/lib/signup.ts b/server/lib/signup.ts
index 8fa81e601d7a712e314dd036a2151648ee8f8353..f19232621aa4e792db390d769cd11c2cb508ee4b 100644 (file)
--- a/server/lib/signup.ts
+++ b/server/lib/signup.ts
@@ -1,14 +1,27 @@
-import { UserModel } from '../models/user/user'
-import * as ipaddr from 'ipaddr.js'
+import { IPv4, IPv6, parse, subnetMatch } from 'ipaddr.js'
 import { CONFIG } from '../initializers/config'
+import { UserModel } from '../models/user/user'
 
 const isCidr = require('is-cidr')
 
-async function isSignupAllowed (): Promise<{ allowed: boolean, errorMessage?: string }> {
+export type SignupMode = 'direct-registration' | 'request-registration'
+
+async function isSignupAllowed (options: {
+  signupMode: SignupMode
+
+  ip: string // For plugins
+  body?: any
+}): Promise<{ allowed: boolean, errorMessage?: string }> {
+  const { signupMode } = options
+
   if (CONFIG.SIGNUP.ENABLED === false) {
     return { allowed: false }
   }
 
+  if (signupMode === 'direct-registration' && CONFIG.SIGNUP.REQUIRES_APPROVAL === true) {
+    return { allowed: false }
+  }
+
   // No limit and signup is enabled
   if (CONFIG.SIGNUP.LIMIT === -1) {
     return { allowed: true }
@@ -22,33 +35,33 @@ async function isSignupAllowed (): Promise<{ allowed: boolean, errorMessage?: st
 function isSignupAllowedForCurrentIP (ip: string) {
   if (!ip) return false
 
-  const addr = ipaddr.parse(ip)
+  const addr = parse(ip)
   const excludeList = [ 'blacklist' ]
   let matched = ''
 
-  // if there is a valid, non-empty whitelist, we exclude all unknown adresses too
+  // if there is a valid, non-empty whitelist, we exclude all unknown addresses 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 addrV4 = IPv4.parse(ip)
     const rangeList = {
       whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr.v4(cidr))
-                       .map(cidr => ipaddr.IPv4.parseCIDR(cidr)),
+                       .map(cidr => IPv4.parseCIDR(cidr)),
       blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isCidr.v4(cidr))
-                       .map(cidr => ipaddr.IPv4.parseCIDR(cidr))
+                       .map(cidr => IPv4.parseCIDR(cidr))
     }
-    matched = ipaddr.subnetMatch(addrV4, rangeList, 'unknown')
+    matched = subnetMatch(addrV4, rangeList, 'unknown')
   } else if (addr.kind() === 'ipv6') {
-    const addrV6 = ipaddr.IPv6.parse(ip)
+    const addrV6 = IPv6.parse(ip)
     const rangeList = {
       whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isCidr.v6(cidr))
-                       .map(cidr => ipaddr.IPv6.parseCIDR(cidr)),
+                       .map(cidr => IPv6.parseCIDR(cidr)),
       blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isCidr.v6(cidr))
-                       .map(cidr => ipaddr.IPv6.parseCIDR(cidr))
+                       .map(cidr => IPv6.parseCIDR(cidr))
     }
-    matched = ipaddr.subnetMatch(addrV6, rangeList, 'unknown')
+    matched = subnetMatch(addrV6, rangeList, 'unknown')
   }
 
   return !excludeList.includes(matched)