dradis-qualys 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7e9fa1daeb12d92be8bb3861324ab6bc18a32c
-  data.tar.gz: e7a344e88a1825c0cd9b4f133f9341b70bff5b09
+  metadata.gz: c9eeaee42452ed46dd6bce10064713f886d1995d
+  data.tar.gz: 53a67d320587cfe75feb81bbb38e6307bf111e93
 SHA512:
-  metadata.gz: b63e6d86885e1e67097f92cadc32465bb4eb0b9dff773fbea82552b5e89d9cafccac7cd958ac111db7658ac9558d2c451b07358dafa9bac8a0dc359ffb50d9a5
-  data.tar.gz: 1f3c4852413064c9bb0c16e391cdb54dbd8709736c0db4117f469a6dd53ecb59c451ef7dd091e916ce161eb6ce37e43398d907eefd6d4bece51b2295e4ad9a8e
+  metadata.gz: e1114fb74433e29cce2b83c01a2b4d1c23d4891ae7570d28947b678c0ebd367d85709d855e4b81ad3a4a0e47b6b03d7c514a20084c93d3d059f845f3ae0a98e5
+  data.tar.gz: 2d7b1b9d554914111fefc4c5e3838bd578d0519a1162b01aa27a5ea87e02395b0d2a5f23900a66900778403009debb39f55109f35b3c29dea98080ccb196e433

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Dradis Framework 3.9 (January, 2018) ##
+
+*   Add `os`, `hostname`, and `ip` as Node properties
+    instead of a `Basic host info` Note (v3.8.1)
+
 ## Dradis Framework 3.8 (September, 2017) ##
 
 *   No changes.

data/lib/dradis/plugins/qualys/gem_version.rb

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 8
+        MINOR = 9
         TINY = 0
         PRE = nil
 

data/lib/dradis/plugins/qualys/importer.rb

@@ -35,11 +35,12 @@ module Dradis::Plugins::Qualys
 
       self.host_node = content_service.create_node(label: host_ip, type: :host)
 
-      host_text = "#[Title]#\nBasic host info\n\n#[Description]#\nIP: #{ host_ip }\nName: #{ xml_host['name'] }\n"
+      host_node.set_property(:ip, host_ip)
+      host_node.set_property(:hostname, xml_host['name'])
       if (xml_os = xml_host.xpath('OS')) && xml_os.any?
-        host_text << "OS: #{ xml_os.text }"
+        host_node.set_property(:os, xml_os.text)
       end
-      content_service.create_note text: host_text, node: self.host_node
+      host_node.save
 
       # We treat INFOS, SERVICES, PRACTICES, and VULNS the same way
       # All of these are imported into Dradis as Issues

data/spec/qualys/importer_spec.rb

@@ -1,200 +1,190 @@
-require "spec_helper"
-require "ostruct"
-
-describe Dradis::Plugins::Qualys::Importer do
-  let(:plugin) { Dradis::Plugins::Qualys }
-
-  let(:content_service)  { Dradis::Plugins::ContentService::Base.new(plugin: plugin) }
-  let(:template_service) { Dradis::Plugins::TemplateService.new(plugin: plugin) }
-
-  let(:importer) {
-    described_class.new(
-      content_service: content_service,
-      template_service: template_service
-    )
-  }
-
-  before do
-    # Stub template service
-    templates_dir = File.expand_path('../../../templates', __FILE__)
-    allow_any_instance_of(Dradis::Plugins::TemplateService).to \
-      receive(:default_templates_dir).and_return(templates_dir)
-
-    # Stub dradis-plugins methods
-    #
-    # They return their argument hashes as objects mimicking
-    # Nodes, Issues, etc
-    %i[node note evidence issue].each do |model|
-      allow(content_service).to receive(:"create_#{model}") do |args|
+require 'spec_helper'
+require 'ostruct'
+
+module Dradis::Plugins
+  describe 'Qualys upload plugin' 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::Qualys
+
+      @content_service = Dradis::Plugins::ContentService::Base.new(
+        logger: Logger.new(STDOUT),
+        plugin: plugin
+      )
+
+      @importer = Dradis::Plugins::Qualys::Importer.new(
+        content_service: @content_service
+      )
+
+      # Stub dradis-plugins methods
+      #
+      # They return their argument hashes as objects mimicking
+      # Nodes, Issues, etc
+      allow(@content_service).to receive(:create_node) do |args|
+        obj = OpenStruct.new(args)
+        obj.define_singleton_method(:set_property) { |_, __| }
+        obj
+      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
-  end
 
-  let(:example_xml) { 'spec/fixtures/files/simple.xml' }
+    let(:example_xml) { 'spec/fixtures/files/simple.xml' }
 
-  def run_import!
-    importer.import(file: example_xml)
-  end
+    def run_import!
+      @importer.import(file: example_xml)
+    end
 
-  it "creates nodes as needed" do
-    # Host node
-    expect_to_create_node_with(label: '10.0.155.160')
+    it "creates nodes as needed" do
+      expect_to_create_node_with(label: '10.0.155.160')
 
