Adds support for CIDR blocks

lib/rate-limiter.guard.ts

@@ -1,5 +1,6 @@
 import { Reflector } from '@nestjs/core'
 import { Injectable, ExecutionContext, Inject, HttpStatus, Logger, HttpException, CanActivate } from '@nestjs/common'
+import { Netmask } from 'netmask'
 import {
 	RateLimiterMemory,
 	RateLimiterRes,
@@ -136,10 +137,18 @@ export class RateLimiterGuard implements CanActivate {
 			})
 		}
 
+		const ipBlockFilter = function (list: string[]): (key: string) => boolean {
+			const blocks = list.filter((ip) => ip.includes('/')).map((ip) => new Netmask(ip))
+
+			return (key): boolean => blocks.some((block) => block.contains(key))
+		}
+
 		rateLimiter = new RLWrapperBlackAndWhite({
 			limiter: rateLimiter,
 			whiteList: this.specificOptions?.whiteList || this.options.whiteList,
 			blackList: this.specificOptions?.blackList || this.options.blackList,
+			isWhiteListed: ipBlockFilter(this.specificOptions?.whiteList || this.options.whiteList),
+			isBlackListed: ipBlockFilter(this.specificOptions?.blackList || this.options.blackList),
 			runActionAnyway: false
 		})
 
@@ -173,7 +182,7 @@ export class RateLimiterGuard implements CanActivate {
 	}
 
 	protected getIpFromRequest(request: { ip: string }): string {
-	        return request.ip?.match(/\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/)?.[0]
+		return request.ip?.match(/\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/)?.[0]
 	}
 
 	private httpHandler(context: ExecutionContext) {

package.json

@@ -33,19 +33,21 @@
     "test": "jest --config ./jest.config.js"
   },
   "dependencies": {
+    "netmask": "^2.0.2",
     "rate-limiter-flexible": "2.1.10"
   },
   "devDependencies": {
     "@nestjs/common": "latest",
     "@nestjs/core": "latest",
     "@types/jest": "^26.0.15",
+    "@types/netmask": "^1.0.30",
     "@types/node": "^14.11.1",
     "jest": "^26.6.3",
     "prettier": "^2.1.1",
     "reflect-metadata": "0.1.13",
     "rxjs": "^6.6.3",
-    "ts-node": "^9.0.0",
     "ts-jest": "^26.4.4",
+    "ts-node": "^9.0.0",
     "typescript": "^4.0.2"
   }
-}
+}