nexpose_ticketing 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 115064fd58b671883cce7cb3e2d248319fb49b77
-  data.tar.gz: 49eaabad5c7e5e5b8d8342c78971b2ee1bc421e5
+  metadata.gz: 6665f45b4fb44b5e107eb13ae98ea53e768e3a3c
+  data.tar.gz: 49e4aefdadb17710a8a927bee0bc858da29a1559
 SHA512:
-  metadata.gz: e31de51ea6dd0dbd4917221c1b14c6c20667349adfa245873c0626b5a77f965af00f9194ce9f8fde699d0c2b0db870e81ccd35ffb450b0eec5c1ae08f01f8ad3
-  data.tar.gz: e13adabcfafaf8e403952289a379038cb5f27d5bee56db5bc888d85885a4db848634fb41d445ba28a2aa82fe8736f4009b797afb8e78d431536955816205ee2e
+  metadata.gz: c36501adcb968939ad7af6cf3e3a599f9d3bb999c3d4300119f4e15cbcd00e9dba144cfc502b62087f66bd33e7dd179e4a48f3a42cdacc07ca06e6b2e7e160b5
+  data.tar.gz: 5ff1131739ab1d3ec3649ded018143fa2688aab89635fda74b6c07d2fdeaf686751cb92a5201b0e886ed1cd3cd497005b57ba5ef66b75ad4c1db52c422fd7ed4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose_ticketing (0.8.0)
+    nexpose_ticketing (0.8.2)
       nexpose (~> 0.8.0)
       nokogiri (~> 1.6)
       savon (~> 2.1)

data/lib/nexpose_ticketing/config/ticket_service.config

@@ -11,8 +11,10 @@
   - '1'
   # Minimum floor severity to report on. Number between 0 and 10.
   :severity: 8
-  # (M) Name of the report historical file saved in disk.
+  # (M) Name of the report historical file for sites saved in disk.
   :file_name: last_scan_data.csv
+  # (M) Name of the report historical file for tags saved in disk.
+  :tag_file_name: tag_last_scan_data.csv
   # (M) Defines the ticket creation mode:
   # 'D' Default IP *-* Vulnerability
   # 'I' IP address -* Vulnerability
@@ -25,8 +27,9 @@
   # (M) For 'I' & 'V' mode. Set to 'Y' for tickets that have been fixed to be closed after update, set to 'N' for ticket to be left
   # open for a user to manually close or change the status.
   :close_old_tickets_on_update: Y
-  # A comma separated list of tags to scope what gets ticketed
+  # Filters the reports to specific tags one per line, leave empty for no tags. Note tags cannot be used in conjunction with sites (tags get priority).
   :tags:
+  #- '1'
   # A comma separated list of vulnerability categories to include
   :vulnerabilityCategories:
   # The asset minimum risk score to open tickets for

data/lib/nexpose_ticketing/helpers/jira_helper.rb

@@ -22,28 +22,28 @@ class JiraHelper
   # Generates the NXID. The NXID is a unique identifier used to find and update and/or close tickets.
   #
   # * *Args*    :
-  #   - +site_id+ -  Site ID the tickets are being generated for. Required for all ticketing modes
+  #   - +nexpose_identifier_id+ -  Site/TAG ID the tickets are being generated for. Required for all ticketing modes
   #   - +row+ -  Row from the generated Nexpose CSV report. Required for default ('D') mode.
   #   - +current_ip+ -  The IP address of that this ticket is for. Required for IP mode ('I') mode.
   #
   # * *Returns* :
   #   - NXID string.
   #
-  def generate_nxid(site_id, row=nil, current_ip=nil)
-    fail 'Site ID is required to generate the NXID.' if site_id.empty?
+  def generate_nxid(nexpose_identifier_id, row=nil, current_ip=nil)
+    fail 'Nexpose Identifier ID is required to generate the NXID.' if nexpose_identifier_id.empty?
     case @options[:ticket_mode]
       # 'D' Default mode: IP *-* Vulnerability
       when 'D'
         fail 'Row is required to generate the NXID in \'D\' mode.' if row.nil? || row.empty?
