dradis-nmap 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ceb593983c4606328165297c4f5032eaa2e274
-  data.tar.gz: bebbf15e690bfcb0c3fe2101a2b37d708fdb117a
+  metadata.gz: b86146a650b6a34609cb267a6c5d8e089f2263f9
+  data.tar.gz: b6d42353ddecfc904ebf0cf67860f61250f140e5
 SHA512:
-  metadata.gz: be8e6e1db6fa28bc4b827c65c3d06f90338a0d422dcab1f87d1a0aad5c51e3b224e81c916a3b2ac5658ba102480292f47266f61e628403ef07fed3c1c96a62f6
-  data.tar.gz: c37c957b8398d23b0bcf255210bd7375adad131c1086051ffb8c56c6c627ffa264a7fc09573dfd65a150d89a6dfaf5787d4c78c2d30d4a8a3b72b29e4e0afa35
+  metadata.gz: 01c6226cada0034ab53f352c079d6b020428273db580d3a451866934d9ae9da89caa9f2b371997b8f74052844f7e8353894edda9a355344a0fd42629f5437d6b
+  data.tar.gz: c771b2ff0081f368f41ba6d64939451f600e468fbf3118270a0ea4b9b8d8a8087d135b3376b2d4205429a3504a0690ebe3fbc9dd35c7dacbace54c53089d2f16

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Dradis Framework 3.10 (August, 2018) ##
+
+*   Split services data into services and services_extra tables
+
 ## Dradis Framework 3.9 (January, 2018) ##
 
 *   No changes.

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

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

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

@@ -41,19 +41,24 @@ module Dradis::Plugins::Nmap
         content_service.create_note(text: host_text, node: host_node)
 
         host.each_port do |port|
-          logger.info{ "\tNew port: #{ port.number }/#{ port.protocol }" }
+          logger.info { "\tNew port: #{port.number}/#{port.protocol}" }
 
-          # Add service to host properties
-          host_node.set_property(:services, {
-              port: port.number,
-              protocol: port.protocol.to_s,
-              state: port.state.to_s,
-              reason: port.reason,
-              name: port.try('service').try('name'),
-              product: port.try('service').try('product'),
-              scripts: port.try('scripts'),
-              version: port.try('service').try('version')
-          })
+          service = {
+            port: port.number,
+            protocol: port.protocol.to_s,
+            state: port.state.to_s,
+            reason: port.reason,
+            name: port.try(:service).try(:name),
+            product: port.try(:service).try(:product),
+            version: port.try(:service).try(:version),
+            source: :nmap,
+          }
+
+          # Node#set_service will store these under
+          # Node#properties[:service_extras]:
+          port.scripts.each { |k, v| service[k] = v } if port.try(:scripts)
+
+          host_node.set_service(service)
 
           # HACK: patch in a `host` method to `Nmap::Port`
           # so we can use it in the template:

metadata

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