dradis-ntospider 4.2.0 → 4.3.0

data/spec/ntospider_import_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+describe Dradis::Plugins::NTOSpider::Importer do
+  before(:each) do
+    # Stub template service
+    templates_dir = File.expand_path('../../templates', __FILE__)
+    expect_any_instance_of(Dradis::Plugins::TemplateService)
+    .to receive(:default_templates_dir).and_return(templates_dir)
+
+    # Init services
+    plugin = Dradis::Plugins::NTOSpider
+
+    @content_service = Dradis::Plugins::ContentService::Base.new(
+      logger: Logger.new(STDOUT),
+      plugin: plugin
+    )
+
+    @importer = plugin::Importer.new(
+      content_service: @content_service,
+      plugin: plugin
+    )
+
+    # Stub dradis-plugins methods
+    #
+    # They return their argument hashes as objects mimicking
+    # Nodes, Issues, etc
+    allow(@content_service).to receive(:create_node) do |args|
+      OpenStruct.new(args)
+    end
+    allow(@content_service).to receive(:create_note) do |args|
+      OpenStruct.new(args)
+    end
+    allow(@content_service).to receive(:create_issue) do |args|
+      OpenStruct.new(args)
+    end
+    allow(@content_service).to receive(:create_evidence) do |args|
+      OpenStruct.new(args)
+    end
+  end
+
+  it 'creates nodes, issues and evidence as needed' do
+    # nodes
+    expect(@content_service).to receive(:create_node).with(
+      hash_including(label: 'www.webscantest.com', type: :host)
+    ).exactly(4).times
+
+    # issues
+    expect(@content_service).to receive(:create_issue).with(
+      hash_including(id: 'Browser Cache directive (web application performance)')
+    ).once
+
+    expect(@content_service).to receive(:create_issue).with(
+      hash_including(id: 'Predictable Resource Location')
+    ).once
+
+    expect(@content_service).to receive(:create_issue).with(
+      hash_including(id: 'Content Type Charset Check')
+    ).once
+
+    expect(@content_service).to receive(:create_issue).with(
+      hash_including(id: 'Collecting Sensitive Personal Information')
+    ).once
+
+    # evidence
+    expect(@content_service).to receive(:create_evidence) do |args|
+      expect(args[:issue].id).to eq('Browser Cache directive (web application performance)')
+      expect(args[:node].label).to eq('www.webscantest.com')
+    end.once
+
+    expect(@content_service).to receive(:create_evidence) do |args|
+      expect(args[:issue].id).to eq('Predictable Resource Location')
+      expect(args[:node].label).to eq('www.webscantest.com')
+    end.once
+
+    expect(@content_service).to receive(:create_evidence) do |args|
+      expect(args[:issue].id).to eq('Content Type Charset Check')
+      expect(args[:node].label).to eq('www.webscantest.com')
+    end.twice
+
+    expect(@content_service).to receive(:create_evidence) do |args|
+      expect(args[:issue].id).to eq('Collecting Sensitive Personal Information')
+      expect(args[:node].label).to eq('www.webscantest.com')
+    end.exactly(3).times
+
+    @importer.import(file: 'spec/fixtures/files/VulnerabilitiesSummary.xml')
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'byebug'
+
+require 'combustion'
+
+Combustion.initialize!
+
+RSpec.configure do |config|
+end

data/templates/evidence.fields

@@ -1,4 +1,13 @@
-evidence.web_site
-evidence.vuln_url
-evidence.normalized_url
-evidence.vuln_param
+evidence.attack_config_description
+evidence.attack_description
+evidence.attack_id
+evidence.attack_matched_string
+evidence.attack_post_params
+evidence.attack_request
+evidence.attack_response
+evidence.attack_user_notes
+evidence.attack_value
+evidence.attack_vuln_url
+evidence.benign
+evidence.original_value
+evidence.original_response_code

data/templates/evidence.sample

