norad_beacon 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d13c67f1371165cae9ca885c7573faf2e1f39fa0
-  data.tar.gz: 26752d82f9b15c9f2a8871ae4b9f412457e6d3dd
+  metadata.gz: defdd19d1e84401ef7c56d7ebed4e587dd05f440
+  data.tar.gz: fa4789a131a798d87d0cc5bad20ec14c207f8ade
 SHA512:
-  metadata.gz: bbd5d5da22ab1905f6635b3fc893cb063b55ff3b886ffae1fa7baf557a3e63ac2eea9409116dd5f189c3b308569ef124b90b84efacf6fc75426fe3d52ccd9aa7
-  data.tar.gz: 7e312d7ce61eb84a25440653d1a1b3d1b76cfdb5d56582fb41d939f6a37ad4279e5169b7f931141e7b17519798db7dfe45e6c129409ff135b183a053263e22bf
+  metadata.gz: b7307db47ad21b46594f237c3e3da64f9ac7cbadaaebc8657d81559af7e55145789407087a0363e436d136c67b0434595d1ea0edfad4831ba8b2690a9e2a53aa
+  data.tar.gz: 2b1516c17d15e51b904f7ad48be50ff46c8c25e6e7513fd399305bc6e6308e7438eaf1944e9c67699948ee51ca45af68955aede69c384f6170a29cf0f953c4da

data/lib/norad_beacon/result.rb

@@ -6,20 +6,19 @@ module NoradBeacon
   class Result
     attr_reader :nid, :sir, :status, :output, :title, :description, :signature
 
-    # I'm making both of these values constants to reinforce the idea that these values should
-    # *never* change. If they do, all ignore rules in the Norad database we'll be invalidated.
-    SIGNATURE_DIGEST = OpenSSL::Digest.new('sha256')
-    SIGNATURE_KEY = 'n0r4dRULES'
+    # I'm making this value a constant to reinforce the idea that it should *never* change. If it
+    # does, all ignore rules in the Norad database will be invalidated.
+    SIGNATURE_DIGEST = OpenSSL::Digest::SHA256
 
     # rubocop:disable ParameterLists
-    def initialize(nid, status, output, title, description, sir = 'unevaluated')
-      @nid = nid
+    def initialize(nid, status, output, title, description, sir = 'unevaluated', text_to_fingerprint = nil)
+      @nid = nid.to_s
       @sir = cvss_to_sir(sir)
-      @status = status
-      @output = output
-      @title = title
-      @description = description
-      @signature = compute_signature
+      @status = status.to_s
+      @output = output.to_s
+      @title = title.to_s
+      @description = description.to_s
+      @signature = compute_signature(text_to_fingerprint)
     end
     # rubocop:enable ParameterLists
 
@@ -49,9 +48,9 @@ module NoradBeacon
       end
     end
 
-    def compute_signature
-      result_for_signature = nid.to_s + title.to_s + status.to_s
-      OpenSSL::HMAC.hexdigest(SIGNATURE_DIGEST, SIGNATURE_KEY, result_for_signature)
+    def compute_signature(text_to_fingerprint)
+      # If no specialized text to fingerprint was provided, use the raw output
+      SIGNATURE_DIGEST.new.update("#{nid}#{title}#{text_to_fingerprint || output}").hexdigest
     end
   end
 end

data/lib/norad_beacon/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NoradBeacon
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_beacon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Blake Hitchcock
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Gem to help with posting blackbox results to Norad.