@liberstudio/cloudflare-list 2.0.17 → 2.1.9

package/dist/middleware/attack-logger.middleware.d.ts

@@ -13,7 +13,6 @@ export declare class AttackLoggerMiddleware implements NestMiddleware, OnModuleD
     use(req: Request, res: Response, next: NextFunction): void;
     private handleSuspicious;
     private isThrottled;
-    private getClientIp;
     private sanitize;
     private ensureDirectoryExists;
     onModuleDestroy(): void;

package/dist/middleware/attack-logger.middleware.js

@@ -29,15 +29,15 @@ let AttackLoggerMiddleware = AttackLoggerMiddleware_1 = class AttackLoggerMiddle
         if (!options.logPath || typeof options.logPath !== "string") {
             throw new Error("CloudflareAttacksOptions.logPath deve essere una stringa valida");
         }
-        const logPath = (0, path_1.join)(process.cwd(), options.logPath);
-        this.ensureDirectoryExists(logPath);
-        this.stream = (0, fs_1.createWriteStream)(logPath, {
+        const absolutePath = (0, path_1.resolve)(options.logPath);
+        this.ensureDirectoryExists(absolutePath);
+        this.stream = (0, fs_1.createWriteStream)(absolutePath, {
             flags: "a",
             encoding: "utf8",
             highWaterMark: 64 * 1024,
         });
         this.stream.on("error", (err) => {
-            this.logger.error(`Errore nello stream del log (${logPath}): ${err.message}`);
+            this.logger.error(`Errore nello stream del log (${absolutePath}): ${err.message}`);
         });
     }
     use(req, res, next) {
@@ -49,7 +49,7 @@ let AttackLoggerMiddleware = AttackLoggerMiddleware_1 = class AttackLoggerMiddle
         next();
     }
     handleSuspicious(req) {
-        const ip = this.getClientIp(req);
+        const ip = (0, utils_1.getClientIp)(req);
         if (!ip || this.isThrottled(ip))
             return;
         const entry = {
@@ -65,9 +65,11 @@ let AttackLoggerMiddleware = AttackLoggerMiddleware_1 = class AttackLoggerMiddle
                 this.logger.debug("Stream del log degli attacchi svuotato");
             });
         }
-        this.attSrv.updateIpList(ip).catch((err) => {
+        const cidr = (0, utils_1.toCidr)(ip);
+        if (!cidr)
+            return;
+        this.attSrv.updateIpList(cidr).catch((err) => {
             const msg = err instanceof Error ? err.message : "Errore sconosciuto";
-            ;
             this.logger.error(`Aggiornamento Cloudflare fallito: ${msg}`);
         });
     }
@@ -80,19 +82,6 @@ let AttackLoggerMiddleware = AttackLoggerMiddleware_1 = class AttackLoggerMiddle
         this.recentIps.set(ip, timeout);
         return false;
     }
-    getClientIp(req) {
-        const cfIp = req.headers["cf-connecting-ip"];
-        if (typeof cfIp === "string")
-            return cfIp;
-        const xRealIp = req.headers["x-real-ip"];
-        if (typeof xRealIp === "string")
-            return xRealIp;
-        const xForwardedFor = req.headers["x-forwarded-for"];
-        if (typeof xForwardedFor === "string") {
-            return xForwardedFor.split(",")[0].trim();
-        }
-        return req.socket.remoteAddress ?? null;
-    }
     sanitize(value) {
         return value.replace(/[\r\n]/g, "_");
     }

package/dist/scripts/version-bump.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/scripts/version-bump.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const pkgPath = (0, node_path_1.resolve)(__dirname, '../../package.json');
+const pkg = JSON.parse((0, node_fs_1.readFileSync)(pkgPath, 'utf8'));
+let [major, minor, patch] = pkg.version.split('.').map(Number);
+// Incremento patch
+patch += 1;
+// Gestione rollover
+if (patch >= 10) {
+    minor += Math.floor(patch / 10);
+    patch = patch % 10;
+}
+if (minor >= 10) {
+    major += Math.floor(minor / 10);
+    minor = minor % 10;
+}
+// Ricostruzione versione
+pkg.version = `${major}.${minor}.${patch}`;
+// Scrittura package.json
+(0, node_fs_1.writeFileSync)(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+console.log(`Version updated to ${pkg.version}`);

package/dist/utils/get-client-ip.util.d.ts

@@ -1,2 +1,3 @@
 import { Request } from "express";
 export declare function getClientIp(req: Request): string;
+export declare function toCidr(ip: string): string | null;

package/dist/utils/get-client-ip.util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientIp = getClientIp;
+exports.toCidr = toCidr;
 function getClientIp(req) {
     const cfIp = req.headers["cf-connecting-ip"];
     if (typeof cfIp === "string")
@@ -14,3 +15,16 @@ function getClientIp(req) {
     }
     return req.socket.remoteAddress ?? "unknown";
 }
+function toCidr(ip) {
+    if (!ip)
+        return null;
+    // IPv6
+    if (ip.includes(":")) {
+        return `${ip}/128`;
+    }
+    // IPv4
+    if (ip.includes(".")) {
+        return `${ip}/32`;
+    }
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liberstudio/cloudflare-list",
-  "version": "2.0.17",
+  "version": "2.1.9",
   "description": "Modulo NestJS per gestione IP List Cloudflare",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,14 +15,14 @@
   "scripts": {
     "build": "npx tsc",
     "prepublishOnly": "npm run build",
-    "version:bump": "npm version patch --no-git-tag-version",
+    "version:bump": "npx tsx src/scripts/version-bump.ts",
     "pub": "npm publish --access public"
   },
   "publishConfig": {
     "access": "public"
   },
   "simple-git-hooks": {
-    "pre-commit": "npm run version:bump && git add package.json package-lock.json"
+    "pre-commit": "source ~/.bashrc && npm run version:bump && git add package.json package-lock.json"
   },
   "peerDependencies": {
     "@nestjs/axios": ">=3.0.0",