-        @nxid = "#{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
+        @nxid = "#{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
       # 'I' IP address mode: IP address -* Vulnerability
       when 'I'
         fail 'Current IP is required to generate the NXID in \'I\' mode.' if current_ip.nil? || current_ip.empty?
-        @nxid = "#{site_id}#{current_ip.tr('.','')}"
+        @nxid = "#{nexpose_identifier_id}#{current_ip.tr('.','')}"
       # 'V' mode net yet implemented.
       # 'V' Vulnerability mode: Vulnerability -* IP address
       #          when 'V'
-      #            @NXID = "#{site_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
+      #            @NXID = "#{nexpose_identifier_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
       else
         fail 'Could not close tickets - do not understand the ticketing mode!'
     end
@@ -150,22 +150,22 @@ class JiraHelper
 
   # Prepares tickets from the CSV.
   # TODO Implement V Version.
-  def prepare_create_tickets(vulnerability_list, site_id)
+  def prepare_create_tickets(vulnerability_list, nexpose_identifier_id)
     @ticket = Hash.new(-1)
     case @options[:ticket_mode]
     # 'D' Default IP *-* Vulnerability
     when 'D'
-      prepare_tickets_default(vulnerability_list, site_id)
+      prepare_tickets_default(vulnerability_list, nexpose_identifier_id)
     # 'I' IP address -* Vulnerability
     when 'I'
-      prepare_tickets_by_ip(vulnerability_list, site_id)
+      prepare_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
     else
         fail 'Unsupported ticketing mode selected.'
     end
   end
 
   # Prepares and creates tickets in default mode.
-  def prepare_tickets_default(vulnerability_list, site_id)
+  def prepare_tickets_default(vulnerability_list, nexpose_identifier_id)
     @log.log_message('Preparing tickets for default mode.')
     tickets = []
     CSV.parse(vulnerability_list.chomp, headers: :first_row) do |row|
@@ -176,7 +176,7 @@ class JiraHelper
               'project' => {
                   'key' => "#{@jira_data[:project]}" },
               'summary' => "#{row['ip_address']} => #{summary}",
-              'description' => "CVSS Score: #{row['cvss_score']} \n\n #{row['fix']} \n\n #{row['url']} \n\n\n NXID: #{generate_nxid(site_id, row)}",
+              'description' => "CVSS Score: #{row['cvss_score']} \n\n #{row['fix']} \n\n #{row['url']} \n\n\n NXID: #{generate_nxid(nexpose_identifier_id, row)}",
               'issuetype' => {
                   'name' => 'Task' }
           }
@@ -190,12 +190,12 @@ class JiraHelper
   # per IP i.e. any vulnerabilities for a single IP in one ticket
   #
   #   - +vulnerability_list+ -  CSV of vulnerabilities within Nexpose.
-  #   - +site_id+ -  Site ID the vulnerability list was generate from.
+  #   - +nexpose_identifier_id+ -  Site/TAG ID the vulnerability list was generate from.
   #
   # * *Returns* :
   #   - List of JSON-formatted tickets for updating within Jira.
   #
-  def prepare_tickets_by_ip(vulnerability_list, site_id)
+  def prepare_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
     @log.log_message('Preparing tickets for IP mode.')
     tickets = []
     current_ip = -1
@@ -229,13 +229,13 @@ class JiraHelper
         \n\n"
       end
       unless current_ip == row['ip_address']
-        @ticket['fields']['description'] += "\n\n\n NXID: #{generate_nxid(site_id, row, current_ip)}"
+        @ticket['fields']['description'] += "\n\n\n NXID: #{generate_nxid(nexpose_identifier_id, row, current_ip)}"
         tickets.push(@ticket.to_json)
         current_ip = -1
         redo
       end
     end
-    @ticket['fields']['description'] += "\n\n\n NXID: #{generate_nxid(site_id, nil, current_ip)}"
+    @ticket['fields']['description'] += "\n\n\n NXID: #{generate_nxid(nexpose_identifier_id, nil, current_ip)}"
     tickets.push(@ticket.to_json) unless @ticket.nil?
     tickets
   end
