diff --git a/contrib/report-templates/DNSDB_DomainName_1_1/long.html b/contrib/report-templates/DNSDB_DomainName_1_1/long.html
new file mode 100644
index 0000000000..cb1eb66e8e
--- /dev/null
+++ b/contrib/report-templates/DNSDB_DomainName_1_1/long.html
@@ -0,0 +1,46 @@
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+
+
+ DNSDB Domain Name History Report (RRSET)
+
+
+
+
+ # |
+ bailiwick |
+ count |
+ rdata |
+ rrname |
+ time first |
+ time last |
+
+
+
+
+ {{$index+1}} |
+ {{row.bailiwick}} |
+ {{row.count}} |
+
+ {{rdata}}
+ |
+ {{row.rrname}} |
+ {{(row.zone_time_first || row.time_first) | shortDate}} |
+ {{(row.zone_time_last || row.time_last) | shortDate}} |
+
+
+
+
+
diff --git a/contrib/report-templates/DNSDB_DomainName_1_1/short.html b/contrib/report-templates/DNSDB_DomainName_1_1/short.html
new file mode 100644
index 0000000000..f0ae84c374
--- /dev/null
+++ b/contrib/report-templates/DNSDB_DomainName_1_1/short.html
@@ -0,0 +1 @@
+DNSDB Domain Name: {{content.records}} records
diff --git a/contrib/report-templates/DNSDB_IPHistory_1_0/long.html b/contrib/report-templates/DNSDB_IPHistory_1_0/long.html
new file mode 100644
index 0000000000..5cb5ced89b
--- /dev/null
+++ b/contrib/report-templates/DNSDB_IPHistory_1_0/long.html
@@ -0,0 +1,43 @@
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+
+
+ DNSDB IP History Report
+ (Rdata IP)
+
+
+
+
+ # |
+ count |
+ rdata |
+ rrname |
+ rrtype |
+ time first |
+ time last |
+
+
+
+ {{$index + 1}} |
+ {{row.count}} |
+ {{row.rdata}} |
+ class="wrap"{{row.rrname}} |
+ {{row.rrtype}} |
+ {{(row.zone_time_first || row.time_first) | shortDate}} |
+ {{(row.zone_time_last || row.time_last) | shortDate}} |
+
+
+
+
diff --git a/contrib/report-templates/DNSDB_IPHistory_1_0/short.html b/contrib/report-templates/DNSDB_IPHistory_1_0/short.html
new file mode 100644
index 0000000000..4402a33419
--- /dev/null
+++ b/contrib/report-templates/DNSDB_IPHistory_1_0/short.html
@@ -0,0 +1 @@
+DNSDB IP History: {{content.records}} records
diff --git a/contrib/report-templates/DNSDB_NameHistory_1_0/long.html b/contrib/report-templates/DNSDB_NameHistory_1_0/long.html
new file mode 100644
index 0000000000..d7031c9a69
--- /dev/null
+++ b/contrib/report-templates/DNSDB_NameHistory_1_0/long.html
@@ -0,0 +1,42 @@
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+
+
+ DNSDB Name History Report(Rdata Name)
+
+
+
+
+ # |
+ count |
+ rdata |
+ rrname |
+ rrtype |
+ time first |
+ time last |
+
+
+
+ {{$index + 1}} |
+ {{row.count}} |
+ {{row.rdata}} |
+ {{row.rrname}} |
+ {{row.rrtype}} |
+ {{row.time_first | shortDate}} |
+ {{row.time_last | shortDate}} |
+
+
+
+
diff --git a/contrib/report-templates/DNSDB_NameHistory_1_0/short.html b/contrib/report-templates/DNSDB_NameHistory_1_0/short.html
new file mode 100644
index 0000000000..3271f99b00
--- /dev/null
+++ b/contrib/report-templates/DNSDB_NameHistory_1_0/short.html
@@ -0,0 +1 @@
+DNSDB Name History: {{content.records}} records
diff --git a/contrib/report-templates/DomainTools_ReverseIP_1_0/long.html b/contrib/report-templates/DomainTools_ReverseIP_1_0/long.html
new file mode 100644
index 0000000000..89c1bc2164
--- /dev/null
+++ b/contrib/report-templates/DomainTools_ReverseIP_1_0/long.html
@@ -0,0 +1,30 @@
+
+
+ {{artifact.data | fang}}
+
+
+
+ - Domains count
+ - {{content.ip_addresses.domain_count}}
+
+
+ - Domain Names
+ -
+
+
+
+
+
+
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/DomainTools_ReverseIP_1_0/short.html b/contrib/report-templates/DomainTools_ReverseIP_1_0/short.html
new file mode 100644
index 0000000000..8b91e7d98e
--- /dev/null
+++ b/contrib/report-templates/DomainTools_ReverseIP_1_0/short.html
@@ -0,0 +1 @@
+{{content.ip.address}}: {{content.ip.domain_count}} domains found
diff --git a/contrib/report-templates/DomainTools_ReverseNameServer_1_0/long.html b/contrib/report-templates/DomainTools_ReverseNameServer_1_0/long.html
new file mode 100644
index 0000000000..470227e411
--- /dev/null
+++ b/contrib/report-templates/DomainTools_ReverseNameServer_1_0/long.html
@@ -0,0 +1,43 @@
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+ {{artifact.data | fang}}
+
+
+
+ - Name Server
+ - {{content.name_server.hostname}}
+
+
+ - Primary domains
+ -
+ {{content.name_server.primary}}
+ Show all
+
+
+
+ - Secondary domains
+ -
+ {{content.name_server.secondary}}
+ Show all
+
+
+
+
+
Primary Domains List
+
{{content.primary_domains | json}}
+
+
+
Secondary Domains List
+
{{content.secondary_domains | json}}
+
+
+
+
diff --git a/contrib/report-templates/DomainTools_ReverseNameServer_1_0/short.html b/contrib/report-templates/DomainTools_ReverseNameServer_1_0/short.html
new file mode 100644
index 0000000000..2f4c374ea0
--- /dev/null
+++ b/contrib/report-templates/DomainTools_ReverseNameServer_1_0/short.html
@@ -0,0 +1 @@
+Hostname: {{content.name_server}}, {{content.domain_count}} domains
diff --git a/contrib/report-templates/DomainTools_ReverseWhois_1_0/long.html b/contrib/report-templates/DomainTools_ReverseWhois_1_0/long.html
new file mode 100644
index 0000000000..b2f8fe07bb
--- /dev/null
+++ b/contrib/report-templates/DomainTools_ReverseWhois_1_0/long.html
@@ -0,0 +1,34 @@
+
+
+ {{artifact.data | fang}}
+
+
+
+ - Current Domains
+ - {{content.domain_count.current}}
+
+
+ - Historic Domains
+ - {{content.domain_count.historic}}
+
+
+ - Domains
+ -
+
+
+
+
+
+
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/DomainTools_ReverseWhois_1_0/short.html b/contrib/report-templates/DomainTools_ReverseWhois_1_0/short.html
new file mode 100644
index 0000000000..015b9f0fa0
--- /dev/null
+++ b/contrib/report-templates/DomainTools_ReverseWhois_1_0/short.html
@@ -0,0 +1,3 @@
+
+ Domains found: curr:{{content.domain_count.current}}/hist:{{content.domain_count.historic}}
+
diff --git a/contrib/report-templates/DomainTools_WhoisHistory_1_0/long.html b/contrib/report-templates/DomainTools_WhoisHistory_1_0/long.html
new file mode 100644
index 0000000000..3d235f6000
--- /dev/null
+++ b/contrib/report-templates/DomainTools_WhoisHistory_1_0/long.html
@@ -0,0 +1,48 @@
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+
+
No records found
+
+
+
+ # |
+ date |
+ server names |
+ registrant |
+ registrar |
+ expiration |
+ statuses |
+
+
+
+ {{$index + 1}} |
+ {{row.date}} |
+
+
+ |
+ {{row.whois.registrant}} |
+ {{row.whois.registration.registrar}} |
+ {{row.whois.registration.expires}} |
+
+
+ |
+
+
+
+
diff --git a/contrib/report-templates/DomainTools_WhoisHistory_1_0/short.html b/contrib/report-templates/DomainTools_WhoisHistory_1_0/short.html
new file mode 100644
index 0000000000..3e748cbb2c
--- /dev/null
+++ b/contrib/report-templates/DomainTools_WhoisHistory_1_0/short.html
@@ -0,0 +1,2 @@
+REGISTRANT: {{content.registrant}}
+REGISTRAR: {{content.registrar}}
diff --git a/contrib/report-templates/DomainTools_WhoisLookup_1_0/long.html b/contrib/report-templates/DomainTools_WhoisLookup_1_0/long.html
new file mode 100644
index 0000000000..2cdab86513
--- /dev/null
+++ b/contrib/report-templates/DomainTools_WhoisLookup_1_0/long.html
@@ -0,0 +1,21 @@
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+ {{artifact.data | fang}}
+
+
+
+ - Date of record
+ - {{content.whois.date}}
+
+
{{content.whois.record}}
+
+
diff --git a/contrib/report-templates/DomainTools_WhoisLookup_1_0/short.html b/contrib/report-templates/DomainTools_WhoisLookup_1_0/short.html
new file mode 100644
index 0000000000..3e748cbb2c
--- /dev/null
+++ b/contrib/report-templates/DomainTools_WhoisLookup_1_0/short.html
@@ -0,0 +1,2 @@
+REGISTRANT: {{content.registrant}}
+REGISTRAR: {{content.registrar}}
diff --git a/contrib/report-templates/DomainTools_WhoisLookup_IP_1_0/long.html b/contrib/report-templates/DomainTools_WhoisLookup_IP_1_0/long.html
new file mode 100644
index 0000000000..2cdab86513
--- /dev/null
+++ b/contrib/report-templates/DomainTools_WhoisLookup_IP_1_0/long.html
@@ -0,0 +1,21 @@
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+ {{artifact.data | fang}}
+
+
+
+ - Date of record
+ - {{content.whois.date}}
+
+
{{content.whois.record}}
+
+
diff --git a/contrib/report-templates/DomainTools_WhoisLookup_IP_1_0/short.html b/contrib/report-templates/DomainTools_WhoisLookup_IP_1_0/short.html
new file mode 100644
index 0000000000..3e748cbb2c
--- /dev/null
+++ b/contrib/report-templates/DomainTools_WhoisLookup_IP_1_0/short.html
@@ -0,0 +1,2 @@
+REGISTRANT: {{content.registrant}}
+REGISTRAR: {{content.registrar}}
diff --git a/contrib/report-templates/File_Info_1_0/long.html b/contrib/report-templates/File_Info_1_0/long.html
new file mode 100644
index 0000000000..f78c3e991a
--- /dev/null
+++ b/contrib/report-templates/File_Info_1_0/long.html
@@ -0,0 +1,391 @@
+
+
+
+
+
+
+ File Idenfitication
+
+
+
+ - MD5
+ - {{content.Identification['MD5']}}
+
+
+ - SHA1
+ - {{content.Identification['SHA1']}}
+
+
+ - SHA256
+ - {{content.Identification['SHA256']}}
+
+
+ - impash
+ - {{content.Identification['impash']|| "-"}}
+
+
+
+ - ssdeep
+ - {{content.Identification['ssdeep']|| "-"}}
+
+
+
+ - pehash
+ - {{content.Identification['pehash']|| "-"}}
+
+
+
+ - Operating System
+ - {{content.Identification['OperatingSystem']}}
+
+
+
+ - PE Type
+ - {{content.Identification['PEType']}}
+
+
+ - Magic literal
+ - {{content.Magic}}
+
+
+ - MimeType
+ - {{content.Mimetype}}
+
+
+
+
+
+
+
+ File Metadata (Exiftool)
+
+
+
+
+
+
+
+ PE Basic Information
+
+
+
+ - {{I.Info}}
+ - {{I.Value}}
+
+
+ - Compilation Timestamp
+ - {{content.PE.BasicInformation.CompilationTimestamp}}
+
+
+ - File Size
+ - {{content.PE.BasicInformation.FileSize}}
+
+
+ - Entry Point (EP)
+ - {{content.PE.BasicInformation.EntryPoint}}
+
+
+ - Target Machine
+ - {{content.PE.BasicInformation.TargetMachine}}
+
+
+
+
+
+
+
+ PE Sections
+
+
+
+
+ Section |
+ SizeOfRawData |
+ Entroy |
+
+
+
+
+ {{section.entryname}}
+ |
+ {{section.SizeOfRawData}} |
+ {{section.Entropy}} |
+
+
+
+
+ -
+ MD5
+
+ -
+ {{section.MD5}}
+
+
+
+ -
+ SHA1
+
+ -
+ {{section.SHA1}}
+
+
+
+ -
+ SHA256
+
+ -
+ {{section.SHA256}}
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+ PE Import Address Table
+
+
+
+ -
+
+
+
+ {{entry.entryname}}
+
+
+ -
+
+ {{entry.symbols.length}}
+ items
+
+
+
+
+
+
+
+
+
+
+ Olevba Report
+
+
+
Summary
+
+ - Olevba version:
+ - v{{content.MSOffice.olevba.Version}}
+
+
+
+ - Olevba detection :
+ - {{content.MSOffice.olevba.vba}}
+
+
+
+ - Olevba scanner :
+ -
+
+
+
+ Not suspicious
+ Suspicious VBA
+
+
+ Base64 strings
+
+
+ Hex strings
+
+
+
+
+ Not suspicious
+
+
+
+
+
+
+
+
Detailed Information
+
+
+
+
+
OLE stream:
+ {{stream['OLE stream']}}
+
+
+
Information
+
+ - VBA filename:
+ - {{stream['VBA filename']}}
+
+
+ - Filename:
+ - {{stream['Filename']}}
+
+
+
+
Olevba analysis
+
+
+
+
+ Type |
+ Keyword |
+ Description |
+
+
+
+
+ {{result.type}} |
+ {{result.keyword}} |
+ {{result.description}} |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Analysis failure
+
+
+ {{content.MSOffice.olevba.Error}}
+
+
+
+
+
+
+
+
+
+
+
+
+ PDFiD Report
+
+
+
Summary
+
+ - PDFiD version:
+ - v{{content.PDF.pdfid[0].pdfid.version}}
+
+
+
+ - Suspicious:
+ - {{content.PDF.pdfid[0].suspicious}}
+
+
+
+ - PDFiD detection :
+ -
+
+
+
+ /RichMedia
+
+
+
+
+ /OpenAction
+
+
+
+
+ /JavaScript
+
+
+
+
+ /Launch
+
+
+
+
+ /ObjStm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/File_Info_1_0/short.html b/contrib/report-templates/File_Info_1_0/short.html
new file mode 100644
index 0000000000..f8d67bb184
--- /dev/null
+++ b/contrib/report-templates/File_Info_1_0/short.html
@@ -0,0 +1,7 @@
+
+ {{content.filetype}}
+
+
+
+ {{content.filetype}}: Suspicious
+
diff --git a/contrib/report-templates/Fortiguard_URLCategory_1_0/long.html b/contrib/report-templates/Fortiguard_URLCategory_1_0/long.html
new file mode 100644
index 0000000000..251350036f
--- /dev/null
+++ b/contrib/report-templates/Fortiguard_URLCategory_1_0/long.html
@@ -0,0 +1,26 @@
+
+
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/Fortiguard_URLCategory_1_0/short.html b/contrib/report-templates/Fortiguard_URLCategory_1_0/short.html
new file mode 100644
index 0000000000..e39dbcf7f7
--- /dev/null
+++ b/contrib/report-templates/Fortiguard_URLCategory_1_0/short.html
@@ -0,0 +1,4 @@
+
+ URLCat:
+ {{content.category}}
+
diff --git a/contrib/report-templates/HippoMore_1_0/long.html b/contrib/report-templates/HippoMore_1_0/long.html
new file mode 100644
index 0000000000..d0f1417e4d
--- /dev/null
+++ b/contrib/report-templates/HippoMore_1_0/long.html
@@ -0,0 +1,37 @@
+
+
+ Detailed Information
+
+
+
+ No records found
+
+
+
+ Source |
+ First seen by source |
+ Last seen by source |
+ Category |
+ Details |
+
+
+ {{source.source}} |
+ {{source.first_seen || '-'}} |
+ {{source.last_seen || '-'}} |
+ {{source.category || '-'}} |
+
+ First added in DB: {{source.firstAppearance }}
+ Last added in DB: {{source.lastAppearance }} |
+
+
+
+
+
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/HippoMore_1_0/short.html b/contrib/report-templates/HippoMore_1_0/short.html
new file mode 100644
index 0000000000..5812622426
--- /dev/null
+++ b/contrib/report-templates/HippoMore_1_0/short.html
@@ -0,0 +1 @@
+HippoMore: {{content[artifact.data]}} record(s)
diff --git a/contrib/report-templates/Hipposcore_1_0/long.html b/contrib/report-templates/Hipposcore_1_0/long.html
new file mode 100644
index 0000000000..3fd59af53e
--- /dev/null
+++ b/contrib/report-templates/Hipposcore_1_0/long.html
@@ -0,0 +1,30 @@
+
+
+ Detailed Information
+
+
+
+ - Hippocamp Score:
+ -
+
+ {{score}}
+
+
+ {{score}}
+
+
+ {{score}}
+
+
+
+
+
+
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/Hipposcore_1_0/short.html b/contrib/report-templates/Hipposcore_1_0/short.html
new file mode 100644
index 0000000000..34ef106075
--- /dev/null
+++ b/contrib/report-templates/Hipposcore_1_0/short.html
@@ -0,0 +1,4 @@
+
+ HippoScore: {{score}}
+
diff --git a/contrib/report-templates/MaxMind_GeoIP_2_0/long.html b/contrib/report-templates/MaxMind_GeoIP_2_0/long.html
new file mode 100644
index 0000000000..5f98f12d29
--- /dev/null
+++ b/contrib/report-templates/MaxMind_GeoIP_2_0/long.html
@@ -0,0 +1,20 @@
+
+
+ Geolocation of {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+
Is anonymous proxy
+
Is satellite provider
+
+ {{[content.continent.name, content.country.name, content.subdivisions.name, content.city.name].join(' / ')}}
+
+
+
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/MaxMind_GeoIP_2_0/short.html b/contrib/report-templates/MaxMind_GeoIP_2_0/short.html
new file mode 100644
index 0000000000..0c79843709
--- /dev/null
+++ b/contrib/report-templates/MaxMind_GeoIP_2_0/short.html
@@ -0,0 +1 @@
+IP location: {{content.country}} / {{content.continent}}
diff --git a/contrib/report-templates/Msg_Parser_1_0/long.html b/contrib/report-templates/Msg_Parser_1_0/long.html
new file mode 100644
index 0000000000..5f1d5c5496
--- /dev/null
+++ b/contrib/report-templates/Msg_Parser_1_0/long.html
@@ -0,0 +1,66 @@
+
+
+ Email message details
+
+
+
Is anonymous proxy
+
Is satellite provider
+
+
+ - From
+ - {{content.displayFrom}} ({{content.sender}})
+
+
+ - To
+ - {{content.displayTo}} ({{content.receivers}})
+
+
+ - Subject
+ - {{content.subject || '-'}}
+
+
+ - Topic
+ - {{content.topic || '-'}}
+
+
+ - Bcc
+ - {{content.bcc || '-'}}
+
+
+ - Attachments
+ -
+
This message file includes
+
+
+
+
+
+ Filename |
+ Mime Type |
+ Extension |
+
+
+
+
+ {{a.filename}} |
+ {{a.mime}} |
+ {{a.extension}} |
+
+
+
+
+
+
+ - Headers
+ -
+
{{content.headers}}
+
+
+
+ - Body
+ -
+
{{content.body}}
+
+
+
+
\ No newline at end of file
diff --git a/contrib/report-templates/Msg_Parser_1_0/short.html b/contrib/report-templates/Msg_Parser_1_0/short.html
new file mode 100644
index 0000000000..60802dd732
--- /dev/null
+++ b/contrib/report-templates/Msg_Parser_1_0/short.html
@@ -0,0 +1,3 @@
+
+ MsgParser:
+
diff --git a/contrib/report-templates/OTXQuery_1_0/long.html b/contrib/report-templates/OTXQuery_1_0/long.html
new file mode 100644
index 0000000000..2e25f9c36c
--- /dev/null
+++ b/contrib/report-templates/OTXQuery_1_0/long.html
@@ -0,0 +1,155 @@
+
+
+ OTX Report
+
+
+
+
+ - ERROR:
+ - {{content.errortext}}
+
+
+
+ - Related Pulses Found:
+ - {{content.pulse_count}}
+
+
+
+ - Related Pulses:
+ -
+
+
Name: {{::pulse.name}}
+
Author: {{::pulse.author.username}}
+
Modified: {{::pulse.modified_text}} @ {{::pulse.modified}}
+
Subscribers: {{::pulse.subscriber_count}}
+
Subscribed: {{::pulse.is_subscribing}}
+
Industries: {{::pulse.industries}}
+
Indicators: {{::pulse.indicator_count}}
+
+
+
+
+
+
+ - Submit Pulse:
+ -
+ Create a Pulse
+
+
+
+
+ - Malware Samples:
+ -
+
+ {{::sample.sample}}
+
+
+
+
+
+ - Malware:
+ - {{content.malware}}
+
+
+
+ - SHA1:
+ - {{content.sha1}}
+
+
+
+ - SHA256:
+ - {{content.sha256}}
+
+
+
+ - MD5:
+ - {{content.md5}}
+
+
+
+ - Page Type:
+ - {{content.page_type}}
+
+
+
+ - File Class:
+ - {{content.file_class}}
+
+
+
+ - File Type:
+ - {{content.file_type}}
+
+
+
+ - File Size:
+ - {{content.filesize}}
+
+
+
+ - SSDEEP:
+ - {{content.ssdeep}}
+
+
+
+ - Related URLs:
+ -
+
+ URL: {{::url.url}}
+ Date: {{::url.date}}
+ HTTP Code: {{::url.httpcode}}
+ IP: {{::url.result.urlworker.ip}}
+
+
+
+
+
+
+ - Passive DNS:
+ -
+
+ Hostname: {{::dns.hostname}}
+ IP: {{::dns.address}}
+ First/Last seen: {{::dns.first}} / {{::dns.last}}
+ Locale: {{::dns.flag_title}}
+
+
+
+
+
+
+ - Whois:
+ -
+ Whois Query
+
+
+
+
+ - Alexa:
+ -
+ Alexa Report
+
+
+
+
+ - City:
+ - {{content.city}}
+
+
+
+ - Country Code:
+ - {{content.country_code}}
+
+
+
+ - Country:
+ - {{content.country_name}}
+
+
+
+ - ASN:
+ - {{content.asn}}
+
+
+
+
diff --git a/contrib/report-templates/OTXQuery_1_0/short.html b/contrib/report-templates/OTXQuery_1_0/short.html
new file mode 100644
index 0000000000..43a71a067f
--- /dev/null
+++ b/contrib/report-templates/OTXQuery_1_0/short.html
@@ -0,0 +1,4 @@
+
+ OTX:
+ Pulses({{content.pulse_count}})
+
diff --git a/contrib/report-templates/PhishTank_CheckURL_1_0/long.html b/contrib/report-templates/PhishTank_CheckURL_1_0/long.html
new file mode 100644
index 0000000000..da48be001e
--- /dev/null
+++ b/contrib/report-templates/PhishTank_CheckURL_1_0/long.html
@@ -0,0 +1,44 @@
+
+
+
+
+ {{artifact.data | fang}}
+
+
+ {{content.errorMessage}}
+
+
diff --git a/contrib/report-templates/PhishTank_CheckURL_1_0/short.html b/contrib/report-templates/PhishTank_CheckURL_1_0/short.html
new file mode 100644
index 0000000000..b90f191fcb
--- /dev/null
+++ b/contrib/report-templates/PhishTank_CheckURL_1_0/short.html
@@ -0,0 +1,14 @@
+
+
+
+ PhishTank:
+
+ {{millis | amDurationFormat : 'milliseconds'}}
+
+
+
+ PhishTank: {{content.in_database}}
+
+
+
+
diff --git a/contrib/report-templates/VirusTotal_GetReport_2_0/long.html b/contrib/report-templates/VirusTotal_GetReport_2_0/long.html
new file mode 100644
index 0000000000..fdcb8194fe
--- /dev/null
+++ b/contrib/report-templates/VirusTotal_GetReport_2_0/long.html
@@ -0,0 +1,203 @@
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+
+
+ Summary
+
+
+
+ - Score
+ - {{content.positives || 0}}/{{content.total}}
+
+
+ - Last analysis date
+ - {{content.scan_date}}
+
+
+ - Autonomous System
+ - {{content.as_owner}}
+
+
+ - Categories
+ - {{content.categories.join(', ')}}
+
+
+ - Sub domains
+ - {{content.subdomains.join(', ')}}
+
+
+ - Resolutions
+ -
+
+ This domain has been seen to resolve to the following IP addresses.
+
+
+ The following domains resolved to the given IP address.
+
+
+ {{::resolution.last_resolved | amDateFormat:'DD-MM-YYYY'}}:
+ {{(resolution.ip_address | fang) || (resolution.hostname | fang)}}
+
+
+
+
+ - Virus Total
+ -
+
+
+
+ View Full Report
+
+
+
+
+ View Full Report
+
+
+
+
+ View Full Report
+
+
+
+
+
+
+
+
+
+
Latest URLs hosted in this IP address
+ detected by at least one URL scanner or malicious URL dataset.
+
+
+
+ Score |
+ Scan Date |
+ URL |
+
+
+
+ {{::url.positives}}/{{::url.total}}
+ |
+ {{url.scan_date}} |
+ {{url.url | fang}} |
+
+
+
+
+
+
+
+
+
Latest files that are
+ detected by at least one antivirus solution and were downloaded by VirusTotal from the IP address provided.
+
+
+
+ Score |
+ Date |
+ SHA256 |
+
+
+
+ {{hash.positives}}/{{hash.total}}
+ |
+ {{hash.date}} |
+ {{hash.sha256}} |
+
+
+
+
+
+
+
+
+
Latest files that are
+ detected by at least one antivirus solution and embed URL pattern strings with the IP address provided.
+
+
+
+ Score |
+ SHA256 |
+
+
+
+ {{hash.positives}}/{{hash.total}}
+ |
+ {{hash.sha256}} |
+
+
+
+
+
+
+
+ Scans
+
+
+
+
+
+ Scanner |
+ Detected |
+ Result |
+ Details |
+ Update |
+ Version |
+
+
+
+ {{scanner}}
+ |
+
+
+ |
+ {{result.result}} |
+
+
+
+ View details
+ |
+ {{result.update}} |
+ {{result.version}} |
+
+
+
+
+
+
+
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.verbose_msg}}
+
+
+
+
diff --git a/contrib/report-templates/VirusTotal_GetReport_2_0/short.html b/contrib/report-templates/VirusTotal_GetReport_2_0/short.html
new file mode 100644
index 0000000000..a713b763d4
--- /dev/null
+++ b/contrib/report-templates/VirusTotal_GetReport_2_0/short.html
@@ -0,0 +1,8 @@
+
+ VT:
+ {{content.positives}}/{{content.total}}
+ Scans({{content.scans}})
+ Resolutions({{content.resolutions}})
+ Url detections({{content.detected_urls}})
+ files({{content.detected_downloaded_samples}})
+
diff --git a/contrib/report-templates/VirusTotal_Scan_2_0/long.html b/contrib/report-templates/VirusTotal_Scan_2_0/long.html
new file mode 100644
index 0000000000..8bdaee6579
--- /dev/null
+++ b/contrib/report-templates/VirusTotal_Scan_2_0/long.html
@@ -0,0 +1,78 @@
+
+
+ {{(artifact.data || artifact.attachment.name) | fang}}
+
+
+ {{content.errorMessage}}
+
+
+
+
+
+
+
+
Summary
+
+
+ - Score
+ - {{content.positives}}/{{content.total}}
+
+
+ - Last analysis date
+ - {{content.scan_date}}
+
+
+ - Virus Total
+ -
+
+
+
+ View Full Report
+
+
+
+
+
+
+
+
Scans
+
+
+
+
+ Scanner |
+ Detected |
+ Result |
+ Details |
+ Update |
+ Version |
+
+
+ {{scanner}} |
+
+
+ |
+ {{result.result}} |
+
+ View details
+ |
+ {{result.update}} |
+ {{result.version}} |
+
+
+
+
+
+
+
+
+
+
+ {{(artifact.data || artifact.attachment.name)| fang}}
+
+
+ {{content.verbose_msg}}
+
+
+
+
diff --git a/contrib/report-templates/VirusTotal_Scan_2_0/short.html b/contrib/report-templates/VirusTotal_Scan_2_0/short.html
new file mode 100644
index 0000000000..7da455c08f
--- /dev/null
+++ b/contrib/report-templates/VirusTotal_Scan_2_0/short.html
@@ -0,0 +1,3 @@
+
+ VT: {{content.positives}}/{{content.total}}
+
diff --git a/contrib/report-templates/templates.zip b/contrib/report-templates/templates.zip
new file mode 100644
index 0000000000..50d01021e8
Binary files /dev/null and b/contrib/report-templates/templates.zip differ
diff --git a/ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js b/ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js
index 3a1dd734f2..4dfb1eefe7 100644
--- a/ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js
+++ b/ui/app/scripts/controllers/admin/AdminReportTemplatesCtrl.js
@@ -35,7 +35,9 @@
}
_.each(self.templates, function (tpl) {
- analyzersMap[tpl.analyzerId][tpl.reportType + 'Report'] = tpl;
+ if(analyzersMap[tpl.analyzerId]) {
+ analyzersMap[tpl.analyzerId][tpl.reportType + 'Report'] = tpl;
+ }
});
self.analyzerCount = _.keys(analyzersMap).length;