nexpose_ticketing 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODNlNmQwYTc2OWE4YWVjMzIzODcyNTE3NGJjODBmZDg4MmRlOTZlZA==
-  data.tar.gz: !binary |-
-    NGJlOWNhNmE5NGJiZDAwYjFkYjJhZDBiODhjNWY5NmNjMTk4Mjk3Zg==
+SHA1:
+  metadata.gz: f87999035739237fdbbb5c978292fb1327b95d35
+  data.tar.gz: 6d917864b7f2a5d9246fc2214bbea37b464323e1
 SHA512:
-  metadata.gz: !binary |-
-    MGVhNzdiMzlmNWI0YWNhOThiOTJjN2VlNGJiNTg2Yzg4OTRiYzgyNGI4YjJi
-    YTFjNWQ2OGFjNWM0NWFmMDVlODMxNjA0MWFlYzI2Y2FjOWIxNDA1NzUxNDZi
-    ODUwNWI4YTkzMzY2MTk1NTMyYzJjNzRmMjQ0MTAzNWQyMGQ1ZjI=
-  data.tar.gz: !binary |-
-    NTE4ZDZlY2I5NDFhMmM2YTMxMjcwZWY2MDcxZTU4NzVlNDZjNDRjODI4OGZm
-    ODM0YWIzZGMyMTRlZWU1YzlhNTkxYmQyNTVmMzNjMTY1Yjg5YTRmMjI5Zjhm
-    ZWI2ZmI1MjcyMmM5MmIxNzgwYjc5Y2JlMGU3YzM0MDJlMGFjYjk=
+  metadata.gz: 3f8f1a3907e9ba7c3e556b75253c8833946a65c59efd62e06816f54853d894796f1bfd733323f94459ff0e2dada0d6d17a86549cc0e53a3fe1182ef5647a236f
+  data.tar.gz: 374e3350847992ee22d5abc9377d64867f2670da2b6f5c48f256ef02e0d6906cc3e33af87ad5cf23aaeb9f397228364d1f3bf0c945065842228cc67d784d30ad

data/README.md

@@ -72,8 +72,21 @@ We welcome contributions to this package. We ask only that pull requests and pat
 
 ##Changelog
 
+###1.0.2
+08-02-2016
+- Encoding is now enforced as UTF-8 when parsing CSV files - fixes environment-specific errors.
+
+Jira Helper:
+- Non-200 return codes are now logged when creating or updating tickets.
+
+NX Logger:
+- Fixed Windows-specific, input-related errors.
+
+ServiceNow:
+- No longer queries for existing incident if ticket is new.
+
 ###1.0.1
-19-01-2015
+19-01-2016
 
 ServiceNow Helper:
 - New update set.

data/bin/nexpose_jira

@@ -12,6 +12,8 @@ log.setup_logging(true, 'info')
 JIRA_CONFIG_PATH = File.join(File.dirname(__FILE__),
                              '../lib/nexpose_ticketing/config/jira.config')
 
+current_encoding = Encoding.default_external=Encoding.find("UTF-8")
+
 # Read in JIRA options from jira.config.
 jira_options = begin
   YAML.load_file(JIRA_CONFIG_PATH)
@@ -19,5 +21,7 @@ rescue ArgumentError => e
   raise "Could not parse YAML #{JIRA_CONFIG_PATH} : #{e.message}"
 end
 
+log.log_message("Current Encoding set to: #{current_encoding}")
+
 # Initialize Ticket Service using JIRA.
 NexposeTicketing.start(jira_options)

data/bin/nexpose_remedy

@@ -12,6 +12,8 @@ log.setup_logging(true, 'info')
 REMEDY_CONFIG_PATH = File.join(File.dirname(__FILE__),
                                    '../lib/nexpose_ticketing/config/remedy.config')
 
+current_encoding = Encoding.default_external=Encoding.find("UTF-8")
+
 # Read in ServiceNow options from servicenow.config
 remedy_options = begin
   YAML.load_file(REMEDY_CONFIG_PATH)
@@ -19,5 +21,7 @@ rescue ArgumentError => e
   raise "Could not parse YAML #{REMEDY_CONFIG_PATH} : #{e.message}"
 end
 
+log.log_message("Current Encoding set to: #{current_encoding}")
+
 # Initialize Nexpose Ticket Service using Remedy
 NexposeTicketing.start(remedy_options)

data/bin/nexpose_servicedesk

@@ -12,6 +12,8 @@ log.setup_logging(true, 'info')
 SERVICEDESK_CONFIG_PATH = File.join(File.dirname(__FILE__),
                                    '../lib/nexpose_ticketing/config/servicedesk.config')
 
+current_encoding = Encoding.default_external=Encoding.find("UTF-8")
+
 # Read in ServiceDesk options from servicenow.config
 servicedesk_options = begin
   YAML.load_file(SERVICEDESK_CONFIG_PATH)
