From ba26e80e3141023eb2fb06cadb3e8b00eacc99cd Mon Sep 17 00:00:00 2001
From: KubaPro010 <kuba.pro010@gmail.com>
Date: Fri, 24 Jul 2026 20:52:17 +0200
Subject: [PATCH] ban countries and change url

---
 server/helpers.js | 29 +++++++++++++++++++++--------
 views/index.ejs   |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/server/helpers.js b/server/helpers.js
index 2679bb3..b533a28 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -167,13 +167,13 @@ function handleConnect(clientIp, currentUsers, ws, request, callback) {
   inFlightPromise.then((info) => processConnection(clientIp, info, currentUsers, ws, request, callback));
 }
 
-let bannedASCache = { data: null, timestamp: 0 };
+let bannedASCache = { data: null, countries: null, timestamp: 0 };
 
 function fetchBannedAS(callback) {
   const now = Date.now();
-  if (bannedASCache.data && now - bannedASCache.timestamp < 10 * 60 * 1000) return callback(bannedASCache.data);
+  if (bannedASCache.data && bannedASCache.countries && now - bannedASCache.timestamp < 10 * 60 * 1000) return callback(bannedASCache.data, bannedASCache.countries);
 
-  const req = https.get("https://flerken.zapto.org:5000/banned_as.json", { family: 4 }, (banResponse) => {
+  const req = https.get("https://data.fmtuner.net/banned_as.json", { family: 4 }, (banResponse) => {
     let banData = "";
 
     banResponse.on("data", (chunk) => banData += chunk);
@@ -181,11 +181,12 @@ function fetchBannedAS(callback) {
     banResponse.on("end", () => {
       try {
         const bannedAS = JSON.parse(banData).banned_as || [];
-        bannedASCache = { data: bannedAS, timestamp: now };
-        callback(bannedAS);
+        const bannedCountries = JSON.parse(banData).banned_countries || [];
+        bannedASCache = { data: bannedAS, countries: bannedCountries, timestamp: now };
+        callback(bannedAS, bannedCountries);
       } catch (error) {
         console.error("Error parsing banned AS list:", error);
-        callback([]); // Default to allowing user
+        callback(["*"], []); // Default to blocking the user
       }
     });
   });
@@ -209,8 +210,8 @@ function processConnection(clientIp, locationInfo, currentUsers, ws, request, ca
   const options = { year: "numeric", month: "numeric", day: "numeric", hour: "2-digit", minute: "2-digit" };
   const connectionTime = new Date().toLocaleString([], options);
 
-  fetchBannedAS((bannedAS) => {
-    if (bannedAS.some((as) => locationInfo.as?.includes(as))) {
+  fetchBannedAS((bannedAS, bannedCountries) => {
+    if ((bannedAS.some((as) => locationInfo.as?.includes(as))) || bannedAS.includes("*")) {
       const now = Date.now();
       const lastSeen = recentBannedIps.get(clientIp) || 0;
 
@@ -222,6 +223,18 @@ function processConnection(clientIp, locationInfo, currentUsers, ws, request, ca
       return callback("User banned");
     }
 
+    if (bannedCountries.some((c) => locationInfo.country?.includes(c))) {
+      const now = Date.now();
+      const lastSeen = recentBannedIps.get(clientIp) || 0;
+
+      if (now - lastSeen > 300 * 1000) {
+        consoleCmd.logWarn(`Banned country list client kicked (${clientIp})`);
+        recentBannedIps.set(clientIp, now);
+      }
+
+      return callback("User banned");
+    }
+
     const userLocation =
       locationInfo && locationInfo.country !== undefined
         ? [
diff --git a/views/index.ejs b/views/index.ejs
index b2c834b..faef2b3 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -19,7 +19,7 @@
 
   <meta property="og:title" content="FM-DX WebServer [<%= tunerName %>]">
   <meta property="og:type" content="website">
-  <meta property="og:image" content="https://flerken.zapto.org:5000/img/webserver_icon.png">
+  <meta property="og:image" content="https://data.fmtuner.net/img/webserver_icon.png">
   <meta property="og:description" content="Server description: <%= tunerDescMeta %>.">
 
   <!-- Audio streaming -->