@@ -304,12 +304,12 @@ class JiraHelper
   # * *Returns* :
   #   - List of Jira ticket Keys to be closed.
   #
-  def prepare_close_tickets(vulnerability_list, site_id)
+  def prepare_close_tickets(vulnerability_list, nexpose_identifier_id)
     @log.log_message('Preparing tickets to close.')
     @nxid = nil
     tickets = []
     CSV.parse(vulnerability_list.chomp, headers: :first_row)  do |row|
-      @nxid = generate_nxid(site_id, nil, row['ip_address'])
+      @nxid = generate_nxid(nexpose_identifier_id, nil, row['ip_address'])
       # Query Jira for the ticket by unique id (generated NXID)
       queried_key = get_jira_key("jql=project=#{@jira_data[:project]} AND description ~ \"NXID: #{@nxid}\" AND (status != #{@jira_data[:close_step_name]})&fields=key")
       if queried_key.nil? || queried_key.empty?
@@ -365,16 +365,16 @@ class JiraHelper
   # per IP i.e. any vulnerabilities for a single IP in one ticket
   #
   #   - +vulnerability_list+ -  CSV of vulnerabilities within Nexpose.
-  #   - +site_id+ -  Site ID the vulnerability list was generate from.
+  #   - +nexpose_identifier_id+ -  Site/TAG ID the vulnerability list was generate from.
   #
   # * *Returns* :
   #   - List of JSON-formated tickets for updating within Jira.
   #
-  def prepare_update_tickets(vulnerability_list, site_id)
+  def prepare_update_tickets(vulnerability_list, nexpose_identifier_id)
     fail 'Ticket updates are only supported in IP-address mode.' if @options[:ticket_mode] != 'I'
     @log.log_message('Preparing tickets to update.')
     #Jira uses the ticket key to push updates. Since new IPs won't have a Jira key, generate new tickets for all of the IPs found.
-    updated_tickets = prepare_tickets_by_ip(vulnerability_list, site_id)
+    updated_tickets = prepare_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
     tickets_to_send = []
 
     #Find the keys that exist (IPs that have tickets already)

data/lib/nexpose_ticketing/helpers/remedy_helper.rb

@@ -162,18 +162,18 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for creating within Remedy.
   #
-  def prepare_create_tickets(vulnerability_list, site_id)
+  def prepare_create_tickets(vulnerability_list, nexpose_identifier_id)
     @ticket = Hash.new(-1)
     case @options[:ticket_mode]
     # 'D' Default mode: IP *-* Vulnerability
     when 'D'
-      prepare_create_tickets_default(vulnerability_list, site_id)
+      prepare_create_tickets_default(vulnerability_list, nexpose_identifier_id)
     # 'I' IP address mode: IP address -* Vulnerability
     when 'I'
-      prepare_create_tickets_by_ip(vulnerability_list, site_id)
+      prepare_create_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
     # 'V' Vulnerability mode: Vulnerability -* IP address
     when 'V'
-      prepare_create_tickets_by_vulnerability(vulnerability_list, site_id)
+      prepare_create_tickets_by_vulnerability(vulnerability_list, nexpose_identifier_id)
     else
       fail 'No ticketing mode selected.'
     end
@@ -188,15 +188,15 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for creating within Remedy.
   #
-  def prepare_update_tickets(vulnerability_list, site_id)
+  def prepare_update_tickets(vulnerability_list, nexpose_identifier_id)
     @ticket = Hash.new(-1)
     case @options[:ticket_mode]
       # 'I' IP address mode: IP address -* Vulnerability
       when 'I'
-        prepare_update_tickets_by_ip(vulnerability_list, site_id)
+        prepare_update_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
       # 'V' Vulnerability mode: Vulnerability -* IP address
       when 'V'
-        prepare_update_tickets_by_vulnerability(vulnerability_list, site_id)
+        prepare_update_tickets_by_vulnerability(vulnerability_list, nexpose_identifier_id)
       else
         fail 'No ticketing mode selected.'
     end
@@ -213,7 +213,7 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for creating within Remedy.
   #
