Skip to content
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.

Sign up for GitHub

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

Fix for the Abuse_Finder and Fortiguard #541

Merged
merged 4 commits into from
Dec 25, 2019
Merged

Fix for the Abuse_Finder and Fortiguard #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62d2dc4
Merge pull request #1 from TheHive-Project/master
phpsystems Oct 3, 2019
3bae7fe
Fix for issue #493
phpsystems Oct 9, 2019
6440529
Adding FQDN support to Abuse Finder #350
phpsystems Oct 9, 2019
9dab066
Addition of FQDN to C1fApp
phpsystems Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion analyzers/Abuse_Finder/Abuse_Finder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "https://github.com/TheHive-Project/Cortex-Analyzers",
"license": "AGPL-V3",
"description": "Find abuse contacts associated with domain names, URLs, IPs and email addresses.",
"dataTypeList": ["ip", "domain", "url", "mail"],
"dataTypeList": ["ip", "domain", "fqdn", "url", "mail"],
"baseConfig": "Abuse_Finder",
"command": "Abuse_Finder/abusefinder.py"
}
2 changes: 2 additions & 0 deletions analyzers/Abuse_Finder/abusefinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def abuse(self):
return ip_abuse(self.get_data())
elif self.data_type == "domain":
return domain_abuse(self.get_data())
elif self.data_type == "fqdn":
return domain_abuse(self.get_data())
elif self.data_type == "mail":
return email_abuse(self.get_data())
elif self.data_type == "url":
Expand Down
2 changes: 1 addition & 1 deletion analyzers/C1fApp/C1fApp_osint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"url": "https://github.com/TheHive-Project/Cortex-Analyzers",
"license": "AGPL-V3",
"description": "Query C1fApp OSINT Aggregator for IPs, domains and URLs",
"dataTypeList": ["url", "domain", "ip"],
"dataTypeList": ["url", "domain", "fqdn", "ip"],
"baseConfig": "C1fApp",
"command": "C1fApp/cifquery.py",
"configurationItems": [
Expand Down
1 change: 1 addition & 0 deletions analyzers/C1fApp/cifquery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def cleanup(return_data):
asn_descs.append(entry.get('asn_desc'))
countries.append(entry.get('country'))
domains.append(entry.get('domain'))
domains.append(entry.get('fqdn'))
dga_indication = entry.get('dga')

if len(list(entry.get('ip_address'))) > 0:
Expand Down
2 changes: 1 addition & 1 deletion analyzers/Fortiguard/urlcategory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def run(self):

if self.data_type == 'domain' or self.data_type == 'url' or self.data_type == 'fqdn':
try:
pattern = re.compile("(?:Category: )([\w\s]+)")
pattern = re.compile("(?:Category: )([-\w\s]+)")
baseurl = 'https://www.fortiguard.com/webfilter?q='
url = baseurl + self.get_data()
req = requests.get(url)
Expand Down