Merge pull request #3 from Fabian123333/domain-filter-arrays

support lists of domains for filters

Author: Fabian123333

README.md

@@ -23,7 +23,7 @@ Elevating security measures, our module seamlessly enforces a custom ban command
 Experience granular control over your filtering strategy with a diverse array of customizable parameters, empowering you to tailor defenses to your unique environment.
 
 - `userAgent`: Filter requests based on user agents, a pivotal strategy to pinpoint potentially malicious clients.
-- `domain`: Employ domain-based filters to focus on specific sections of your application.
+- `domain`: Employ domain-based filters to focus on specific sections of your application. Supports lists or single domains.
 - `referer`: Evaluate the source of incoming requests with referer-based filters.
 - `request`: Scrutinize request content with contextual filtering.
 - `method`: Filter requests by their HTTP methods (GET, POST, etc.).

char_list.cpp

@@ -12,7 +12,12 @@
 
 class CharList{
 	public:
+		int Count(){
+			return count;	
+		}
+	
 		void Add(char* c){
+			count++;
 			// if currently no entry
 			if(content == NULL){
 				content = (char*)malloc(strlen(c) + 1);
@@ -47,7 +52,7 @@ class CharList{
 			return false;
 		}
 
-		bool Contains(char* c){
+		bool Contains(const char* c){
 			if(content == NULL){
 				return false;	
 			}
@@ -63,6 +68,7 @@ class CharList{
 	private:
 		CharList* nextEntry;
 		char* content;
+		int count = 0;
 
 		bool ContainsChar(const char* str, char c) {
 			while (*str != '\0') {

config.cpp

@@ -132,10 +132,22 @@ class Config{
 					free(tmp);
 				}catch(const std::exception& e){}
 
+				try{
+					for (auto& el2 : el.value()["domain"].items())
+					{
+						std::string tmp = el2.value().get<std::string>();
+						char* tmp2 = (char*)malloc(tmp.length() + 1);
+						strcpy(tmp2, tmp.c_str());
+					
+						newFilter.AddDomain(tmp2);
+						free(tmp2);
+					}
+				}catch(const std::exception& e){}
+				
 				try{
 					char* tmp = (char*)malloc(el.value()["domain"].get<std::string>().length());
 					strcpy(tmp, el.value()["domain"].get<std::string>().c_str());
-					newFilter.SetDomain(tmp);
+					newFilter.AddDomain(tmp);
 					free(tmp);
 				}catch(const std::exception& e){}
 

config_example/anti-ddos.json

@@ -21,7 +21,7 @@
 			"refeer": ""
 		},
 		{
-			"domain": "localhost",
+			"domain": [ "localhost", "example.com", "www.example.com" ],
 			"score": 5
 		},
 		{

filter.cpp

@@ -17,16 +17,16 @@ class Filter{
 		char* GetRefeer(){
 			return refeer;
 		}
-		char* GetDomain(){
-			return domain;
+		CharList GetDomains(){
+			return domains;
 		}
 		char* GetRequest(){
 			return request;
 		}
 		char* GetMethod(){
 			return method;
 		}
-		char* GetContent(){
+		char* GetContent(){ 
 			return content;
 		}
 		int GetStatusCode(){
@@ -54,9 +54,8 @@ class Filter{
 			strcpy(userAgent, value);
 		}
 
-		void SetDomain(char* value){
-			domain = (char*)malloc(strlen(value) + 1);
-			strcpy(domain, value);			
+		void AddDomain(char* value){
+			domains.Add(value);
 		}	
 
 		void SetRefeer(char* value){
@@ -154,8 +153,8 @@ class Filter{
 				free(m);
 			}
 
-			if(GetDomain() != NULL){
-				if(!CompareValues(r->hostname, GetDomain(), IsUseRegex())){
+			if(GetDomains().Count() != 0){
+				if(!GetDomains().Contains(r->hostname)){
 //					std::cerr << "skipped filter with 'wrong' domain " << r->hostname << " domain would be " << GetDomain() << "\n";
 					return 0;
 				}
@@ -203,7 +202,6 @@ class Filter{
 
 	private:
 		char* userAgent;
-		char* domain;
 		char* refeer;
 		char* request;
 		char* method;