-  def prepare_create_tickets_default(vulnerability_list, site_id)
+  def prepare_create_tickets_default(vulnerability_list, nexpose_identifier_id)
     @log.log_message("Preparing tickets by default method.")
     tickets = []
     CSV.parse(vulnerability_list.chomp, headers: :first_row)  do |row|
@@ -229,7 +229,7 @@ class RemedyHelper
         'Action' => 'CREATE',
         'Summary' => "#{row['ip_address']} => #{row['summary']}",
         'Notes' => "Summary: #{row['summary']} \n\nFix: #{row['fix']} \n\nURL: #{row['url']}
-                    \n\nNXID: #{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}",
+                    \n\nNXID: #{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}",
         'Urgency' => '1-Critical'
       }
       tickets.push(ticket)
@@ -248,14 +248,14 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for creating within Remedy.
   #
-  def prepare_create_tickets_by_ip(vulnerability_list, site_id)
+  def prepare_create_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
     @log.log_message('Preparing tickets by IP address.')
     tickets = []
     current_ip = -1
     CSV.parse(vulnerability_list.chomp, headers: :first_row)  do |row|
       if current_ip == -1 
         current_ip = row['ip_address']
-        @log.log_message("Creating ticket with IP address: #{row['ip_address']}, Asset ID:  #{row['asset_id']} and Site ID: #{site_id}")
+        @log.log_message("Creating ticket with IP address: #{row['ip_address']}, Asset ID:  #{row['asset_id']} and Nexpose Identifier ID: #{nexpose_identifier_id}")
         @ticket = {
           'First_Name' => "#{@remedy_data[:first_name]}",
           'Impact' => '1-Extensive/Widespread',
@@ -279,14 +279,14 @@ class RemedyHelper
       end
       unless current_ip == row['ip_address']
         # NXID in the work_notes is the unique identifier used to query incidents to update them.
-        @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_ip}"
+        @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_ip}"
         tickets.push(@ticket)
         current_ip = -1
         redo
       end
     end
     # NXID in the work_notes is the unique identifier used to query incidents to update them.
-    @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_ip}"
+    @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_ip}"
     tickets.push(@ticket) unless @ticket.nil?
     tickets
   end
@@ -303,7 +303,7 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for creating within Remedy.
   #
-  def prepare_create_tickets_by_vulnerability(vulnerability_list, site_id)
+  def prepare_create_tickets_by_vulnerability(vulnerability_list, nexpose_identifier_id)
     @log.log_message("Preparing tickets by vulnerability.")
     tickets = []
     current_vuln_id = -1
@@ -317,7 +317,7 @@ class RemedyHelper
       current_vuln_id = row['vulnerability_id']
       current_solution_id = row['solution_id']
       current_asset_id =  row['asset_id']
-      @log.log_message("Creating ticket with vulnerability id: #{row['vulnerability_id']}, Asset ID:  #{row['asset_id']} and Site ID: #{site_id}")
+      @log.log_message("Creating ticket with vulnerability id: #{row['vulnerability_id']}, Asset ID:  #{row['asset_id']} and Nexpose Identifier ID: #{nexpose_identifier_id}")
       summary = "Vulnerability: #{row['title']}"
 
       #Remedy has a summary field max size of 100 so truncate any summaries that are larger than that and place the full summary in the notes.
@@ -373,7 +373,7 @@ class RemedyHelper
     end
     unless current_vuln_id == row['vulnerability_id']
       # NXID in the work_notes is the unique identifier used to query incidents to update them.
-      @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_asset_id}#{current_vuln_id}"
+      @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_asset_id}#{current_vuln_id}"
       current_vuln_id = -1
       current_solution_id = -1
       current_asset_id = -1
@@ -383,7 +383,7 @@ class RemedyHelper
     end
   end
   # NXID in the work_notes is the unique identifier used to query incidents to update them.
-  @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_asset_id}#{current_vuln_id}"
+  @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_asset_id}#{current_vuln_id}"
   @ticket = format_notes_by_vulnerability(@ticket, full_summary)
   tickets.push(@ticket) unless @ticket.nil?
   tickets
@@ -413,7 +413,7 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for updating within Remedy.
   #
