Update firewall

- Fix export rules - Better country list
Quentium-Forks · May 9, 2023 · 8024daf · 8024daf
1 parent 9a9795e
commit 8024daf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/firewall/country.txt b/firewall/country.txt
@@ -53,7 +53,7 @@
     },
     {
         "CH": "India",
-        "brief": "IN "
+        "brief": "IN"
     },
     {
         "CH": "Taiwan Province",
@@ -133,7 +133,7 @@
     },
     {
         "CH": "Iran",
-        "brief": "I R"
+        "brief": "IR"
     },
     {
         "CH": "Hong Kong, China",
@@ -232,7 +232,7 @@
         "brief": "SC"
     },
     {
-        "CH": "Tunisia ",
+        "CH": "Tunisia",
         "brief": "TN"
     },
     {
@@ -320,7 +320,7 @@
         "brief": "GE"
     },
     {
-        "CH": "Angola ",
+        "CH": "Angola",
         "brief": "AO"
     },
     {
@@ -428,7 +428,7 @@
         "brief": "LB"
     },
     {
-        "CH": "Nepal ",
+        "CH": "Nepal",
         "brief": "NP"
     },
     {
@@ -472,7 +472,7 @@
         "brief": "LY"
     },
     {
-        "CH": "Kyrgyzstan ",
+        "CH": "Kyrgyzstan",
         "brief": "KG"
     },
     {
@@ -516,7 +516,7 @@
         "brief": "MN"
     },
     {
-        "CH": "Brunei ",
+        "CH": "Brunei",
         "brief": "BN"
     },
     {
@@ -789,7 +789,7 @@
     },
     {
         "CH": "Vanuatu",
-        "brief": "VU "
+        "brief": "VU"
     },
     {
         "CH": "Martinique",
@@ -853,7 +853,7 @@
     },
     {
         "CH": "Cook Islands",
-        "brief": "CK "
+        "brief": "CK"
     },
     {
         "CH": "Federated States of Micronesia",
@@ -901,7 +901,7 @@
     },
     {
         "CH": "British Indian Ocean Territory",
-        "brief": "IO "
+        "brief": "IO"
     },
     {
         "CH": "Tokelau",
@@ -940,7 +940,7 @@
         "brief": "LC"
     },
     {
-        "CH": "Saint Barthelemy ",
+        "CH": "Saint Barthelemy",
         "brief": "BL"
     }
 ]
diff --git a/firewall/firewall_main.py b/firewall/firewall_main.py
@@ -1479,7 +1479,10 @@ def get_file(self,args):
         filename = args.filename
         mimetype = "application/octet-stream"
         if not os.path.exists(filename): return abort(404)
-        return send_file(filename, mimetype=mimetype, as_attachment=True, attachment_filename=os.path.basename(filename), cache_timeout=0)
+        #return send_file(filename, mimetype=mimetype, as_attachment=True, attachment_filename=os.path.basename(filename), cache_timeout=0)
+        return send_file(filename, mimetype=mimetype, as_attachment=True,
+                         download_name=os.path.basename(filename),
+                         max_age=0)
 
     # 规则导入：json
     def import_rules(self, get):

diff --git a/firewall/info.json b/firewall/info.json
@@ -1,9 +1,9 @@
 {
-  "title": "SYS Firewall",
-  "name": "firewall",
-  "ps": "Provide GUI management function of system firewall (iptables/firewall/ufw)",
-  "versions": "2.7",
-  "checks": "/www/server/panel/plugin/firewall",
-  "author": "official",
-  "home": "https://www.aapanel.com"
+	"title": "SYS Firewall",
+	"name": "firewall",
+	"ps": "Provide GUI management function of system firewall (iptables/firewall/ufw)",
+	"versions": "2.8",
+	"checks": "/www/server/panel/plugin/firewall",
+	"author": "official",
+	"home": "https://www.aapanel.com"
 }