From 41fb13c330de629df2d23379209e79c7af0f2e9a Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 27 Aug 2021 14:32:44 +0200
Subject: esModuleInterop to true

---
 server/lib/signup.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'server/lib/signup.ts')

diff --git a/server/lib/signup.ts b/server/lib/signup.ts
index 8fa81e601..3c1397a12 100644
--- a/server/lib/signup.ts
+++ b/server/lib/signup.ts
@@ -1,6 +1,6 @@
-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')
 
@@ -22,7 +22,7 @@ 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 = ''
 
@@ -32,23 +32,23 @@ function isSignupAllowedForCurrentIP (ip: string) {
   }
 
   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)
-- 
cgit v1.2.3