chg: [tools] fix generate vpn uri

pull/212/head
Alexandre Dulaunoy 2022-03-31 13:47:25 +02:00
parent 6c9dcc04ad
commit cbb5c8f6a7
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
1 changed files with 6 additions and 6 deletions

View File

@ -6,9 +6,9 @@ from generator import process_stream, get_version, write_to_file, consolidate_ne
def process(url, dst): def process(url, dst):
warninglist = { warninglist = {
'name': 'Specialized list of {} addresses belonging to common VPN providers and datacenters'.format(dst.split('-')[1].replace('ip', 'IP')), 'name': 'Specialized list of {} addresses belonging to common VPN providers and datacenters'.format(dst),
'version': get_version(), 'version': get_version(),
'description': 'Specialized list of {} addresses belonging to common VPN providers and datacenters'.format(dst.split('-')[1].replace('ip', 'IP')), 'description': 'Specialized list of {} addresses belonging to common VPN providers and datacenters'.format(dst),
'list': consolidate_networks(process_stream(url)), 'list': consolidate_networks(process_stream(url)),
'type': 'cidr', 'type': 'cidr',
'matching_attributes': ["ip-src", "ip-dst", "domain|ip"] 'matching_attributes': ["ip-src", "ip-dst", "domain|ip"]
@ -18,10 +18,10 @@ def process(url, dst):
if __name__ == '__main__': if __name__ == '__main__':
vpn_base_url_v4 = 'https://raw.githubusercontent.com/X4BNet/lists_vpn/main/vpn-ipv4.txt' vpn_base_url_v4 = 'https://raw.githubusercontent.com/X4BNet/lists_vpn/main/ipv4.txt'
vpn_base_url_v6 = 'https://raw.githubusercontent.com/ejrv/VPNs/master/vpn-ipv6.txt' vpn_base_url_v6 = 'https://raw.githubusercontent.com/ejrv/VPNs/master/vpn-ipv6.txt'
vpns = ['https://raw.githubusercontent.com/X4BNet/lists_vpn/main/ipv4.txt', 'https://raw.githubusercontent.com/ejrv/VPNs/master/vpn-ipv6.txt']
for url in [vpn_base_url_v4, vpn_base_url_v6]: for url in vpns:
uri = url.split('/')[-1] uri = url.split('/')[-1]
uri.split('-')[1].replace('ip', 'IP') uri.split('.')[0]
process(url, uri) process(url, uri)