jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(block): allow reading from multiple external sources

Browse source 
should be backward compatible if configured as a string already
This commit is contained in:
Iain Learmonth 2023-05-16 16:28:53 +01:00
parent 0f537c888d
commit b3012f66c1
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/terraform/block_external.py
View file

@ -35,7 +35,16 @@ class BlockExternalAutomation(BlockMirrorAutomation):
def fetch(self) -> None: def fetch(self) -> None:
user_agent = {'User-agent': 'BypassCensorship/1.0'} user_agent = {'User-agent': 'BypassCensorship/1.0'}
self._data = requests.get(app.config['EXTERNAL_CHECK_URL'], headers=user_agent, timeout=30).json() if isinstance(app.config.get('EXTERNAL_CHECK_URL', []), list):
check_urls = app.config['EXTERNAL_CHECK_URL']
elif isinstance(app.config.get('EXTERNAL_CHECK_URL'), str):
check_urls = [app.config['EXTERNAL_CHECK_URL']]
else:
check_urls = []
for check_url in check_urls:
if self._data is None:
self._data = []
self._data.extend(requests.get(check_url, headers=user_agent, timeout=30).json())
def parse(self) -> None: def parse(self) -> None:
self.patterns.extend(["https://" + trim_http_https(pattern) for pattern in self._data]) self.patterns.extend(["https://" + trim_http_https(pattern) for pattern in self._data])