-  def prepare_update_tickets_by_ip(vulnerability_list, site_id)
+  def prepare_update_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
     fail 'Ticket updates are only supported in IP-address mode.' if @options[:ticket_mode] != 'I'
     @ticket = Hash.new(-1)
     
@@ -427,11 +427,11 @@ class RemedyHelper
         ticket_status = row['comparison']
         
         # Query Remedy for the incident by unique id (generated NXID)
-        queried_incident = query_for_ticket("NXID: #{site_id}#{row['ip_address']}")
+        queried_incident = query_for_ticket("NXID: #{nexpose_identifier_id}#{row['ip_address']}")
         if queried_incident.nil? || queried_incident.empty?
-          @log.log_message("No incident found for NXID: #{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}")
+          @log.log_message("No incident found for NXID: #{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}")
         else
-          @log.log_message("Creating ticket update with IP address: #{row['ip_address']} for site with ID: #{site_id}")
+          @log.log_message("Creating ticket update with IP address: #{row['ip_address']} for Nexpose Identifier with ID: #{nexpose_identifier_id}")
           @log.log_message("Ticket status #{ticket_status}")
           # Remedy incident updates require populating all fields.
           @ticket = extract_queried_incident(queried_incident, "++ #{row['comparison']} Vulnerabilities ++++++++++++++++++++++++++\n")
@@ -455,14 +455,14 @@ class RemedyHelper
       end
       unless current_ip == row['ip_address']
         # NXID in the work_notes is the unique identifier used to query incidents to update them.
-        @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_ip}"
+        @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_ip}"
         tickets.push(@ticket)
         current_ip = -1
         redo
       end
     end
     # NXID in the work_notes is the unique identifier used to query incidents to update them.
-    @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_ip}" unless @ticket.empty?
+    @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_ip}" unless @ticket.empty?
     tickets.push(@ticket) unless @ticket.nil? || @ticket.empty?
     tickets
   end
@@ -477,7 +477,7 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for updating within Remedy.
   #
-  def prepare_update_tickets_by_vulnerability(vulnerability_list, site_id)
+  def prepare_update_tickets_by_vulnerability(vulnerability_list, nexpose_identifier_id)
     fail 'Ticket updates are only supported in IP-address mode.' if @options[:ticket_mode] != 'V'
     @ticket = Hash.new(-1)
 
@@ -497,12 +497,12 @@ class RemedyHelper
         current_solution_id = -1
 
         # Query Remedy for the incident by unique id (generated NXID)
-        queried_incident = query_for_ticket("NXID: #{site_id}#{row['asset_id']}#{row['vulnerability_id']}")
+        queried_incident = query_for_ticket("NXID: #{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}")
         if queried_incident.nil? || queried_incident.empty?
-          @log.log_message("No incident found for NXID: #{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}. Creating...")
+          @log.log_message("No incident found for NXID: #{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}. Creating...")
           new_ticket_csv = vulnerability_list.split("\n").first
           new_ticket_csv += "\n#{row.to_s}"
-          new_ticket = prepare_create_tickets_by_vulnerability(new_ticket_csv, site_id)
+          new_ticket = prepare_create_tickets_by_vulnerability(new_ticket_csv, nexpose_identifier_id)
           @log.log_message('Created ticket. Sending to Remedy...')
           create_tickets(new_ticket)
           @log.log_message('Ticket sent. Performing update for ticket...')
@@ -510,7 +510,7 @@ class RemedyHelper
           current_vuln_id = -1
           redo
         else
-          @log.log_message("Creating ticket update for vulnerability with ID: #{row['vulnerability_id']}, Asset ID:  #{row['asset_id']} and Site ID: #{site_id}. Ticket status #{ticket_status}.")
+          @log.log_message("Creating ticket update for vulnerability with ID: #{row['vulnerability_id']}, Asset ID:  #{row['asset_id']} and Nexpose Identifier ID: #{nexpose_identifier_id}. Ticket status #{ticket_status}.")
           # Remedy incident updates require populating all fields.
           @ticket = extract_queried_incident(queried_incident, "++ #{row['comparison']} Assets ++++++++++++++++++++++\n")
         end