-    run_import!
-  end
+      run_import!
+    end
 
+    # Issues and evidences from vulns
+    # There are 7 vulns/infos/services in total:
+    #   - DNS Host Name
+    #   - Host Scan Time
+    #   - Open TCP Services List
+    #   - Web Server Version
+    #   - TCP/IP: Sequence number in both hosts
+    #   - Web server: Apache 1.3
+    #   - Web server: ETag
+
+    it "creates issues from vulns" do
+      expect_to_create_issue_with(
+        text: "DNS Host Name"
+      )
 
-  it "creates notes as needed" do
-    # Host node notes
-    expect_to_create_note_with(text: "Basic host info")
+      expect_to_create_issue_with(
+        text: "Host Scan Time"
+      )
 
-    run_import!
-  end
+      expect_to_create_issue_with(
+        text: "Open TCP Services List"
+      )
 
-  # Issues and evidences from vulns
-  # There are 7 vulns/infos/services in total:
-  #   - DNS Host Name
-  #   - Host Scan Time
-  #   - Open TCP Services List
-  #   - Web Server Version
-  #   - TCP/IP: Sequence number in both hosts
-  #   - Web server: Apache 1.3
-  #   - Web server: ETag
-
-  it "creates issues from vulns" do
-    expect_to_create_issue_with(
-      text: "DNS Host Name"
-    )
-
-    expect_to_create_issue_with(
-      text: "Host Scan Time"
-    )
-
-    expect_to_create_issue_with(
-      text: "Open TCP Services List"
-    )
-
-    expect_to_create_issue_with(
-      text: "Web Server Version"
-    )
-
-    expect_to_create_issue_with(
-      text: "TCP Sequence Number Approximation Based Denial of Service"
-    )
-
-    expect_to_create_issue_with(
-      text: "Apache 1.3 HTTP Server Expect Header Cross-Site Scripting"
-    )
-    
-    expect_to_create_issue_with(
-      text: "Apache Web Server ETag Header Information Disclosure Weakness"
-    )
-    
-    run_import!
-  end
+      expect_to_create_issue_with(
+        text: "Web Server Version"
+      )
 
-  it "creates evidence from vulns" do
-    expect_to_create_evidence_with(
-      content: "IP address\tHost name\n10.0.155.160\tNo registered hostname\n",
-      issue: "DNS Host Name",
-      node_label: "10.0.155.160"
-    )
-
-    expect_to_create_evidence_with(
-      content: "Scan duration: 5445 seconds\n\nStart time: Fri, Dec 20 2011, 17:38:59 GMT\n\nEnd time: Fri, Dec 20 2011, 19:09:44 GMT",
-      issue: "Host Scan Time",
-      node_label: "10.0.155.160"
-    )
-
-    expect_to_create_evidence_with(
-      content: "\tDescription\tService Detected\tOS On Redirected Port\n80\twww\tWorld Wide Web HTTP\thttp",
-      issue: "Open TCP Services List",
-      node_label: "10.0.155.160"
-    )
-
-    expect_to_create_evidence_with(
-      content: "Server Version\tServer Banner\nApache 1.3\tApache",
-      issue: "Web Server Version",
-      node_label: "10.0.155.160"
-    )
-
-    expect_to_create_evidence_with(
-      content: "Tested on port 80 with an injected SYN/RST offset by 16 bytes.",
-      issue: "TCP Sequence Number Approximation Based Denial of Service",
-      node_label: "10.0.155.160"
-    )
-    expect_to_create_evidence_with(
-      content: "HTTP/1.1 417 Expectation Failed\nDate: Fri, 20 Dec 2011 19:05:57 GMT",
-      issue: "Apache 1.3 HTTP Server Expect Header Cross-Site Scripting",
-      node_label: "10.0.155.160"
-    )
-    expect_to_create_evidence_with(
-      content: "3bee-4f12-00794aef",
-      issue: "Apache Web Server ETag Header Information Disclosure Weakness",
-      node_label: "10.0.155.160"
-    )
-
-    run_import!
-  end
+      expect_to_create_issue_with(
+        text: "TCP Sequence Number Approximation Based Denial of Service"
+      )
 
-  # A VULN is not required to have a RESULT element.
-  # See:
-  #   https://github.com/securityroots/dradispro-tracker/issues/8
-  #   https://qualysapi.qualys.eu/qwebhelp/fo_help/reports/report_dtd.htm
-  context "when an issue has no RESULT element" do
-    let(:example_xml) { 'spec/fixtures/files/no_result.xml' }
+      expect_to_create_issue_with(
+        text: "Apache 1.3 HTTP Server Expect Header Cross-Site Scripting"
+      )
+      
+      expect_to_create_issue_with(
+        text: "Apache Web Server ETag Header Information Disclosure Weakness"
+      )
+      
+      run_import!
+    end
 
