nexpose_ticketing 0.3.1 → 0.5.0

data/lib/nexpose_ticketing/helpers/servicedesk_helper.rb

@@ -0,0 +1,337 @@
+require 'net/http'
+require 'nokogiri'
+
+class ServiceDeskHelper
+    attr_accessor :servicedesk_data, :options, :log
+
+    def initialize(servicedesk_data, options)
+        @servicedesk_data = servicedesk_data
+        @options = options
+        @log = NexposeTicketing::NXLogger.new
+
+        @rest_uri = servicedesk_data[:rest_uri]
+        @api_key = servicedesk_data[:api_key]
+        @ticket_db_path = servicedesk_data[:ticket_db_path]
+    end
+
+
+    def open_database()
+        DBM.open(@ticket_db_path, 0600, DBM::WRCREAT)
+    end
+
+
+    def add_ticket_to_database(workorderid, nxid)
+        @log.log_message("Adding ticket <#{workorderid}> for NXID <#{nxid}> to local db.")
+        db = open_database()
+        db[nxid] = workorderid
+        db.close()
+    end
+
+
+    def find_ticket_in_database(nxid)
+        @log.log_message("Finding workorder id for NXID <#{nxid}> from local db.")
+        db = open_database()
+        begin
+            workorderid = db[nxid]
+            @log.log_message("Lookup found incident <#{workorderid}> in the db.")
+        rescue Exception => e
+            @log.log_message("Threw an exception accessing the dbm <#{e.class} #{e} #{e.message}>.")
+            raise e
+        end
+        db.close()
+
+        return workorderid
+    end
+
+
+    def remove_ticket_from_database(nxid)
+        @log.log_message("Removing workorder id from database for NXID <#{nxid}>")
+        db = open_database()
+        db.delete(nxid)
+        db.close()
+    end
+
+    def prepare_create_tickets(vulnerability_list, site_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)
+            # 'I' IP address mode: IP address -* Vulnerability
+            when 'I'
+                tickets = create_tickets_by_ip(vulnerability_list, site_id)
+            else
+                fail 'No ticketing mode selected.'
+        end
+
+        tickets.each { |ticket| @log.log_message("Prepared ticket: #{ticket}")}
+        return tickets
+    end
+
+    ## Uses the configured or default options to set up a ticket creation request
+    def create_ticket_request(subject, description)
+        request = Nokogiri::XML::Builder.new do |xml|
+            xml.Operation {
+                xml.Details {
+                    xml.parameter {
+                        xml.name {
+                            xml.text 'requester'
+                        }
+                        xml.value {
+                            xml.text @servicedesk_data[:requestor]
+                        }
+                    }
+                    xml.parameter {
+                        xml.name {
+                            xml.text 'Group'
+                        }
+                        xml.value {
+                            xml.text @servicedesk_data[:group]
+                        }
+                    }
+                    xml.parameter {
+                        xml.name {
+                            xml.text 'subject'
+                        }
+                        xml.value {
+                            xml.text subject
+                        }
+                    }
+                    xml.parameter {
+                        xml.name {
+                            xml.text 'description'
+                        }
+                        xml.value {
+                            xml.cdata description
+                        }
+                    }
+                }
+            }
+        end
+        puts request.to_xml
+
+        return request.to_xml
+    end
+
+    def modify_ticket_request(description)
+#         modifyRequest = """
+# <Operation>
+#     <Details>
+#         <parameter>
+#             <name>description</name>
+#             <value>#{description}</value>
+#         </parameter>
+#     </Details>
+# </Operation>
+# """
+        doc = Nokogiri::XML::Builder.new() do |xml|
+        xml.Operation {
+            xml.Details {
+                xml.parameter {
+                    xml.name {
+                        xml.text 'Description'
+                    }
+                    xml.value {
+                        xml.cdata description
+                    }
+                }
+            }
+
+        }
+        end
+
+        return doc.to_xml
+    end
+
+    ## Given a bunch of vulnerabilities that passed the filters, make tickets for each one
+    def create_tickets_by_default(vulnerability_list, site_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']}",
+                         :description => create_ticket_request( subject, description ) }
+        end
+        return tickets
+    end
+
+
+    def create_tickets_by_ip(vulnerability_list, site_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?(vuln['asset_id'])
+            hostVulns["#{site_id}#{vuln['ip_address']}"][:description] += "Summary: #{vuln['summary']}\nFix: #{vuln['fix']}\nURL: #{vuln['url']}\n\n"
+        end
+
+        hostVulns.each do |nxid, vulnInfo|
+            tickets << { :action => :create, :nxid => nxid,
+                         :description => create_ticket_request( "Vulnerabilities on #{vulnInfo[:ip]}", vulnInfo[:description] ) }
+        end
+        return tickets
+    end
+
+
+    def submit_ticket(ticket)
+        @log.log_message("Connecting to #{@rest_uri}.")
+        uri = URI( @rest_uri )
+        res = Net::HTTP::post_form( uri,
+                            'OPERATION_NAME' => 'ADD_REQUEST',
+                            'TECHNICIAN_KEY' => @api_key,
+                            'INPUT_DATA' => ticket[:description] )
+
+        response = Nokogiri::XML.parse( res.read_body )
+        status = Integer(response.xpath('//statuscode').text)
+        
+        if status != 200
+            @log.log_message("Unable to create ticket #{ticket}, got response #{response.to_xml}")
+            return
+        end
+
+        workorderid = Integer(response.xpath('//workorderid').text)
+
+        @log.log_message( "created ticket #{workorderid}")
+        add_ticket_to_database( workorderid, ticket[:nxid] )
+    end
+
+
+    def modify_ticket(ticket)
+        @log.log_message("Connecting to #{@rest_uri}/#{ticket[:workorderid]}")
+        uri = URI( "#{@rest_uri}/#{ticket[:workorderid]}" )
+        res = Net::HTTP::post_form( uri,
+                            'OPERATION_NAME' => 'EDIT_REQUEST',
+                            'TECHNICIAN_KEY' => @api_key,
+                            'INPUT_DATA' => ticket[:description] )
+
+        response = Nokogiri::XML.parse( res.read_body )
+        begin
+            status = Integer(response.xpath('//statuscode').text)
+        rescue Exception => e
+            @log.log_message("XML request was #{ticket[:description]} response is #{response.to_xml}")
+            raise e
+        end
+        
+        if status != 200
+            @log.log_message("Unable to modify ticket #{ticket}, got response #{response.to_xml}")
+            return
+        end
+    end
+
+
+    def close_ticket(ticket)
+        @log.log_message("Connecting to #{@rest_uri}/#{ticket[:workorderid]}")
+        uri = URI( "#{@rest_uri}/#{ticket[:workorderid]}" )
+        res = Net::HTTP::post_form( uri,
+                            'OPERATION_NAME' => 'CLOSE_REQUEST',
+                            'TECHNICIAN_KEY' => @api_key )
+
+        response = Nokogiri::XML.parse( res.read_body )
+        begin
+            status = Integer(response.xpath('//statuscode').text)
+        rescue Exception => e
+            @log.log_message("XML request was #{ticket[:description]} response is #{response.to_xml}")
+            raise e
+        end
+
+        if status != 200
+            @log.log_message("Unable to close ticket #{ticket}, got response #{response.to_xml}")
+            return
+        end
+
+    end
+
+
+    def create_tickets(tickets)
+        @log.log_message("Creating tickets on server at #{@rest_uri}")
+
+        tickets.each { |ticket| submit_ticket(ticket) }
+    end
+
+    
+    def prepare_update_tickets(vulnerability_list, site_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"
+        end
+
+        hostVulns.each do |nxid, vulnInfo|
+            workorderid = find_ticket_in_database(nxid)
+            if workorderid.nil? || workorderid.empty?
+                @log.log_message("No incident found for assetid #{nxid}, using defaults")
+                tickets << { :action => :create, :nxid => nxid,
+                             :description => create_ticket_request("Vulnerabilities on #{vulnInfo[:ip]}", vulnInfo[:description]) }
+            else
+                tickets << { :action => :modifty, :nxid => nxid, :workorderid => workorderid,
+                             :description => modify_ticket_request( vulnInfo[:description] ) }
+            end
+        end
+        return tickets
+    end
+
+
+    def update_tickets(tickets)
+        @log.log_message('Updating tickets')
+        tickets.each do |ticket|
+            if ticket[:action] == :create
+                @log.log_message('Creating ticket')
+                submit_ticket(ticket)
+            else
+                @log.log_message("Updating ticket #{ticket[:workorderid]}")
+                modify_ticket(ticket)
+            end
+        end
+    end
+
+
+    # Prepare ticket closures from the CSV of vulnerabilities exported from Nexpose.
+    #
+    # * *Args*    :
+    #   - +vulnerability_list+ -  CSV of vulnerabilities within Nexpose.
+    #
+    # * *Returns* :
+    #   - List of savon-formated (hash) tickets for closing within ServiceDesk.
+    #
+    def prepare_close_tickets(vulnerability_list, site_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
+      tickets = []
+      CSV.parse(vulnerability_list.chomp, headers: :first_row)  do |row|
+        case @options[:ticket_mode]
+          # 'D' Default mode: IP *-* Vulnerability
+          when 'D'
+            @nxid = "#{site_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']}"
+          # 'V' Vulnerability mode: Vulnerability -* IP address
+#          when 'V'
+#            @NXID = "#{site_id}#{row['current_asset_id']}#{row['current_vuln_id']}"
+          else
+            fail 'Could not close tickets - do not understand the ticketing mode!'
+        end
+        workorderid = find_ticket_in_database(@nxid)
+        # Query ServiceDesk for the incident by unique id (generated NXID)
+        if workorderid.nil? || workorderid.empty?
+          @log.log_message("No workorderid found for NXID #{@nxid}")
+        else
+            tickets << { :action => :close, :nxid => @nxid, :workorderid => workorderid,
+                         :description => closeTicketRequest() }
+        end
+      end
+      return tickets
+    end
+
+
+    def close_tickets( tickets )
+        tickets.each { |ticket| close_ticket(ticket) if ticket[:action] == close && !ticket[:workorderid].nil?}
+    end
+end

data/lib/nexpose_ticketing/helpers/servicenow_helper.rb

@@ -37,7 +37,7 @@ class ServiceNowHelper
   #
   def update_tickets(tickets)
     if tickets.nil? || tickets.empty?
-      @log.log_message("No tickets to update.")
+      @log.log_message('No tickets to update.')
     else
       tickets.each do |ticket|
         send_ticket(ticket, @servicenow_data[:servicenow_url], @servicenow_data[:redirect_limit])
@@ -53,7 +53,7 @@ class ServiceNowHelper
   #
   def close_tickets(tickets)
     if tickets.nil? || tickets.empty?
-      @log.log_message("No tickets to close.")
+      @log.log_message('No tickets to close.')
     else
       tickets.each do |ticket|
         send_ticket(ticket, @servicenow_data[:servicenow_url], @servicenow_data[:redirect_limit])
@@ -94,7 +94,7 @@ class ServiceNowHelper
       when Net::HTTPRedirection then send_ticket(ticket, res['location'], limit - 1)
     else
       @log.log_message("Error in response: #{res['error']}")
-      res['error']
+      raise ArgumentError, res['error']
     end
   end
 
@@ -107,20 +107,21 @@ class ServiceNowHelper
   # * *Returns* :
   #   - List of JSON-formated tickets for creating within ServiceNow.
   #
-  def prepare_create_tickets(vulnerability_list)
+  def prepare_create_tickets(vulnerability_list, site_id)
     @ticket = Hash.new(-1)
     case @options[:ticket_mode]
     # 'D' Default mode: IP *-* Vulnerability
     when 'D'
-      prepare_create_tickets_default(vulnerability_list)
+      prepare_create_tickets_default(vulnerability_list, site_id)
     # 'I' IP address mode: IP address -* Vulnerability
     when 'I'
-      prepare_create_tickets_by_ip(vulnerability_list)
+      prepare_create_tickets_by_ip(vulnerability_list, site_id)
     else
       fail 'No ticketing mode selected.'
     end
   end
-  
+
+
   # Prepares a list of vulnerabilities into a list of JSON-formatted tickets (incidents) for 
   # ServiceNow. The preparation by default means that each vulnerability within Nexpose is a 
   # separate incident within ServiceNow.  This makes for smaller, more actionalble incidents but 
@@ -132,28 +133,28 @@ class ServiceNowHelper
   # * *Returns* :
   #   - List of JSON-formated tickets for creating within ServiceNow.
   #
-  def prepare_create_tickets_default(vulnerability_list)
-    @log.log_message("Preparing tickets by default method.")
+  def prepare_create_tickets_default(vulnerability_list, site_id)
+    @log.log_message('Preparing tickets by default method.')
     tickets = []
     CSV.parse(vulnerability_list.chomp, headers: :first_row)  do |row|
       # ServiceNow doesn't allow new line characters in the incident short description.
       summary = row['summary'].gsub(/\n/, ' ')
 
-      @log.log_message("Creating ticket with IP address: #{row['ip_address']} and summary: #{summary}")
-      # NXID in the work_notes is a unique identifier used to query incidents to update/resolve 
+      @log.log_message("Creating ticket with IP address: #{row['ip_address']}, site id: #{site_id} and summary: #{summary}")
+      # NXID in the u_work_notes is a unique identifier used to query incidents to update/resolve 
       # incidents as they are resolved in Nexpose.
       ticket = {
           'sysparm_action' => 'insert',
-          'caller_id' => "#{@servicenow_data[:username]}",
-          'category' => 'Software',
-          'impact' => '1',
-          'urgency' => '1',
-          'short_description' => "#{row['ip_address']} => #{summary}",
-          'work_notes' => "Summary: #{summary}
+          'u_caller_id' => "#{@servicenow_data[:username]}",
+          'u_category' => 'Software',
+          'u_impact' => '1',
+          'u_urgency' => '1',
+          'u_short_description' => "#{row['ip_address']} => #{summary}",
+          'u_work_notes' => "Summary: #{summary}
                           Fix: #{row['fix']} 
                           ----------------------------------------------------------------------------
                           URL: #{row['url']}
-                          NXID: #{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
+                          NXID: #{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
       }.to_json
       tickets.push(ticket)
     end
@@ -171,50 +172,50 @@ class ServiceNowHelper
   # * *Returns* :
   #   - List of JSON-formated tickets for creating within ServiceNow.
   #
-  def prepare_create_tickets_by_ip(vulnerability_list)
-    @log.log_message("Preparing tickets by IP address.")
+  def prepare_create_tickets_by_ip(vulnerability_list, site_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']}")
+        @log.log_message("Creating ticket with IP address: #{row['ip_address']} for site with ID: #{site_id}")
         @ticket = {
           'sysparm_action' => 'insert',
-          'caller_id' => "#{@servicenow_data[:username]}",
-          'category' => 'Software',
-          'impact' => '1',
-          'urgency' => '1',
-          'short_description' => "#{row['ip_address']} => Vulnerabilities",
-          'work_notes' => "\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+          'u_caller_id' => "#{@servicenow_data[:username]}",
+          'u_category' => 'Software',
+          'u_impact' => '1',
+          'u_urgency' => '1',
+          'u_short_description' => "#{row['ip_address']} => Vulnerabilities",
+          'u_work_notes' => "\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++
                            ++ New Vulnerabilities ++++++++++++++++++++++++++++++++++++
                            +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n"
         }
       end
       if current_ip == row['ip_address']
-        @ticket['work_notes'] += 
+        @ticket['u_work_notes'] += 
           "\n\n==========================================
           Summary: #{row['summary']}
           ----------------------------------------------------------------------------
           Fix: #{row['fix']}"
         unless row['url'].nil?
-          @ticket['work_notes'] += 
+          @ticket['u_work_notes'] += 
             "\n----------------------------------------------------------------------------
              URL: #{row['url']}"
         end
       end
       unless current_ip == row['ip_address']
-        # NXID in the work_notes is the unique identifier used to query incidents to update them.
+        # NXID in the u_work_notes is the unique identifier used to query incidents to update them.
         @log.log_message("Found new IP address. Finishing ticket with with IP address: #{current_ip} and moving onto IP #{row['ip_address']}")
-        @ticket['work_notes'] += "\nNXID: #{current_ip}"
+        @ticket['u_work_notes'] += "\nNXID: #{site_id}#{current_ip}"
         @ticket = @ticket.to_json
         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['work_notes'] += "\nNXID: #{current_ip}" unless (@ticket.size == 0)
+    # NXID in the u_work_notes is the unique identifier used to query incidents to update them.
+    @ticket['u_work_notes'] += "\nNXID: #{site_id}#{current_ip}" unless (@ticket.size == 0)
     tickets.push(@ticket.to_json) unless @ticket.nil?
     tickets
   end
@@ -229,11 +230,11 @@ class ServiceNowHelper
   # * *Returns* :
   #   - List of JSON-formated tickets for updating within ServiceNow.
   #
-  def prepare_update_tickets(vulnerability_list)
+  def prepare_update_tickets(vulnerability_list, site_id)
     fail 'Ticket updates are only supported in IP-address mode.' if @options[:ticket_mode] == 'D'
     @ticket = Hash.new(-1)
     
-    @log.log_message("Preparing ticket updates by IP address.")
+    @log.log_message('Preparing ticket updates by IP address.')
     tickets = []
     current_ip = -1
     ticket_status = 'New'
@@ -241,7 +242,7 @@ class ServiceNowHelper
       if current_ip == -1 
         current_ip = row['ip_address']
         ticket_status = row['comparison']
-        @log.log_message("Creating ticket update with IP address: #{row['ip_address']}")
+        @log.log_message("Creating ticket update with IP address: #{row['ip_address']} and site ID: #{site_id}")
         @log.log_message("Ticket status #{ticket_status}")
         action =  'update'
         if ticket_status == 'New'
@@ -249,8 +250,8 @@ class ServiceNowHelper
         end
         @ticket = {
           'sysparm_action' => action,
-          'sysparm_query' => "work_notesCONTAINSNXID: #{row['ip_address']}",
-          'work_notes' => 
+          'sysparm_query' => "u_work_notesCONTAINSNXID: #{site_id}#{row['ip_address']}",
+          'u_work_notes' => 
             "\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++
              ++ #{row['comparison']} Vulnerabilities +++++++++++++++++++++++++++++++++++++
              +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n"
@@ -259,41 +260,42 @@ class ServiceNowHelper
       if current_ip == row['ip_address']
         # If the ticket_status is different, add a a new 'header' to signify a new block of tickets.
         unless ticket_status == row['comparison']
-          @ticket['work_notes'] += 
-            "\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+          @ticket['u_work_notes'] += 
+            "\n\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++
              ++ #{row['comparison']} Vulnerabilities +++++++++++++++++++++++++++++++++++++
              +++++++++++++++++++++++++++++++++++++++++++++++++++++++\n\n"
           ticket_status = row['comparison']
         end
         
-        @ticket['work_notes'] += 
+        @ticket['u_work_notes'] += 
           "\n\n==========================================
            Summary: #{row['summary']}
            ----------------------------------------------------------------------------
            Fix: #{row['fix']}"
         # Only add the URL block if data exists in the row.
         unless row['url'].nil?
-          @ticket['work_notes'] += 
+          @ticket['u_work_notes'] += 
             "----------------------------------------------------------------------------
              URL: #{row['url']}"
         end
       end
       unless current_ip == row['ip_address']
-        # NXID in the work_notes is the unique identifier used to query incidents to update them.
-        @ticket['work_notes'] += "\nNXID: #{current_ip}"
+        # NXID in the u_work_notes is the unique identifier used to query incidents to update them.
+        @ticket['u_work_notes'] += "\nNXID: #{site_id}#{current_ip}"
         @ticket = @ticket.to_json
         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['work_notes'] += "\nNXID: #{current_ip}" unless (@ticket.size == 0)
+    # NXID in the u_work_notes is the unique identifier used to query incidents to update them.
+    @ticket['u_work_notes'] += "\nNXID: #{site_id}#{current_ip}" unless (@ticket.size == 0)
     tickets.push(@ticket.to_json) unless @ticket.nil?
     tickets
   end
-  
-  # Prepare ticket closures from the CSV of vulnerabilities exported from Nexpose. This method 
+
+
+  # Prepare ticket closures from the CSV of vulnerabilities exported from Nexpose. This method
   # currently only supports updating default mode tickets in ServiceNow.
   #
   # * *Args*    :
@@ -302,15 +304,29 @@ class ServiceNowHelper
   # * *Returns* :
   #   - List of JSON-formated tickets for closing within ServiceNow.
   #
-  def prepare_close_tickets(vulnerability_list)
-    fail 'Ticket closures are only supported in default mode.' if @options[:ticket_mode] == 'I'
-    @log.log_message("Preparing ticket closures by default method.")
+  def prepare_close_tickets(vulnerability_list, site_id)
+    @log.log_message("Preparing ticket closures for mode #{@options[:ticket_mode]}.")
     tickets = []
+    @nxid = nil
     CSV.parse(vulnerability_list.chomp, headers: :first_row)  do |row|
+      case @options[:ticket_mode]
+        # 'D' Default mode: IP *-* Vulnerability
+        when 'D'
+          @nxid = "#{site_id}#{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}"
+        # 'I' IP address mode: IP address -* Vulnerability
+        when 'I'
+          @nxid = "#{site_id}#{row['ip_address']}"
+        # 'V' Vulnerability mode: Vulnerability -* IP address
+##        when 'V'
+##          @nxid = "#{site_id}#{row['asset_id']}#{row['vulnerability_id']}"
+        else
+          fail 'Could not close tickets - do not understand the ticketing mode!'
+      end
       # 'state' 7 is the "Closed" state within ServiceNow.
+      @log.log_message("Closing ticket with NXID: #{@nxid}.")
       ticket = {
           'sysparm_action' => 'update',
-          'sysparm_query' => "work_notesCONTAINSNXID: #{row['asset_id']}#{row['vulnerability_id']}#{row['solution_id']}",
+          'sysparm_query' => "u_work_notesCONTAINSNXID: #{@nxid}",
           'state' => '7'
       }.to_json
       tickets.push(ticket)