IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2026-09-03 20:53:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve result consistency

Browse Source
This commit is contained in:
Chocobozzz
2026-07-13 16:00:52 +02:00
parent c8f17b491c
commit 6dd9f44b3b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/core/lib/signup.ts
+6 -5
View File
@@ -26,8 +26,9 @@ export async function isSignupAllowed (options: {
} }
const totalUsers = await UserModel.countTotal() const totalUsers = await UserModel.countTotal()
if (totalUsers < CONFIG.SIGNUP.LIMIT) return { allowed: true }
return { allowed: totalUsers < CONFIG.SIGNUP.LIMIT, errorMessage: 'User limit is reached on this instance' } return { allowed: false, errorMessage: 'User limit is reached on this instance' }
} }
export function isSignupAllowedForCurrentIP (ip: string) { export function isSignupAllowedForCurrentIP (ip: string) {
@@ -46,18 +47,18 @@ export function isSignupAllowedForCurrentIP (ip: string) {
const addrV4 = ipaddr.IPv4.parse(ip) const addrV4 = ipaddr.IPv4.parse(ip)
const rangeList = { const rangeList = {
whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isIPV4Cidr(cidr)) whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isIPV4Cidr(cidr))
.map(cidr => ipaddr.IPv4.parseCIDR(cidr)), .map(cidr => ipaddr.IPv4.parseCIDR(cidr)),
blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isIPV4Cidr(cidr)) blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isIPV4Cidr(cidr))
.map(cidr => ipaddr.IPv4.parseCIDR(cidr)) .map(cidr => ipaddr.IPv4.parseCIDR(cidr))
} }
matched = ipaddr.subnetMatch(addrV4, rangeList, 'unknown') matched = ipaddr.subnetMatch(addrV4, rangeList, 'unknown')
} else if (addr.kind() === 'ipv6') { } else if (addr.kind() === 'ipv6') {
const addrV6 = ipaddr.IPv6.parse(ip) const addrV6 = ipaddr.IPv6.parse(ip)
const rangeList = { const rangeList = {
whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isIPV6Cidr(cidr)) whitelist: CONFIG.SIGNUP.FILTERS.CIDR.WHITELIST.filter(cidr => isIPV6Cidr(cidr))
.map(cidr => ipaddr.IPv6.parseCIDR(cidr)), .map(cidr => ipaddr.IPv6.parseCIDR(cidr)),
blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isIPV6Cidr(cidr)) blacklist: CONFIG.SIGNUP.FILTERS.CIDR.BLACKLIST.filter(cidr => isIPV6Cidr(cidr))
.map(cidr => ipaddr.IPv6.parseCIDR(cidr)) .map(cidr => ipaddr.IPv6.parseCIDR(cidr))
} }
matched = ipaddr.subnetMatch(addrV6, rangeList, 'unknown') matched = ipaddr.subnetMatch(addrV6, rangeList, 'unknown')
} }