From 79fb026278d12fa431f1276af2d79d265da2bfad Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Sat, 19 May 2018 16:32:52 +0200
Subject: [PATCH] Improve blocking regex implementation (block both A and AAAA
 requests, not only A)

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 FTL.h               |  1 +
 dnsmasq_interface.c | 40 +++++++++++++++-------------------------
 gc.c                |  6 ------
 log.c               |  2 +-
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/FTL.h b/FTL.h
index 0057845c..777fb7ed 100644
--- a/FTL.h
+++ b/FTL.h
@@ -116,6 +116,7 @@ typedef struct {
 	int reply_NXDOMAIN;
 	int reply_CNAME;
 	int reply_IP;
+	int regex;
 } countersStruct;
 
 typedef struct {
diff --git a/dnsmasq_interface.c b/dnsmasq_interface.c
index b7c08c9f..67c4f015 100644
--- a/dnsmasq_interface.c
+++ b/dnsmasq_interface.c
@@ -391,7 +391,6 @@ void FTL_reply(unsigned short flags, char *name, struct all_addr *addr, int id)
 			// Check UUID of this query
 			if(queries[i].id == id)
 			{
-				queries[i].status = QUERY_CACHE;
 				found = true;
 				break;
 			}
@@ -409,6 +408,9 @@ void FTL_reply(unsigned short flags, char *name, struct all_addr *addr, int id)
 		{
 			// This query is no longer unknown
 			counters.unknown--;
+			// Answered from a custom (user provided) cache file
+			counters.cached++;
+			queries[i].status = QUERY_CACHE;
 
 			// Get time index
 			int querytimestamp, overTimetimestamp;
@@ -416,27 +418,7 @@ void FTL_reply(unsigned short flags, char *name, struct all_addr *addr, int id)
 			int timeidx = findOverTimeID(overTimetimestamp);
 			validate_access("overTime", timeidx, true, __LINE__, __FUNCTION__, __FILE__);
 
-			int domainID = queries[i].domainID;
-			validate_access("domains", domainID, true, __LINE__, __FUNCTION__, __FILE__);
-
-			int clientID = queries[i].clientID;
-			validate_access("clients", clientID, true, __LINE__, __FUNCTION__, __FILE__);
-
-			// Decide what to do depending on the status of this query (blocked yes/no)
-			if(queries[i].status == QUERY_CACHE)
-			{
-				// Answered from a custom (user provided) cache file
-				counters.cached++;
-				overTime[timeidx].cached++;
-			}
-			else if(queries[i].status == QUERY_GRAVITY)
-			{
-				// Blocked using server=/.../ rule
-				counters.blocked++;
-				overTime[timeidx].blocked++;
-				domains[domainID].blockedcount++;
-				clients[clientID].blockedcount++;
-			}
+			overTime[timeidx].cached++;
 
 			// Save reply type and update individual reply counters
 			save_reply_type(flags, i, response);
@@ -451,7 +433,7 @@ void FTL_reply(unsigned short flags, char *name, struct all_addr *addr, int id)
 	}
 	else if(flags & F_FORWARD)
 	{
-		// Search for corresponding query indentified by dnsmasq's ID
+		// Search for corresponding query identified by dnsmasq's ID
 		bool found = false;
 		int i;
 
@@ -535,6 +517,8 @@ void FTL_cache(unsigned int flags, char *name, struct all_addr *addr, char *arg,
 		// or
 		// DHCP server reply
 		// or
+		// regex blocked query
+		// or
 		// cached answer to previously forwarded request
 
 		// Determine requesttype
@@ -568,7 +552,6 @@ void FTL_cache(unsigned int flags, char *name, struct all_addr *addr, char *arg,
 			// Check UUID of this query
 			if(queries[i].id == id)
 			{
-				queries[i].status = requesttype;
 				found = true;
 				break;
 			}
@@ -598,6 +581,12 @@ void FTL_cache(unsigned int flags, char *name, struct all_addr *addr, char *arg,
 			int clientID = queries[i].clientID;
 			validate_access("clients", clientID, true, __LINE__, __FUNCTION__, __FILE__);
 
+			// Mark this query as blocked if domain was matched by a regex
+			if(domains[domainID].regexmatch == REGEX_BLOCKED)
+				requesttype = QUERY_GRAVITY;
+
+			queries[i].status = requesttype;
+
 			// Handle counters accordingly
 			switch(requesttype)
 			{
@@ -996,7 +985,8 @@ static void block_single_domain(char *domain)
 	if((cache4 = malloc(sizeof(struct crec) + strlen(domain)+1-SMALLDNAME)))
 	{
 		strcpy(cache4->name.sname, domain);
-		cache4->flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4 | F_NEG | F_NXDOMAIN;
+		// Serve NXDOMAIN both for IPv4 and IPv6 requests of this domain
+		cache4->flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4 | F_IPV6 | F_NEG | F_NXDOMAIN;
 		cache4->ttd = daemon->local_ttl;
 		add_hosts_entry(cache4, &addr4, INADDRSZ, 0, NULL, 0);
 	}
diff --git a/gc.c b/gc.c
index 9e8d825f..26a125e5 100644
--- a/gc.c
+++ b/gc.c
@@ -97,12 +97,6 @@ void *GC_thread(void *val)
 						counters.cached--;
 						overTime[timeidx].cached--;
 						break;
-					case QUERY_WILDCARD:
-						counters.wildcardblocked--;
-						overTime[timeidx].blocked--;
-						domains[domainID].blockedcount--;
-						clients[clientID].blockedcount--;
-						break;
 					case QUERY_BLACKLIST:
 						// Blocked by user's black list
 						counters.blocked--;
diff --git a/log.c b/log.c
index 09512d0d..6a0dc0f5 100644
--- a/log.c
+++ b/log.c
@@ -135,7 +135,7 @@ void log_counter_info(void)
 	logg(" -> Cached DNS queries: %i", counters.cached);
 	logg(" -> Forwarded DNS queries: %i", counters.forwardedqueries);
 	logg(" -> Exactly blocked DNS queries: %i", counters.blocked);
-	logg(" -> Wildcard blocked DNS queries: %i", counters.wildcardblocked);
+	logg(" -> Regex blocked DNS queries: %i", counters.regex);
 	logg(" -> Unknown DNS queries: %i", counters.unknown);
 	logg(" -> Unique domains: %i", counters.domains);
 	logg(" -> Unique clients: %i", counters.clients);