@@ -1,200 +1,30 @@
-<Vuln>
-<DbId>7B9CAABF300A49688F4D30FA423EDFB8</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<ScanName>hackthissite</ScanName>
-<WebSite>http://www.hackthissite.org:80</WebSite>
-<VulnType>Reflected Cross-site scripting (XSS)</VulnType>
-<VulnUrl>http://www.hackthissite.org/</VulnUrl>
-<NormalizedUrl>http://www.hackthissite.org/?</NormalizedUrl>
-<MatchedString></MatchedString>
-<NormalizedPostParams></NormalizedPostParams>
-<VulnParam>Unnamed</VulnParam>
-<ParameterName>Unnamed</ParameterName>
-<HtmlEntityAttacked>Query-Parameters</HtmlEntityAttacked>
-<AttackType>javascript after single quote</AttackType>
-<AttackScore>3-Medium</AttackScore>
-<AttackValue>';alert('x9lj3cup');//</AttackValue>
-<Method>GET</Method>
-<RootCauseId>9AEE038BB3477FE5A178FBA57C93FC76</RootCauseId>
-<Description><![CDATA[<p>Reflected Cross-site Scripting (XSS) is another name for non-persistent XSS, where the attack doesn't load with the vulnerable web application but is originated by the victim loading the offending URI. In this article we will see some ways to test a web application for this kind of vulnerability.</p>]]></Description>
-<Recommendation><![CDATA[
-
-          <p>Reflected XSS attacks are also known as type 1 or non-persistent XSS attacks, and are the most frequent type of XSS attacks found nowadays.</p>
-
-          <p>When a web application is vulnerable to this type of attack, it will pass unvalidated input sent through requests to the client. The common modus operandi of the attack includes a design step, in which the attacker creates and tests an offending URI, a social engineering step, in which she convinces her victims to load this URI on their browsers, and the eventual execution of the offending code - using the victim's credentials.</p>
-
-          <p>Commonly the attacker's code is written in the Javascript language, but other scripting languages are also used, e.g., ActionScript and VBScript.</p>
-
-          <p>Attackers typically leverage these vulnerabilities to install key loggers, steal victim cookies, perform clipboard theft, and change the content of the page (e.g., download links).</p>
-
-          <p>One of the important matters about exploiting XSS vulnerabilities is character encoding. In some cases, the web server or the web application may not be filtering some encodings of characters, so, for example, the web application might filter out "&lt;script&gt;", but might not filter "%3Cscript%3E" which simply includes another encoding of tags. A nice tool for testing character encodings is OWASP's CAL9000. </p>]]></Recommendation>
-<Page>http://www.hackthissite.org/</Page>
-<Url>http://www.hackthissite.org/</Url>
-<VulnParamType>unknown</VulnParamType>
-<CrawlTrafficTemplate>R0VUIC8/eGh5azJhanEtcHQgSFRUUC8xLjENCkFjY2VwdDogdGV4dC9odG1sLGFwcGxpY2F0aW9uL3hodG1sK3htbCxhcHBsaWNhdGlvbi94bWw7cT0wLjksKi8qO3E9MC44DQpBY2NlcHQtQ2hhcnNldDogKg0KQWNjZXB0LUVuY29kaW5nOiBnemlwLCBkZWZsYXRlDQpVc2VyLUFnZW50OiBNb3ppbGxhLzUuMCAoY29tcGF0aWJsZTsgTVNJRSA5LjA7IFdpbmRvd3MgTlQgNi4xOyBXT1c2NDsgVHJpZGVudC81LjApDQpIb3N0OiB3d3cuaGFja3RoaXNzaXRlLm9yZw0KQ29va2llOiBfX3V0bWE9MTk4NDAyODcwLjYwNzMyMTI4MC4xNDEzMjYwOTIzLjE0MTMyNjA5MjMuMTQxMzI2MDkyMy4xOyBfX3V0bXo9MTk4NDAyODcwLjE0MTMyNjA5MjMuMS4xLnV0bWNzcj0oZGlyZWN0KXx1dG1jY249KGRpcmVjdCl8dXRtY21kPShub25lKTsgYWRzX2JtX2xhc3RfbG9hZF9zdGF0dXM9Tk9UX0JMT0NLSU5HOyBwaHBiYjNfMjhwbGFfdT0xOyBwaHBiYjNfMjhwbGFfaz07IHBocGJiM18yOHBsYV9zaWQ9OTFkOTgzOThhY2U2NzUxZjI3YTI5ZmNmYmJhMmMwOTQ7IGJtX2xhc3RfbG9hZF9zdGF0dXM9Tk9UX0JMT0NLSU5HOyBQSFBTRVNTSUQ9OWh2bmxmczUxanNqMmlpZWZtaDc0dXN0YTA7IF9fdXRtYj0xOTg0MDI4NzAuNTAwLjEwLjE0MTMyNjA5MjM7IF9fdXRtYz0xOTg0MDI4NzA7IGJtX21vbnRobHlfdW5pcXVlPXRydWU7IGJtX2RhaWx5X3VuaXF1ZT10cnVlOyBsZXZlbDEwX2F1dGhvcml6ZWQ9bm87DQoNCg==</CrawlTrafficTemplate>
-<AttackClass>Application Developer</AttackClass>
-<CweId>79</CweId>
-<CAPEC>80</CAPEC>
-<DISSA_ASC>3580</DISSA_ASC>
-<OWASP2007>1</OWASP2007>
-<OWASP2010>2</OWASP2010>
-<OWASP2013>3</OWASP2013>
-<OVAL>6312</OVAL>
-<WASC>0</WASC>
-<ScanDate>2014-10-14 07:26:14</ScanDate>
-<ScanEnd>2014-10-15 01:59:37</ScanEnd>
-<DefenseBL>
-<DbId>E00DA69EEFFE4556A2EA833A05174698</DbId>
-<ParentDbId>7B9CAABF300A49688F4D30FA423EDFB8</ParentDbId>
-<PcreRegex></PcreRegex>
-<ModSecurity></ModSecurity>
-<Snort></Snort>
-<Imperva>cross-site-scripting</Imperva>
-</DefenseBL>
-<DefenseWL>
-<DbId>ED59621943E9405B98ED9C3642011DBB</DbId>
-<ParentDbId>7B9CAABF300A49688F4D30FA423EDFB8</ParentDbId>
-<PcreRegex></PcreRegex>
-<ModSecurity></ModSecurity>
-<Snort></Snort>
-<Imperva></Imperva>
-</DefenseWL>
-<AttackList>
 <Attack>
-<DbId>0FBEDA330DDC427CB8EFB550E5170614</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue>'-alert(6759001)-'</AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>6759001</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>E70A833E09944518999100DD31DCDEDF</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
+	<DbId>F3CE345BAF3442B48B2668809722032D</DbId>
+	<ParentDbId>00000000000000000000000000000000</ParentDbId>
+	<AttackId>PE_01</AttackId>
+	<AttackValue></AttackValue>
+	<AttackVulnUrl>https://test.t.example.com/en/help</AttackVulnUrl>
+	<AttackPostParams></AttackPostParams>
+	<AttackMatchedString>OK</AttackMatchedString>
+	<AttackDescription>Server allowed access to the resource without valid session</AttackDescription>
+	<AttackConfigDescription>Privilege Escalation</AttackConfigDescription>
+	<AttackUserNotes></AttackUserNotes>
+	<OriginalValue></OriginalValue>
+	<OriginalResponseCode>200</OriginalResponseCode>
+	<AttackRequestList>
+		<AttackRequest>
+			<DbId>0D9D750204F742E3B0FC513BFA1EABC9</DbId>
+			<ParentDbId>00000000000000000000000000000000</ParentDbId>
+			<Request>R0VUIC9lbi9oZWxwP3N1.....mlvDQoNCg==</Request>
+<Response>SFRUUC8xLjEgMjAwIE9LDQpDYWNoZ.....ib2R5Pgo8L2h0bWw+Cg==</Response>
+			<Benign>0</Benign>
+		</AttackRequest>
+		<AttackRequest>
+			<DbId>D12FBA19C7AD4279A0D698D14D6480BE</DbId>
+			<ParentDbId>00000000000000000000000000000000</ParentDbId>
+			<Request>R0VUIC9lbi9oZWxwIEhUVFA.....N0LnQuZ2FiLmlvL2VuLw0KDQo=</Request>
+<Response>SFRUUC8xLjEgMjAwIE9LDQpD.....PC9ib2R5Pgo8L2h0bWw+Cg==</Response>
+			<Benign>0</Benign>
+		</AttackRequest>
+	</AttackRequestList>
 </Attack>
-<Attack>
-<DbId>6B29EBB4F4094201B6541769C9D3BCFB</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue>';alert('xhsysg0a');//</AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>xhsysg0a</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>245EEA880FA748298BFDD11D286A2AA8</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-<Attack>
-<DbId>208D71F46FC84F7A97A51A9D204936E8</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue>'+alert(14357991)+'</AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>14357991</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>656C78FC2C5A4E8E88805D70E85C03BB</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-<Attack>
-<DbId>FF2039A5A33D4167B1BD5F10DBD78989</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue><![CDATA[xhyk2ajq-pt"><script>alert(15009454)</script>]]></AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>15009454</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>81362DB814024D8899B83D4A4FF7DE3A</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-<Attack>
-<DbId>96A0331A38FF47AFA13C547518721E08</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue><![CDATA[<img """><script>alert("x9khdxei")</script>">]]></AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>x9khdxei</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>49A7844AA3884CE19078E68B4F12E04B</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-<Attack>
-<DbId>23E5FDE97F5E42628FC74477F8513B8D</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue>');alert('x9krdis7');//</AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>x9krdis7</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>E982E7BCB4F64A56AC6AC1B8C697E284</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-<Attack>
-<DbId>B87C5202F4A74BEBA06936F6BD186076</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue>'-alert(15189768)-'</AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>15189768</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>E3F212EBD7134B958D3EB7D4369FE1A9</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-<Attack>
-<DbId>ED858AB85A2C46C9953BA5E86C412BEE</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<AttackValue>';alert('x9lj3cup');//</AttackValue>
-<AttackVulnUrl>http://www.hackthissite.org/</AttackVulnUrl>
-<AttackPostParams></AttackPostParams>
-<AttackMatchedString>x9lj3cup</AttackMatchedString>
-<AttackRequestList>
-<AttackRequest>
-<DbId>2F292FE91CD64B86B98B536D9BA66FE7</DbId>
-<ParentDbId>00000000000000000000000000000000</ParentDbId>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Request>R0VUIC8/Jy1hbGVydCg2NzU5MDAxKS0nIEhUVFAvMS4xDQpBY2NlcHQ6IHRleHQvaHRtbCxhcHBsaWNhdGlvbi94aHRtbCt4bWwsYXBwbGljYXRpb24veG1sO3E9MC45LCovKjtxPTAuOA0KQWNjZXB0LUNoYXJzZXQ6ICoNCkFjY2VwdC1FbmNvZGluZzogZ3ppcCwgZGVmbGF0ZQ0KVXNlci1BZ2VudDogTW96aWxsYS81LjAgKGNvbXBhdGlibGU7IE1TSUUgOS4wOyBXaW5kb3dzIE5UIDYuMTsgV09XNjQ7IFRyaWRlbnQvNS4wKQ0KSG9zdDogd3d3LmhhY2t0aGlzc2l0ZS5vcmcNCkNvb2tpZTogUEhQU0VTU0lEPTlodm5sZnM1MWpzajJpaWVmbWg3NHVzdGEwOw0KDQo=</Request>
-<Benign>0</Benign>
-</AttackRequest>
-</AttackRequestList>
-</Attack>
-</AttackList>
-</Vuln>

data/templates/evidence.template

@@ -1,11 +1,14 @@
-#[Title]#
-%evidence.web_site%
-
 #[URL]#
-%evidence.vuln_url%
-
-#[Normalized URL]#
-%evidence.normalized_url%
+%evidence.attack_vuln_url%
 
 #[Param]#
-%evidence.vuln_param%
+%evidence.attack_post_params%
+
+#[String]#
+%evidence.attack_matched_string%
+
+#[Request]#
+%evidence.attack_request%
+
+#[Response]#
+%evidence.attack_response%

data/templates/vuln.fields

@@ -3,16 +3,30 @@ vuln.attack_score
 vuln.attack_type
 vuln.attack_value
 vuln.capec
+vuln.confidence
 vuln.cwe_id
 vuln.description
 vuln.dissa_asc
+vuln.html_entity_attacked
+vuln.imperva_bl
+vuln.imperva_wl
+vuln.mod_security_bl
+vuln.mod_security_wl
 vuln.normalized_url
 vuln.oval
 vuln.owasp2007
 vuln.owasp2010
 vuln.owasp2013
+vuln.owasp2017
+vuln.pcre_regex_bl
+vuln.pcre_regex_wl
 vuln.recommendation
+vuln.scan_date
+vuln.snort_bl
+vuln.snort_wl
+vuln.statistically_prevalent_original_response_code
 vuln.vuln_method
 vuln.vuln_param
 vuln.vuln_type
 vuln.vuln_url
+vuln.wasc