oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev3748, Fix content filter for non existing domains

Browse source
This commit is contained in:
shortcutme 2019-01-05 19:07:27 +01:00
parent 1ab9bc40a5
commit 4c675b8311
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/ContentFilter/ContentFilterPlugin.py
View file

@ -188,7 +188,11 @@ class UiRequestPlugin(object):
if self.server.site_manager.isDomain(address): if self.server.site_manager.isDomain(address):
address = self.server.site_manager.resolveDomain(address) address = self.server.site_manager.resolveDomain(address)
address_sha256 = "0x" + hashlib.sha256(address).hexdigest() if address:
address_sha256 = "0x" + hashlib.sha256(address).hexdigest()
else:
address_sha256 = None
if filter_storage.isSiteblocked(address) or filter_storage.isSiteblocked(address_sha256): if filter_storage.isSiteblocked(address) or filter_storage.isSiteblocked(address_sha256):
site = self.server.site_manager.get(config.homepage) site = self.server.site_manager.get(config.homepage)
if not extra_headers: if not extra_headers:

2
src/Config.py
View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.6.4" self.version = "0.6.4"
self.rev = 3747 self.rev = 3748
self.argv = argv self.argv = argv
self.action = None self.action = None
self.pending_changes = {} self.pending_changes = {}