-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')
function isSignupAllowedForCurrentIP (ip: string) {
if (!ip) return false
- const addr = ipaddr.parse(ip)
+ const addr = parse(ip)
const excludeList = [ 'blacklist' ]
let matched = ''
}
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)