From 882ce9999323c62da75e2e5054fe981a8d0157d0 Mon Sep 17 00:00:00 2001
From: Sefinek <contact@sefinek.net>
Date: Mon, 7 Oct 2024 09:24:24 +0200
Subject: [PATCH] Fix RPZ #26

---
 scripts/generate/rpz.js | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/scripts/generate/rpz.js b/scripts/generate/rpz.js
index cd6ade14bc9..33e0c189f1c 100644
--- a/scripts/generate/rpz.js
+++ b/scripts/generate/rpz.js
@@ -18,16 +18,23 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklists/templ
 		// Content
 		const fileContent = await fs.readFile(thisFileName, 'utf8');
 
-		const seenDomains = new Set();
-		const [, domain] = fileContent.split(' ');
-		if (seenDomains.has(domain)) return;
-
-		const replacedFile = fileContent
-			.replaceAll(/^(?:127\.0\.0\.1|0\.0\.0\.0) (\S+)/gmu, (_, data) => {
-				const rootDomain = data.split('.').slice(-2).join('.');
-				seenDomains.add(rootDomain);
-				return `${rootDomain} CNAME .\n*.${rootDomain} CNAME .`;
-			})
+		const outputLines = fileContent
+			.split('\n')
+			.reduce((acc, line) => {
+				const match = line.match(/^(?:127\.0\.0\.1|0\.0\.0\.0) (\S+)/);
+				if (match) {
+					const domain = match[1];
+					const domainParts = domain.split('.');
+
+					if (domainParts.length > 2 && !acc.seenDomains.has(domain)) {
+						acc.seenDomains.add(domain);
+						acc.output.push(`${domain} CNAME .\n*.${domain} CNAME .`);
+					}
+				}
+				return acc;
+			}, { seenDomains: new Set(), output: [] });
+
+		const replacedFile = outputLines.output.join('\n')
 			.replaceAll(/#(?: ?127\.0\.0\.1| ?0\.0\.0\.0) |:: /gmu, '; ')
 			.replaceAll(/#/gmu, ';')
 			.replace(/〢 /g, '')
@@ -36,7 +43,10 @@ const convert = async (folderPath = path.join(__dirname, '../../blocklists/templ
 			.replace(/<LastUpdate>/gim, `${date.full} | ${date.now}`);
 
 		const fullNewFile = path.join(generatedPath, file.name);
-		await fs.writeFile(fullNewFile, `$TTL 300\n@ SOA localhost. root.localhost. ${date.timestamp} 43200 3600 259200 300\n  NS  localhost.\n;\n${replacedFile}`);
+		await fs.writeFile(
+			fullNewFile,
+			`$TTL 300\n@ SOA localhost. root.localhost. ${date.timestamp} 43200 3600 259200 300\n  NS  localhost.\n;\n${replacedFile}`
+		);
 
 		console.log(`✔️ ${cacheHash || file.name} ++ ${fullNewFile}`);
 	}));