@@ -19,5 +21,7 @@ rescue ArgumentError => e
   raise "Could not parse YAML #{SERVICEDESK_CONFIG_PATH} : #{e.message}"
 end
 
+log.log_message("Current Encoding set to: #{current_encoding}")
+
 # Initialize Nexpose Ticket Service using ServiceDesk
 NexposeTicketing.start(servicedesk_options)

data/bin/nexpose_servicenow

@@ -12,6 +12,8 @@ log.setup_logging(true, 'info')
 SERVICENOW_CONFIG_PATH = File.join(File.dirname(__FILE__),
                                    '../lib/nexpose_ticketing/config/servicenow.config')
 
+current_encoding = Encoding.default_external=Encoding.find("UTF-8")
+
 # Read in ServiceNow options from servicenow.config
 servicenow_options = begin
   YAML.load_file(SERVICENOW_CONFIG_PATH)
@@ -19,5 +21,7 @@ rescue ArgumentError => e
   raise "Could not parse YAML #{SERVICENOW_CONFIG_PATH} : #{e.message}"
 end
 
+log.log_message("Current Encoding set to: #{current_encoding}")
+
 # Initialize Nexpose Ticket Service using ServiceNow
 NexposeTicketing.start(servicenow_options)

data/lib/nexpose_ticketing/helpers/jira_helper.rb

@@ -37,15 +37,7 @@ class JiraHelper
     uri = URI.parse(("#{@jira_data[:jira_url]}".split("/")[0..-2].join('/') + '/search'))
     uri.query = [uri.query, URI.escape(jql_query)].compact.join('&')
     req = Net::HTTP::Get.new(uri.to_s, headers)
-    req.basic_auth @jira_data[:username], @jira_data[:password]
-    resp = Net::HTTP.new(uri.host, uri.port)
-
-    # Enable this line for debugging the https call.
-    # resp.set_debug_output(@log)
-
-    resp.use_ssl = true if uri.scheme == 'https'
-    resp.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    response = resp.request(req)
+    response = send_jira_request(uri, req)
 
     issues = JSON.parse(response.body)['issues']
    if issues.nil? || !issues.any? || issues.size > 1
@@ -54,7 +46,62 @@ class JiraHelper
      @log.log_message("Jira returned no key or too many keys for query result! Response was <#{issues}>")
      return nil
    end
-    return issues[0]['key']
+   return issues[0]['key']
+  end
+
+  # Sends a HTTP request to the JIRA console. 
+  #
+  # * *Args*    :
+  #   - +uri+ - Address of the JIRA endpoint.
+  #   - +request+ - Request containing the query or ticket object. 
+  #
+  # * *Returns* :
+  #   - HTTPResponse containing result from the JIRA console.
+  #
+  def send_request(uri, request, ticket=false)
+    request.basic_auth @jira_data[:username], @jira_data[:password]
+    resp = Net::HTTP.new(uri.host, uri.port)
+
+    # Enable this line for debugging the https call.
+    # resp.set_debug_output(@log)
+
+    resp.use_ssl = uri.scheme == 'https'
+    resp.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+    return resp.request(request) unless ticket
+
+    resp.start do |http|
+      res = http.request(request)
+      next if res.code.to_i.between?(200,299)
+      @log.log_error_message("Error submitting ticket data: #{res.message}, #{res.body}")
+      res
+    end
+  end
+
+  # Sends a request to the JIRA console. 
+  #
+  # * *Args*    :
+  #   - +uri+ - Address of the JIRA endpoint.
+  #   - +request+ - Request containing the query. 
+  #
+  # * *Returns* :
+  #   - HTTPResponse containing result from the JIRA console.
+  #
+  def send_jira_request(uri, request)
+    send_request(uri, request)
+  end
+
+  # Sends a ticket object to the JIRA console. 
+  #
+  # * *Args*    :
+  #   - +uri+ - Address of the JIRA endpoint.
+  #   - +request+ - Request containing the ticket object. 
+  #
+  # * *Returns* :
+  #   - HTTPResponse containing result from the JIRA console.
+  #
+  def send_ticket(uri, request)
+    send_request(uri, request, true)
   end
 
   # Fetches the Jira ticket transition details for the given Jira ticket key. Tries to match the response to the
@@ -75,16 +122,7 @@ class JiraHelper
 
     uri = URI.parse(("#{@jira_data[:jira_url]}#{jira_key}/transitions?expand=transitions.fields."))
     req = Net::HTTP::Get.new(uri.to_s, headers)
-    req.basic_auth @jira_data[:username], @jira_data[:password]
-    resp = Net::HTTP.new(uri.host, uri.port)
-
-    # Enable this line for debugging the https call.
-    # resp.set_debug_output(@log)
-
-    resp.use_ssl = true if uri.scheme == 'https'
-    resp.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-    response = resp.request(req)
+    response = send_jira_request(uri, req)
 
     transitions = JSON.parse(response.body)
 
@@ -108,16 +146,8 @@ class JiraHelper
 
       uri = URI.parse("#{@jira_data[:jira_url]}")
       req = Net::HTTP::Post.new(@jira_data[:jira_url], headers)
