Merge pull request #89 from teacoder-team/dev

fix: ip whitelist matcher

Author: TeaCoder52

packages/nestjs-yookassa/dist/webhook/utils/ip-matcher.util.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isIpAllowed = isIpAllowed;
-const cidr_matcher_1 = require("cidr-matcher");
-const matcher = new cidr_matcher_1.default();
+const ipaddr = require("ipaddr.js");
 /**
  * Проверяет, входит ли IP-адрес в список разрешённых CIDR / IP.
  *
@@ -16,7 +15,14 @@ function isIpAllowed(clientIp, whitelist) {
     if (!clientIp)
         return false;
     try {
-        return matcher.match(clientIp, whitelist);
+        const ip = ipaddr.parse(clientIp);
+        return whitelist.some(rule => {
+            if (rule.includes('/')) {
+                const [range, prefix] = ipaddr.parseCIDR(rule);
+                return ip.match(range, prefix);
+            }
+            return ip.toString() === ipaddr.parse(rule).toString();
+        });
     }
     catch (_a) {
         return false;

packages/nestjs-yookassa/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nestjs-yookassa",
-	"version": "2.3.1",
+	"version": "2.3.2",
 	"description": "A NestJS library for integrating with YooKassa API",
 	"keywords": [
 		"nest",
@@ -44,8 +44,8 @@
 	"dependencies": {
 		"@nestjs/axios": "^4.0.1",
 		"axios": "^1.11.0",
-		"cidr-matcher": "^2.1.1",
 		"https-proxy-agent": "^7.0.6",
+		"ipaddr.js": "^2.3.0",
 		"rxjs": "^7.8.2",
 		"undici": "^7.16.0"
 	},

packages/nestjs-yookassa/src/webhook/enums/notification-event.enum.ts

@@ -20,6 +20,5 @@ export enum NotificationEventEnum {
 	/**
 	 * Возврат успешно завершен.
 	 */
-	REFUND_SUCCEEDED = 'refund.succeeded',
+	REFUND_SUCCEEDED = 'refund.succeeded'
 }
-

packages/nestjs-yookassa/src/webhook/utils/ip-matcher.util.ts

@@ -1,6 +1,4 @@
-import CidrMatcher from 'cidr-matcher'
-
-const matcher = new CidrMatcher()
+import * as ipaddr from 'ipaddr.js'
 
 /**
  * Проверяет, входит ли IP-адрес в список разрешённых CIDR / IP.
@@ -18,7 +16,16 @@ export function isIpAllowed(
 	if (!clientIp) return false
 
 	try {
-		return matcher.match(clientIp, whitelist as string[])
+		const ip = ipaddr.parse(clientIp)
+
+		return whitelist.some(rule => {
+			if (rule.includes('/')) {
+				const [range, prefix] = ipaddr.parseCIDR(rule)
+				return ip.match(range, prefix)
+			}
+
+			return ip.toString() === ipaddr.parse(rule).toString()
+		})
 	} catch {
 		return false
 	}