i11th/ruantiblock_openwrt
1
0
Fork 0
mirror of https://github.com/gSpotx2f/ruantiblock_openwrt.git synced 2026-05-14 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

v0.9.5. Changes for rublacklist API v3

Browse Source
This commit is contained in:
gSpot
2022-12-25 19:45:07 +03:00
parent 06131d3aca
commit 83918288f1
9 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruantiblock-mod-py/Makefile
+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ruantiblock-mod-py
PKG_VERSION:=0.9.4
PKG_RELEASE:=2
PKG_VERSION:=0.9.5
PKG_RELEASE:=0
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
include $(INCLUDE_DIR)/package.mk
ruantiblock-mod-py/files/usr/libexec/ruantiblock/ruab_parser.py
+12 -6
View File
@@ -372,14 +372,16 @@ class RblFQDN(BlackListParser):
def __init__(self):
super().__init__()
self.url = self.RBL_ALL_URL
self.fields_separator = "],"
self.ips_separator = ","
self.records_separator = '{"authority": '
self.ips_separator = ", "
def parser_func(self):
for entry in self._split_entries():
entry_list = entry.partition(self.fields_separator)
ip_string = re.sub(r"[' \]\[]", "", entry_list[0])
fqdn_string = re.sub(",.*$", "", entry_list[2])
res = re.search(r'"domains": \["?(.*?)"?\].*?"ips": \[([a-f0-9/.:", ]*)\]', entry)
if not res:
continue
ip_string = res.group(2).replace('"', "")
fqdn_string = res.group(1)
if fqdn_string:
try:
self.fqdn_field_processing(fqdn_string)
@@ -393,10 +395,11 @@ class RblIp(BlackListParser):
def __init__(self):
super().__init__()
self.url = self.RBL_IP_URL
self.records_separator = ","
def parser_func(self):
for entry in self._split_entries():
self.ip_field_processing(entry.rstrip(","))
self.ip_field_processing(re.sub(r'[\[\]" ]', "", entry))
class ZiFQDN(BlackListParser):
@@ -450,6 +453,7 @@ class AfIp(BlackListParser):
for entry in self._split_entries():
self.ip_field_processing(entry)
class RaFQDN(BlackListParser):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -474,6 +478,7 @@ class RaFQDN(BlackListParser):
self.download_config(self.url_stat, self.UPDATE_STATUS_FILE)
return 0
class RaIp(RaFQDN):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -481,6 +486,7 @@ class RaIp(RaFQDN):
self.url_dnsmasq = self.RA_IP_DMASK_URL
self.url_stat = self.RA_IP_STAT_URL
class WriteConfigFiles(Config):
def __init__(self):
self.write_buffer = -1