Basic functionality implemented
This commit is contained in:
commit
700d8ceafc
|
@ -0,0 +1,4 @@
|
||||||
|
@REM This script is used to load environment variables from .envrc file
|
||||||
|
@echo off
|
||||||
|
for /f "delims=" %%a in ('type .envrc') do set %%a
|
||||||
|
echo %ENV_VAR
|
|
@ -0,0 +1,2 @@
|
||||||
|
export CLOUDFLARE_ACCOUNT_ID=
|
||||||
|
export CLOUDFLARE_TOKEN=
|
|
@ -0,0 +1,3 @@
|
||||||
|
.envrc
|
||||||
|
__pycache__/
|
||||||
|
tmp.txt
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,88 @@
|
||||||
|
import os
|
||||||
|
import requests
|
||||||
|
import utils
|
||||||
|
import pathlib
|
||||||
|
|
||||||
|
# Load environment variables
|
||||||
|
TOKEN = utils.load_env()['CLOUDFLARE_TOKEN']
|
||||||
|
ACCOUNT_ID = utils.load_env()['CLOUDFLARE_ACCOUNT_ID']
|
||||||
|
|
||||||
|
def get_blocklists():
|
||||||
|
# __file__ is a special variable that is the path to the current file
|
||||||
|
list_directory = pathlib.Path(__file__).parent.parent.joinpath('blocklists')
|
||||||
|
for file in list_directory.iterdir():
|
||||||
|
blocklists = utils.convert_to_list(file)
|
||||||
|
return blocklists
|
||||||
|
|
||||||
|
def apply_whitelists(blocklists):
|
||||||
|
for filename in os.listdir('./whitelists'):
|
||||||
|
with open(os.path.join('./whitelists', filename), 'r') as f:
|
||||||
|
whitelist = f.readlines()
|
||||||
|
whitelist = [x.strip() for x in whitelist]
|
||||||
|
blocklists = [x for x in blocklists if x not in whitelist]
|
||||||
|
return blocklists
|
||||||
|
|
||||||
|
def split_list(blocklists):
|
||||||
|
lists = []
|
||||||
|
lists.extend([blocklists[i:i + 1000] for i in range(0, len(blocklists), 1000)]) # This is the same as the for loop below
|
||||||
|
# for i in range(0, len(blocklists), 1000):
|
||||||
|
# # This is appending a list of 1000 domains to the lists list. It is doing this by slicing the blocklists list to get the first 1000 domains, then the next 1000 domains, etc.
|
||||||
|
# lists.append(blocklists[i:i + 1000])
|
||||||
|
return lists
|
||||||
|
|
||||||
|
def upload_to_cloudflare(lists):
|
||||||
|
# A: It's iterating over the lists and uploading them to Cloudflare, the enumerate function is used to get the index of the list since lists is a list of lists
|
||||||
|
for i, lst in enumerate(lists):
|
||||||
|
list_name = f'adblock-list-{i + 1}'
|
||||||
|
url = f'https://api.cloudflare.com/client/v4/accounts/{ACCOUNT_ID}/gateway/lists'
|
||||||
|
headers = {
|
||||||
|
'Authorization': f'Bearer {TOKEN}',
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
}
|
||||||
|
# For debugging:
|
||||||
|
with open('lists.txt', 'w') as f:
|
||||||
|
f.write(str([{'value': x,} for x in lst[:10]]))
|
||||||
|
# exit()
|
||||||
|
data = {
|
||||||
|
'name': list_name,
|
||||||
|
'type': 'DOMAIN',
|
||||||
|
'description': 'A blocklist of ad domains',
|
||||||
|
# Writing this program, I have noticed how powerful list comprehension is.
|
||||||
|
'items': [{'value': x,} for x in lst]}
|
||||||
|
response = requests.post(url, headers=headers, json=data)
|
||||||
|
print(f'Uploaded {list_name} to Cloudflare')
|
||||||
|
if response.status_code != 200:
|
||||||
|
print(f'Error uploading {list_name}: {response.text}')
|
||||||
|
def create_dns_policy(lists):
|
||||||
|
url = f'https://api.cloudflare.com/client/v4/accounts/{ACCOUNT_ID}/gateway/rules'
|
||||||
|
headers = {
|
||||||
|
'Authorization': f'Bearer {TOKEN}',
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
# Construct the traffic string
|
||||||
|
traffic = ''
|
||||||
|
for i, lst in enumerate(lists):
|
||||||
|
if i != 0:
|
||||||
|
# ' or ' cannot be seen in the Zero Trs Dashboard
|
||||||
|
traffic += ' or '
|
||||||
|
traffic += f'any(dns.domains[*] in ${lst["id"]})'
|
||||||
|
print(traffic)
|
||||||
|
data = {
|
||||||
|
'name': 'Block Ads',
|
||||||
|
'description': 'Block ad domains',
|
||||||
|
'action': 'block',
|
||||||
|
'traffic': traffic,
|
||||||
|
}
|
||||||
|
response = requests.post(url, headers=headers, json=data)
|
||||||
|
if response.status_code != 200:
|
||||||
|
print(f'Error creating DNS policy: {response.text}')
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
blocklists = get_blocklists()
|
||||||
|
blocklists = apply_whitelists(blocklists)
|
||||||
|
lists = split_list(blocklists)
|
||||||
|
upload_to_cloudflare(lists)
|
||||||
|
cloud_lists = utils.get_lists()
|
||||||
|
cloud_lists = utils.filter_adblock_lists(cloud_lists)
|
||||||
|
create_dns_policy(cloud_lists)
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
# This is a scriprt to undo the changes made by adblock-zerotrust.py
|
||||||
|
|
||||||
|
import requests
|
||||||
|
import os
|
||||||
|
import utils
|
||||||
|
|
||||||
|
# Load environment variables
|
||||||
|
TOKEN = utils.load_env()['CLOUDFLARE_TOKEN']
|
||||||
|
ACCOUNT_ID = utils.load_env()['CLOUDFLARE_ACCOUNT_ID']
|
||||||
|
|
||||||
|
|
||||||
|
def delete_adblock_list(lists: dict):
|
||||||
|
for lst in lists:
|
||||||
|
url = f'https://api.cloudflare.com/client/v4/accounts/{ACCOUNT_ID}/gateway/lists/{lst["id"]}'
|
||||||
|
headers = {
|
||||||
|
'Authorization': f'Bearer {TOKEN}',
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
}
|
||||||
|
response = requests.delete(url, headers=headers)
|
||||||
|
if response.status_code != 200:
|
||||||
|
print(f'Error deleting list: {response.text}')
|
||||||
|
else:
|
||||||
|
print(f'Deleted list {lst["name"]}')
|
||||||
|
def main():
|
||||||
|
lists = utils.get_lists()
|
||||||
|
lists = utils.filter_adblock_lists(lists)
|
||||||
|
delete_adblock_list(lists)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
|
@ -0,0 +1,55 @@
|
||||||
|
import pathlib
|
||||||
|
import os
|
||||||
|
import requests
|
||||||
|
from dotenv import load_dotenv
|
||||||
|
|
||||||
|
# List Utils
|
||||||
|
|
||||||
|
# Convert a hosts file to a simple hostname list
|
||||||
|
def convert_to_list(file:pathlib.Path) -> list:
|
||||||
|
with open(file, 'r') as f:
|
||||||
|
# Don't read commented lines; strip whitespace; remove 127.0.0.1 from beginning of line; ignore lines with "localhost"; ignore lines with "::1"; ignore newlines blocklists.extend([i[10:].strip() for i in f.readlines() if not i.startswith('#') and 'localhost' not in i and '::1' not in i])
|
||||||
|
hosts = ([i[10:].strip() for i in f.readlines() if not i.startswith('#') and 'localhost' not in i and '::1' not in i])
|
||||||
|
# Equivalent to:
|
||||||
|
# for x in f.readlines():
|
||||||
|
# if not x.startswith('#') and 'localhost' not in x and '::1' not in x:
|
||||||
|
# hosts.append(x[10:].strip())
|
||||||
|
# If there are any empty strings in the list, remove them since for some reason, whitespace is stil in the list
|
||||||
|
hosts = [i for i in hosts if i != '']
|
||||||
|
return hosts
|
||||||
|
|
||||||
|
# General Utils
|
||||||
|
|
||||||
|
# Load environment variables
|
||||||
|
def load_env() -> dict:
|
||||||
|
load_dotenv(".env")
|
||||||
|
if not os.environ.get('CLOUDFLARE_TOKEN') and not os.environ.get('CLOUDFLARE_ACCOUNT_ID'):
|
||||||
|
load_dotenv(".envrc")
|
||||||
|
if not os.environ.get('CLOUDFLARE_TOKEN') or not os.environ.get('CLOUDFLARE_ACCOUNT_ID'):
|
||||||
|
print('No environment variables found. Please create a .env file or .envrc file')
|
||||||
|
exit()
|
||||||
|
else:
|
||||||
|
return {"CLOUDFLARE_TOKEN": os.environ.get('CLOUDFLARE_TOKEN'), "CLOUDFLARE_ACCOUNT_ID": os.environ.get('CLOUDFLARE_ACCOUNT_ID')}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def get_lists() -> dict:
|
||||||
|
url = f'https://api.cloudflare.com/client/v4/accounts/{ACCOUNT_ID}/gateway/lists'
|
||||||
|
headers = {
|
||||||
|
'Authorization': f'Bearer {TOKEN}',
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
}
|
||||||
|
response = requests.get(url, headers=headers)
|
||||||
|
if response.status_code != 200:
|
||||||
|
print(f'Error getting lists: {response.text}')
|
||||||
|
return response.json()['result']
|
||||||
|
|
||||||
|
def filter_adblock_lists(lists: dict) -> dict:
|
||||||
|
adblock_lists = []
|
||||||
|
for lst in lists:
|
||||||
|
if lst['name'].startswith('adblock-list') and lst['type'] == 'DOMAIN':
|
||||||
|
adblock_lists.append(lst)
|
||||||
|
return adblock_lists
|
||||||
|
|
||||||
|
TOKEN = load_env()['CLOUDFLARE_TOKEN']
|
||||||
|
ACCOUNT_ID = load_env()['CLOUDFLARE_ACCOUNT_ID']
|
Loading…
Reference in New Issue