-      req.basic_auth @jira_data[:username], @jira_data[:password]
       req.body = ticket
-      resp = Net::HTTP.new(uri.host, uri.port)
-
-      # Enable this line for debugging the https call.
-      #resp.set_debug_output(@log)
-
-      resp.use_ssl = true if uri.scheme == 'https'
-      resp.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      resp.start { |http| http.request(req) }
+      send_ticket(uri, req)
     end
   end
 
@@ -196,10 +226,9 @@ class JiraHelper
       headers = { 'Content-Type' => 'application/json',
                   'Accept' => 'application/json' }
 
-      tickets.each { |ticket|
+      tickets.each do |ticket|
         uri = URI.parse(("#{@jira_data[:jira_url]}#{ticket}/transitions"))
         req = Net::HTTP::Post.new(uri.to_s, headers)
-        req.basic_auth @jira_data[:username], @jira_data[:password]
 
         transition = get_jira_transition_details(ticket, @jira_data[:close_step_id])
         if transition.nil?
@@ -227,15 +256,8 @@ class JiraHelper
         end
 
         req.body = "{\"transition\" : {\"id\" : #{transition['id']}}, \"fields\" : { #{required_fields.join(",")}}}"
-        resp = Net::HTTP.new(uri.host, uri.port)
-
-        # Enable this line for debugging the https call.
-        #resp.set_debug_output(@log)
-
-        resp.use_ssl = true if uri.scheme == 'https'
-        resp.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        resp.start { |http| http.request(req) }
-      }
+        send_ticket(uri, req)
+      end
     end
   end
 
@@ -287,19 +309,11 @@ class JiraHelper
 
         send_whole_ticket ? req = Net::HTTP::Post.new(uri.to_s, headers) : req = Net::HTTP::Put.new(uri.to_s, headers)
 
-        req.basic_auth @jira_data[:username], @jira_data[:password]
         send_whole_ticket ?
             req.body = ticket_details.last :
             req.body = {'update' => {'description' => [{'set' => "#{JSON.parse(ticket_details[1])['fields']['description']}"}]}}.to_json
 
-        resp = Net::HTTP.new(uri.host, uri.port)
-
-        # Enable this line for debugging the https call.
-        #resp.set_debug_output(@log)
-
-        resp.use_ssl = true if uri.scheme == 'https'
-        resp.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        resp.start { |http| http.request(req) }
+        send_ticket(uri, req)
       end
     end
   end

data/lib/nexpose_ticketing/helpers/servicenow_helper.rb

@@ -188,7 +188,7 @@ class ServiceNowHelper
   #
   def prepare_tickets(vulnerability_list, nexpose_identifier_id, matching_fields)
     @ticket = Hash.new(-1)
-    
+
     @log.log_message("Preparing tickets in #{options[:ticket_mode]} address.")
     tickets = []
     previous_row = nil
@@ -200,10 +200,10 @@ class ServiceNowHelper
         previous_row = row.dup
         nxid = @common_helper.generate_nxid(nexpose_identifier_id, row)
 
-        action = unless row['comparison'].nil? || row['comparison'] == 'New'
-                   'update'
-                 else
+        action = if row['comparison'].nil? || row['comparison'] == 'New'
                    'insert'
+                 else
+                   'update'
                  end
 
         @ticket = {
@@ -229,7 +229,9 @@ class ServiceNowHelper
         description = nil
         redo
       else
-        @ticket['sysparm_action'] = 'update' unless row['comparison'] == 'New'
+        unless row['comparison'].nil? || row['comparison'] == 'New'
+          @ticket['sysparm_action'] = 'update'
+        end
         description = @common_helper.update_description(description, row)      
       end
     end

data/lib/nexpose_ticketing/nx_logger.rb

@@ -46,7 +46,7 @@ module NexposeTicketing
       require 'logger'
       directory = File.dirname(@logger_file)
       FileUtils.mkdir_p(directory) unless File.directory?(directory)
-      io = IO.for_fd(IO.sysopen(@logger_file, 'a'))
+      io = IO.for_fd(IO.sysopen(@logger_file, 'a'), 'a')
       io.autoclose = false
       io.sync = true
       @log = Logger.new(io, 'weekly')

data/lib/nexpose_ticketing/report_helper.rb

@@ -21,6 +21,7 @@ module NexposeReportHelper
       wait_for_report(report_id)
       report_details = @nsc.last_report(report_id)
       file = Tempfile.new("#{report_id}")
+      file.binmode
       file.write(@nsc.download(report_details.uri))
       file.flush
 

data/lib/nexpose_ticketing/version.rb

@@ -1,3 +1,3 @@
 module NexposeTicketing
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose_ticketing
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Damian Finol
@@ -10,94 +10,94 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nexpose
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: This gem provides a Ruby implementation of different integrations with
@@ -149,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Nexpose Ticketing Engine.