-
-
Notifications
You must be signed in to change notification settings - Fork 440
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adguard dns analyzer, closes #1361 #2363
Merged
Merged
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
a2112fb
adguard
625419f
adguard
aecfefc
bad query
9451389
ok
1532b9d
tests
185d2f8
adguard works now :p
2c9103b
adguard
fdbde86
docs+mign
15657cd
ci
323af6b
ci
5883152
ci
26f1627
tests
8621aca
ci
bdeb978
ci
325e314
playbook
c20d77d
ci try
6663f30
ci try
c435bf8
Merge branch 'develop' of https://github.com/intelowlproject/IntelOwl…
27da5f0
mign
18d5bff
mign
dd8f379
Merge branch 'develop' of https://github.com/intelowlproject/IntelOwl…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
117 changes: 117 additions & 0 deletions
117
api_app/analyzers_manager/migrations/0101_analyzer_config_adguard.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,117 @@ | ||
from django.db import migrations | ||
from django.db.models.fields.related_descriptors import ( | ||
ForwardManyToOneDescriptor, | ||
ForwardOneToOneDescriptor, | ||
ManyToManyDescriptor, | ||
) | ||
|
||
plugin = { | ||
"python_module": { | ||
"health_check_schedule": None, | ||
"update_schedule": None, | ||
"module": "dns.dns_malicious_detectors.adguard.AdGuard", | ||
"base_path": "api_app.analyzers_manager.observable_analyzers", | ||
}, | ||
"name": "AdGuard", | ||
"description": "[Adguard](https://github.com/AdguardTeam/AdguardSDNSFilter), a filter composed of several other filters (AdGuard Base filter, Social media filter, Tracking Protection filter, Mobile Ads filter, EasyList and EasyPrivacy) and simplified specifically to be better compatible with DNS-level ad blocking.", | ||
"disabled": False, | ||
"soft_time_limit": 30, | ||
"routing_key": "default", | ||
"health_check_status": True, | ||
"type": "observable", | ||
"docker_based": False, | ||
"maximum_tlp": "AMBER", | ||
"observable_supported": ["url", "domain"], | ||
"supported_filetypes": [], | ||
"run_hash": False, | ||
"run_hash_type": "", | ||
"not_supported_filetypes": [], | ||
"model": "analyzers_manager.AnalyzerConfig", | ||
} | ||
|
||
params = [] | ||
|
||
values = [] | ||
|
||
|
||
def _get_real_obj(Model, field, value): | ||
def _get_obj(Model, other_model, value): | ||
if isinstance(value, dict): | ||
real_vals = {} | ||
for key, real_val in value.items(): | ||
real_vals[key] = _get_real_obj(other_model, key, real_val) | ||
value = other_model.objects.get_or_create(**real_vals)[0] | ||
# it is just the primary key serialized | ||
else: | ||
if isinstance(value, int): | ||
if Model.__name__ == "PluginConfig": | ||
value = other_model.objects.get(name=plugin["name"]) | ||
else: | ||
value = other_model.objects.get(pk=value) | ||
else: | ||
value = other_model.objects.get(name=value) | ||
return value | ||
|
||
if ( | ||
type(getattr(Model, field)) | ||
in [ForwardManyToOneDescriptor, ForwardOneToOneDescriptor] | ||
and value | ||
): | ||
other_model = getattr(Model, field).get_queryset().model | ||
value = _get_obj(Model, other_model, value) | ||
elif type(getattr(Model, field)) in [ManyToManyDescriptor] and value: | ||
other_model = getattr(Model, field).rel.model | ||
value = [_get_obj(Model, other_model, val) for val in value] | ||
return value | ||
|
||
|
||
def _create_object(Model, data): | ||
mtm, no_mtm = {}, {} | ||
for field, value in data.items(): | ||
value = _get_real_obj(Model, field, value) | ||
if type(getattr(Model, field)) is ManyToManyDescriptor: | ||
mtm[field] = value | ||
else: | ||
no_mtm[field] = value | ||
try: | ||
o = Model.objects.get(**no_mtm) | ||
except Model.DoesNotExist: | ||
o = Model(**no_mtm) | ||
o.full_clean() | ||
o.save() | ||
for field, value in mtm.items(): | ||
attribute = getattr(o, field) | ||
if value is not None: | ||
attribute.set(value) | ||
return False | ||
return True | ||
|
||
|
||
def migrate(apps, schema_editor): | ||
Parameter = apps.get_model("api_app", "Parameter") | ||
PluginConfig = apps.get_model("api_app", "PluginConfig") | ||
python_path = plugin.pop("model") | ||
Model = apps.get_model(*python_path.split(".")) | ||
if not Model.objects.filter(name=plugin["name"]).exists(): | ||
exists = _create_object(Model, plugin) | ||
if not exists: | ||
for param in params: | ||
_create_object(Parameter, param) | ||
for value in values: | ||
_create_object(PluginConfig, value) | ||
|
||
|
||
def reverse_migrate(apps, schema_editor): | ||
python_path = plugin.pop("model") | ||
Model = apps.get_model(*python_path.split(".")) | ||
Model.objects.get(name=plugin["name"]).delete() | ||
|
||
|
||
class Migration(migrations.Migration): | ||
atomic = False | ||
dependencies = [ | ||
("api_app", "0062_alter_parameter_python_module"), | ||
("analyzers_manager", "0100_analyzer_config_downloadfilefromuri"), | ||
] | ||
|
||
operations = [migrations.RunPython(migrate, reverse_migrate)] |
92 changes: 92 additions & 0 deletions
92
api_app/analyzers_manager/observable_analyzers/dns/dns_malicious_detectors/adguard.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
import base64 | ||
import logging | ||
from typing import List | ||
from urllib.parse import urlparse | ||
|
||
import dns.message | ||
import requests | ||
from dns.rrset import RRset | ||
|
||
from api_app.analyzers_manager import classes | ||
|
||
from ..dns_responses import malicious_detector_response | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class AdGuard(classes.ObservableAnalyzer): | ||
"""Check if a domain is malicious by AdGuard public resolver.""" | ||
|
||
url = "https://dns.adguard-dns.com/dns-query" | ||
|
||
def update(self) -> bool: | ||
pass | ||
|
||
# We make DOH(DNS over http) query out of the observable | ||
# Mainly done using the wire format of the query | ||
# ref: https://datatracker.ietf.org/doc/html/rfc8484 | ||
@staticmethod | ||
def encode_query(observable: str) -> str: | ||
logger.info(f"Encoding query for {observable}") | ||
query = dns.message.make_query(observable, "A") | ||
wire_query = query.to_wire() | ||
encoded_query = ( | ||
base64.urlsafe_b64encode(wire_query).rstrip(b"=").decode("ascii") | ||
) | ||
logger.info(f"Encoded query: {encoded_query}") | ||
return encoded_query | ||
|
||
def filter_query(self, encoded_query: str) -> List[RRset]: | ||
logger.info( | ||
f"Sending filtered request to AdGuard DNS API for query: {encoded_query}" | ||
) | ||
r_filtered = requests.get( | ||
url=f"{self.url}?dns={encoded_query}", | ||
headers={"accept": "application/dns-message"}, | ||
) | ||
logger.info(f"Received r_filtered from AdGuard DNS API: {r_filtered.content}") | ||
r_filtered.raise_for_status() | ||
return dns.message.from_wire(r_filtered.content).answer | ||
|
||
@staticmethod | ||
def check_a(observable: str, a_filtered: List[RRset]) -> dict: | ||
# adguard follows 2 patterns for malicious domains, | ||
# it either redirects the request to ad-block.dns.adguard.com | ||
# or it sinkholes the request (to 0.0.0.0). | ||
# If the response contains neither of these, | ||
# we can safely say the domain is not malicious | ||
for ans in a_filtered: | ||
if str(ans.name) == "ad-block.dns.adguard.com.": | ||
g4ze marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return malicious_detector_response( | ||
observable=observable, malicious=True | ||
) | ||
|
||
if any(str(data) == "0.0.0.0" for data in ans): # nosec B104 | ||
return malicious_detector_response( | ||
observable=observable, malicious=True | ||
) | ||
|
||
return malicious_detector_response(observable=observable, malicious=False) | ||
|
||
def run(self): | ||
logger.info(f"Running AdGuard DNS analyzer for {self.observable_name}") | ||
observable = self.observable_name | ||
# for URLs we are checking the relative domain | ||
if self.observable_classification == self.ObservableTypes.URL: | ||
logger.info(f"Extracting domain from URL {observable}") | ||
observable = urlparse(self.observable_name).hostname | ||
encoded_query = self.encode_query(observable) | ||
a_filtered = self.filter_query(encoded_query) | ||
|
||
if not a_filtered: | ||
# dont need to check unfiltered if filtered is empty | ||
# as filter responds even if the domain is not malicious | ||
# and recognised by adguard | ||
logger.info(f"Filtered response is empty for {self.observable_name}") | ||
return malicious_detector_response( | ||
observable=observable, | ||
malicious=False, | ||
note="No response from AdGuard DNS API", | ||
) | ||
|
||
return self.check_a(observable, a_filtered) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
api_app/playbooks_manager/migrations/0049_add_adguard_to_free_to_use.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# This file is a part of IntelOwl https://github.com/intelowlproject/IntelOwl | ||
# See the file 'LICENSE' for copying permission. | ||
|
||
|
||
from django.db import migrations | ||
|
||
|
||
def migrate(apps, schema_editor): | ||
playbook_config = apps.get_model("playbooks_manager", "PlaybookConfig") | ||
AnalyzerConfig = apps.get_model("analyzers_manager", "AnalyzerConfig") | ||
pc = playbook_config.objects.get(name="FREE_TO_USE_ANALYZERS") | ||
pc.analyzers.add(AnalyzerConfig.objects.get(name="AdGuard").id) | ||
pc.full_clean() | ||
pc.save() | ||
|
||
|
||
def reverse_migrate(apps, schema_editor): | ||
playbook_config = apps.get_model("playbooks_manager", "PlaybookConfig") | ||
AnalyzerConfig = apps.get_model("analyzers_manager", "AnalyzerConfig") | ||
pc = playbook_config.objects.get(name="FREE_TO_USE_ANALYZERS") | ||
pc.analyzers.remove(AnalyzerConfig.objects.get(name="AdGuard").id) | ||
pc.full_clean() | ||
pc.save() | ||
|
||
|
||
class Migration(migrations.Migration): | ||
dependencies = [ | ||
("playbooks_manager", "0048_playbook_config_download_file"), | ||
("analyzers_manager", "0101_analyzer_config_adguard"), | ||
] | ||
|
||
operations = [ | ||
migrations.RunPython(migrate, reverse_migrate), | ||
] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ah I forgot to ask you another thing: can you add it in the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, will do that in a while! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is there a link explaining this or you found it from your personal tries?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Personal tries
Queried both the links with good and bad domains.