📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
using built-in nodejs net module instead of validate-ip-node
Blue Mouse166207fa4333
diff --git a/apps/production/src/project/project.service.ts b/apps/production/src/project/project.service.tsindex db88c10cf..53e338341 100644--- a/apps/production/src/project/project.service.ts+++ b/apps/production/src/project/project.service.ts@@ -6,6 +6,7 @@ import {InternalServerErrorException,ConflictException,} from '@nestjs/common'+import net from 'net'import { InjectRepository } from '@nestjs/typeorm'import { Repository } from 'typeorm'import { customAlphabet } from 'nanoid'@@ -20,8 +21,6 @@ import * as _includes from 'lodash/includes'import * as dayjs from 'dayjs'import * as utc from 'dayjs/plugin/utc'import { compareSync } from 'bcrypt'-// @ts-ignore-import * as validateIP from 'validate-ip-node'import { UserService } from '../user/user.service'import { ActionTokensService } from '../action-tokens/action-tokens.service'@@ -435,7 +434,7 @@ export class ProjectService {})_map(projectDTO.ipBlacklist, ip => {- if (!validateIP(_trim(ip)) && !IP_REGEX.test(_trim(ip))) {+ if (!net.isIP(_trim(ip)) && !IP_REGEX.test(_trim(ip))) {throw new ConflictException(`IP address ${ip} is not correct`)}})diff --git a/apps/selfhosted/src/project/project.service.ts b/apps/selfhosted/src/project/project.service.tsindex 11d9ea76b..ec135c326 100644--- a/apps/selfhosted/src/project/project.service.ts+++ b/apps/selfhosted/src/project/project.service.ts@@ -6,6 +6,7 @@ import {InternalServerErrorException,ConflictException,} from '@nestjs/common'+import net from 'net'import { customAlphabet } from 'nanoid'import * as _isEmpty from 'lodash/isEmpty'import * as _isString from 'lodash/isString'@@ -16,8 +17,6 @@ import * as _map from 'lodash/map'import * as _isNull from 'lodash/isNull'import * as _split from 'lodash/split'import * as _trim from 'lodash/trim'-// @ts-ignore-import * as validateIP from 'validate-ip-node'import { Project } from './entity/project.entity'import { ProjectDTO } from './dto/project.dto'@@ -191,7 +190,7 @@ export class ProjectService {})_map(projectDTO.ipBlacklist, ip => {- if (!validateIP(_trim(ip)) && !IP_REGEX.test(_trim(ip))) {+ if (!net.isIP(_trim(ip)) && !IP_REGEX.test(_trim(ip))) {throw new ConflictException(`IP address ${ip} is not correct`)}})diff --git a/package.json b/package.jsonindex 03a34e6e1..ae643391f 100644--- a/package.json+++ b/package.json@@ -81,7 +81,6 @@"typeorm": "^0.2.45","ua-parser-js": "^1.0.35","uuid": "^9.0.0",- "validate-ip-node": "^1.0.8","validator": "^13.9.0"},"devDependencies": {