@@ -548,7 +548,7 @@ class RemedyHelper
       unless current_vuln_id == row['vulnerability_id']
         # NXID in the work_notes is the unique identifier used to query incidents to update them.
         @ticket['Notes'] += "\n\n" + current_solutions_text
-        @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_asset_id}#{current_vuln_id}"
+        @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_asset_id}#{current_vuln_id}"
         tickets.push(@ticket)
         current_vuln_id = -1
         current_solution_id = -1
@@ -558,7 +558,7 @@ class RemedyHelper
     end
     # NXID in the work_notes is the unique identifier used to query incidents to update them.
     @ticket['Notes'] += current_solutions_text
-    @ticket['Notes'] += "\n\nNXID: #{site_id}#{current_asset_id}#{current_vuln_id}" unless @ticket.empty?
+    @ticket['Notes'] += "\n\nNXID: #{nexpose_identifier_id}#{current_asset_id}#{current_vuln_id}" unless @ticket.empty?
     tickets.push(@ticket) unless @ticket.nil? || @ticket.empty?
     tickets
   end
@@ -692,7 +692,7 @@ class RemedyHelper
   # * *Returns* :
   #   - List of savon-formated (hash) tickets for closing within Remedy.
   #
-  def prepare_close_tickets(vulnerability_list, site_id)
+  def prepare_close_tickets(vulnerability_list, nexpose_identifier_id)
     fail 'Ticket closures are only supported in default mode.' if @options[:ticket_mode] == 'I'
     @log.log_message('Preparing ticket closures by default method.')
     @nxid = nil
@@ -701,13 +701,13 @@ class RemedyHelper
       case @options[:ticket_mode]
         # 'D' Default mode: IP *-* Vulnerability
         when 'D'
-          @nxid = "#{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
+          @nxid = "#{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
         # 'I' IP address mode: IP address -* Vulnerability
         when 'I'
-          @nxid = "#{site_id}#{row['current_ip']}"
+          @nxid = "#{nexpose_identifier_id}#{row['current_ip']}"
         # 'V' Vulnerability mode: Vulnerability -* IP address
         when 'V'
-          @nxid = "#{site_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
+          @nxid = "#{nexpose_identifier_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
         else
           fail 'Could not close tickets - do not understand the ticketing mode!'
       end

data/lib/nexpose_ticketing/helpers/servicedesk_helper.rb

@@ -52,15 +52,15 @@ class ServiceDeskHelper
         db.close()
     end
 
-    def prepare_create_tickets(vulnerability_list, site_id)
+    def prepare_create_tickets(vulnerability_list, nexpose_identifier_id)
         @log.log_message('Preparing ticket requests...')
         case @options[:ticket_mode]
             # 'D' Default mode: IP *-* Vulnerability
             when 'D'
-                tickets = create_tickets_by_default(vulnerability_list, site_id)
+                tickets = create_tickets_by_default(vulnerability_list, nexpose_identifier_id)
             # 'I' IP address mode: IP address -* Vulnerability
             when 'I'
-                tickets = create_tickets_by_ip(vulnerability_list, site_id)
+                tickets = create_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
             else
                 fail 'No ticketing mode selected.'
         end
@@ -143,27 +143,27 @@ class ServiceDeskHelper
     end
 
     ## Given a bunch of vulnerabilities that passed the filters, make tickets for each one
-    def create_tickets_by_default(vulnerability_list, site_id)
+    def create_tickets_by_default(vulnerability_list, nexpose_identifier_id)
         @log.log_message('Preparing tickets by vulnerability...')
         tickets = []
         CSV.parse( vulnerability_list.chomp, headers: :first_row )  do |vuln|
             subject = "#{vuln['ip_address']}: #{vuln['summary']}"
             description = "Host: #{ip_address}\nSummary: #{vuln['summary']}\nFix: #{vuln['fix']}\nURL: #{vuln['url']}"
 