-    it "detects an issue without a RESULT element and applies (n/a)" do
-      # 1 node should be created:
-      expect_to_create_node_with(label: '10.0.155.160')
+    it "creates evidence from vulns" do
+      expect_to_create_evidence_with(
+        content: "IP address\tHost name\n10.0.155.160\tNo registered hostname\n",
+        issue: "DNS Host Name",
+        node_label: "10.0.155.160"
+      )
 
-      # There is 1 vuln in total:
-      #   - TCP/IP: Sequence number in both hosts
-      # Each one should create 1 issue and 1 evidence
-      expect_to_create_issue_with(
-        text: "Sequence Number Approximation Based Denial of Service"
+      expect_to_create_evidence_with(
+        content: "Scan duration: 5445 seconds\n\nStart time: Fri, Dec 20 2011, 17:38:59 GMT\n\nEnd time: Fri, Dec 20 2011, 19:09:44 GMT",
+        issue: "Host Scan Time",
+        node_label: "10.0.155.160"
       )
 
       expect_to_create_evidence_with(
-        content: "n/a",
-        issue: "Sequence Number Approximation Based Denial of Service",
+        content: "\tDescription\tService Detected\tOS On Redirected Port\n80\twww\tWorld Wide Web HTTP\thttp",
+        issue: "Open TCP Services List",
+        node_label: "10.0.155.160"
+      )
+
+      expect_to_create_evidence_with(
+        content: "Server Version\tServer Banner\nApache 1.3\tApache",
+        issue: "Web Server Version",
+        node_label: "10.0.155.160"
+      )
+
+      expect_to_create_evidence_with(
+        content: "Tested on port 80 with an injected SYN/RST offset by 16 bytes.",
+        issue: "TCP Sequence Number Approximation Based Denial of Service",
+        node_label: "10.0.155.160"
+      )
+      expect_to_create_evidence_with(
+        content: "HTTP/1.1 417 Expectation Failed\nDate: Fri, 20 Dec 2011 19:05:57 GMT",
+        issue: "Apache 1.3 HTTP Server Expect Header Cross-Site Scripting",
+        node_label: "10.0.155.160"
+      )
+      expect_to_create_evidence_with(
+        content: "3bee-4f12-00794aef",
+        issue: "Apache Web Server ETag Header Information Disclosure Weakness",
         node_label: "10.0.155.160"
       )
 
       run_import!
     end
-  end
-
 
-  def expect_to_create_node_with(label:)
-    expect(content_service).to receive(:create_node).with(
-      hash_including label: label
-    ).once
-  end
+    # A VULN is not required to have a RESULT element.
+    # See:
+    #   https://github.com/securityroots/dradispro-tracker/issues/8
+    #   https://qualysapi.qualys.eu/qwebhelp/fo_help/reports/report_dtd.htm
+    context "when an issue has no RESULT element" do
+      #let(:example_xml) { 'spec/fixtures/files/no_result.xml' }
+
+      it "detects an issue without a RESULT element and applies (n/a)" do
+        # 1 node should be created:
+        expect_to_create_node_with(label: '10.0.155.160')
+
+        # There is 1 vuln in total:
+        #   - TCP/IP: Sequence number in both hosts
+        # Each one should create 1 issue and 1 evidence
+        expect_to_create_issue_with(
+          text: "Sequence Number Approximation Based Denial of Service"
+        )
+
+        expect_to_create_evidence_with(
+          content: "n/a",
+          issue: "Sequence Number Approximation Based Denial of Service",
+          node_label: "10.0.155.160"
+        )
+
+        @importer.import(file: 'spec/fixtures/files/no_result.xml')
+      end
+    end
 
-  def expect_to_create_note_with(node_label: nil, text:)
-    expect(content_service).to receive(:create_note) do |args|
-      expect(args[:text]).to include text
-      expect(args[:node].label).to eq node_label unless node_label.nil?
-    end.once
-  end
 
-  def expect_to_create_issue_with(text:)
-    expect(content_service).to receive(:create_issue) do |args|
-      expect(args[:text]).to include text
-      OpenStruct.new(args)
-    end.once
-  end
+    def expect_to_create_node_with(label:)
+      expect(@content_service).to receive(:create_node).with(
+        hash_including label: label
+      ).once
+    end
 
-  def expect_to_create_evidence_with(content:, issue:, node_label:)
-    expect(content_service).to receive(:create_evidence) do |args|
-      expect(args[:content]).to include content
-      expect(args[:issue].text).to include issue
-      expect(args[:node].label).to eq node_label
-    end.once
-  end
+    def expect_to_create_issue_with(text:)
+      expect(@content_service).to receive(:create_issue) do |args|
+        expect(args[:text]).to include text
+        OpenStruct.new(args)
+      end.once
+    end
 
+    def expect_to_create_evidence_with(content:, issue:, node_label:)
+      expect(@content_service).to receive(:create_evidence) do |args|
+        expect(args[:content]).to include content
+        expect(args[:issue].text).to include issue
+        expect(args[:node].label).to eq node_label
+      end.once
+    end
 
+  end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-qualys
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Qualys add-on for the Dradis Framework.