-            tickets << { :action => :create, :nxid => "#{site_id}#{vuln['asset_id']}#{vuln['vulnerability_id']}#{vuln['solution_id']}",
+            tickets << { :action => :create, :nxid => "#{nexpose_identifier_id}#{vuln['asset_id']}#{vuln['vulnerability_id']}#{vuln['solution_id']}",
                          :description => create_ticket_request( subject, description ) }
         end
         return tickets
     end
 
 
-    def create_tickets_by_ip(vulnerability_list, site_id)
+    def create_tickets_by_ip(vulnerability_list, nexpose_identifier_id)
         @log.log_message('Preparing tickets by ip')
         tickets = []
         hostVulns = {}
         CSV.parse( vulnerability_list.chomp, headers: :first_row )  do |vuln|
-            hostVulns["#{site_id}#{vuln['ip_address']}"] = { :ip => vuln['ip_address'], :description => "" } if not hostVulns.has_key?("#{site_id}#{vuln['ip_address']}")
-            hostVulns["#{site_id}#{vuln['ip_address']}"][:description] += "Summary: #{vuln['summary']}\nFix: #{vuln['fix']}\nURL: #{vuln['url']}\n\n"
+            hostVulns["#{nexpose_identifier_id}#{vuln['ip_address']}"] = { :ip => vuln['ip_address'], :description => "" } if not hostVulns.has_key?("#{nexpose_identifier_id}#{vuln['ip_address']}")
+            hostVulns["#{nexpose_identifier_id}#{vuln['ip_address']}"][:description] += "Summary: #{vuln['summary']}\nFix: #{vuln['fix']}\nURL: #{vuln['url']}\n\n"
         end
 
         hostVulns.each do |nxid, vulnInfo|
@@ -260,15 +260,15 @@ class ServiceDeskHelper
     end
 
     
-    def prepare_update_tickets(vulnerability_list, site_id)
+    def prepare_update_tickets(vulnerability_list, nexpose_identifier_id)
         fail 'Ticket updates are only supported in IP-address mode.' if @options[:ticket_mode] != 'I'
 
         @log.log_message('Preparing ticket updates by IP address.')
         tickets = []
         hostVulns={}
         CSV.parse( vulnerability_list.chomp, headers: :first_row )  do |vuln|
-            hostVulns["#{site_id}#{vuln['ip_address']}"] = { :ip => vuln['ip_address'], :description => "" } if not hostVulns.has_key?(vuln['asset_id'])
-            hostVulns["#{site_id}#{vuln['ip_address']}"][:description] += "Summary: #{vuln['summary']}\nFix: #{vuln['fix']}\nURL: #{vuln['url']}\n\n"
+            hostVulns["#{nexpose_identifier_id}#{vuln['ip_address']}"] = { :ip => vuln['ip_address'], :description => "" } if not hostVulns.has_key?(vuln['asset_id'])
+            hostVulns["#{nexpose_identifier_id}#{vuln['ip_address']}"][:description] += "Summary: #{vuln['summary']}\nFix: #{vuln['fix']}\nURL: #{vuln['url']}\n\n"
         end
 
         hostVulns.each do |nxid, vulnInfo|
@@ -308,7 +308,7 @@ class ServiceDeskHelper
     # * *Returns* :
     #   - List of savon-formated (hash) tickets for closing within ServiceDesk.
     #
-    def prepare_close_tickets(vulnerability_list, site_id)
+    def prepare_close_tickets(vulnerability_list, nexpose_identifier_id)
       fail 'Ticket closures are only supported in default mode.' if @options[:ticket_mode] == 'I'
       @log.log_message('Preparing ticket closures by default method.')
       @nxid = nil
@@ -317,13 +317,13 @@ class ServiceDeskHelper
         case @options[:ticket_mode]
           # 'D' Default mode: IP *-* Vulnerability
           when 'D'
-            @nxid = "#{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
+            @nxid = "#{nexpose_identifier_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
           # 'I' IP address mode: IP address -* Vulnerability
           when 'I'
-            @nxid = "#{site_id}#{row['current_ip']}"
+            @nxid = "#{nexpose_identifier_id}#{row['current_ip']}"
           # 'V' Vulnerability mode: Vulnerability -* IP address
 #          when 'V'
-#            @NXID = "#{site_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
+#            @NXID = "#{nexpose_identifier_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
           else
             fail 'Could not close tickets - do not understand the ticketing mode!'
         end