RubyGems - bundler_audit_notifier - Versions diffs - 0.0.11 → 0.0.12 - Mend

bundler_audit_notifier 0.0.11 → 0.0.12

Files changed (5) hide show

checksums.yaml +4 -4
data/app/mailers/bundler_audit_issues_mailer.rb +4 -0
data/app/views/bundler_audit_issues_mailer/error_in_running.html.erb +14 -0
data/lib/bundler_audit_notifier.rb +79 -46
metadata +2 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8824f8dc78d31f52f2067355a468651f905312d8dde249c503408b3e7314e2d4
-  data.tar.gz: d4ac54af68ffbab771b7203d814c323f0697b58d8d092acc653f9625a3538055
+  metadata.gz: 3e6f95356cd63ebb74e5a3d6172b773a9e391da5c8dc3cb765945714fa2cc624
+  data.tar.gz: defa67385cf51d5999ca0fa7c16c8e7b02c610cce63746a006c5f0f5f94239f3
 SHA512:
-  metadata.gz: 0d7a275d972a7ee96aebe564f4432d1e8aed27d7a5a70c9e3508b632f0179c7456bbed0de694b275c62473e5b0e1e04dac124af6faacdb71840c2f19cdcbbd41
-  data.tar.gz: e05db70c969a51a956ce39453e6686cf1ca291dc3da729ba1feec5fb5c57ceef7663545122806e2014d88ef6997e8ef4961695a5b863d85166b824d72ca93b7b
+  metadata.gz: 540b2dea155ddfa8b31bd5db773440500c559d1ecce979dd87411a81dcd634d820e2b51d61da7723e9a802755666c69d09236b4fd31714326199149dc8c44935
+  data.tar.gz: 9807fe798b5faf478f25220348ac3ebe7474b2a1ef478c0eaff44bf727e979067f87d742bdd707b3e6886a5520f909c3f289ede98f0f7a09cf0eea4a1c9f00e7

data/app/mailers/bundler_audit_issues_mailer.rb CHANGED Viewed

@@ -8,4 +8,8 @@ class BundlerAuditIssuesMailer < ActionMailer::Base
     @vulnerabilities = vulnerabilities
     mail(to: (opts[:custom_recipient] || DEFAULT_TO), subject: 'Vulnerability Scanner Results')
   end
+  def error_in_running errors, opts = {}
+    @errors = errors
+    mail(to: (opts[:custom_recipient] || DEFAULT_TO), subject: 'Vulnerability Scanner Errored')
+  end
 end

data/app/views/bundler_audit_issues_mailer/error_in_running.html.erb ADDED Viewed

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+  </head>
+  <body>
+    <h1>Vulnerabilities: </h1>
+    <ul>
+      <%= @errors.each do |error|  %>
+        <li> <%= line[:error].to_s.html_safe %></li>
+      <% end %>
+    </ul>
+  </body>
+</html>

data/lib/bundler_audit_notifier.rb CHANGED Viewed

@@ -1,66 +1,99 @@
 # dependencies
 require "active_support"
-require 'rake'
-require "bundler_audit_notifier/engine"
 module BundlerAuditNotifier
   def self.audit_parse
     r, w = IO.pipe
-    audit_script_file = File.join(File.dirname(__FILE__), 'auditer_script.rb')
     # Spawn executes specified command and return its pid
     # This line will execute code that runs bundler-audit and then write the output into the IO pipe
-    # Spawning a process to read the output of bundler-audit update and check because after the commands finish running exit 1 is called and the output can no longer be read.
-    pid = spawn(RbConfig.ruby, audit_script_file, :out => w, :err => [:child, :out])
+    script_location = "lib/auditer_script.rb"
+    if File.exists?("lib/auditer_script.rb")
+      # use local file lib
+    else
+      gem_file_path = (`bundle show bundler_audit_notifier`).strip
+      gem_location = (File.join(gem_file_path, 'lib', 'auditer_script.rb'))
+      if File.exists(gem_location)
+        script_location = gem_location
+      else
+        errors << "Error parsing Script file location: Neither #{script_location} nor #{gem_location}"
+      end
+    end
+    if errors.none?
+      pid = spawn(RbConfig.ruby, script_location, :out => w, :err => [:child, :out])
+      Process.wait2(pid)
+      w.close
+      puts "MADE IT HERE"
+      # At this point, the results of the bundler-audit check command are written in the IO pipe
+      vulnerabilities = []# load quieries from database
+      errors = []
+      puts r.inspect
+      puts r.eof?.inspect
+      puts "MADE IT HERE 1"
+      while !r.eof?
+        puts "MADE IT HERE 2"
+        name_line = r.gets
+        puts name_line
+        puts "MADE IT HERE3"
+        if name = name_line[/Name: (?<name>.+)/, :name]
+          version_line = r.gets
+          puts version_line
+          advisory_line = r.gets
+          puts advisory_line
+          criticality_line = r.gets
+          puts criticality_line
+          url_line = r.gets
+          puts url_line
+          title_line = r.gets
+          puts title_line
+          solution_line = r.gets
+          puts solution_line
+          space = r.gets
+          puts space
+          if version_line && advisory_line && criticality_line && url_line && title_line && solution_line
+            version = version_line[/Version: (?<version>.+)/, :version]
+            advisory = advisory_line[/Advisory: (?<advisory>.+)/, :advisory]
+            criticality = criticality_line[/Criticality: (?<criticality>.+)/, :criticality]
+            url = url_line[/URL: (?<url>.+)/, :url]
+            title = title_line[/Title: (?<title>.+)/, :title]
+            solution = solution_line[/Solution: (?<solution>.+)/, :solution]
-    Process.wait2(pid)
-    w.close
-    # At this point, the results of the bundler-audit check command are written in the IO pipe
-    vulnerabilities = []# load quieries from database
-    while !r.eof?
-      name_line = r.gets
-      if name = name_line[/Name: (?<name>.+)/, :name]
-        version_line = r.gets
-        advisory_line = r.gets
-        criticality_line = r.gets
-        url_line = r.gets
-        title_line = r.gets
-        solution_line = r.gets
-        space = r.gets
-        if version_line && advisory_line && criticality_line && url_line && title_line && solution_line
-          version = version_line[/Version: (?<version>.+)/, :version]
-          advisory = advisory_line[/Advisory: (?<advisory>.+)/, :advisory]
-          criticality = criticality_line[/Criticality: (?<criticality>.+)/, :criticality]
-          url = url_line[/URL: (?<url>.+)/, :url]
-          title = title_line[/Title: (?<title>.+)/, :title]
-          solution = solution_line[/Solution: (?<solution>.+)/, :solution]
+            # check for valid data
+            # check database table for existing event
+            if BundlerAuditIssue.exists?(advisory: advisory)
+              #   if event found, touch event
+              BundlerAuditIssue.where(advisory: advisory).first.touch
+              #   if found event is ignored, remove from vulnerabilites hash
+              if !BundlerAuditIssue.where(advisory: advisory).first.ignore
+                vulnerabilities << {:name => name, :version => version, :advisory => advisory, :criticality => criticality, :url => url, :title => title, :solution => solution}
+              end
+              puts "VULNERABILITIES"
+              puts vulnerabilities.inspect
+            else
+              BundlerAuditIssue.create(:name => name, :version => version, :advisory => advisory, :criticality => criticality, :url => url, :title => title, :solution => solution)
-          # check for valid data
-          # check database table for existing event
-          if BundlerAuditIssue.exists?(advisory: advisory)
-            bundler_audit_issue = BundlerAuditIssue.where(advisory: advisory).first
-            #   if event found, touch event
-            bundler_audit_issue.touch
-            #  add event to vulnerabilities array if it was not marked ignored
-            if !bundler_audit_issue.ignore
-              vulnerabilities << bundler_audit_issue
+              vulnerabilities << {:name => name, :version => version, :advisory => advisory, :criticality => criticality, :url => url, :title => title, :solution => solution}
+              puts vulnerabilities.inspect
             end
-          else
-            bundler_audit_issue = BundlerAuditIssue.create(:name => name, :version => version, :advisory => advisory, :criticality => criticality, :url => url, :title => title, :solution => solution)
-            vulnerabilities << bundler_audit_issue
+          else
+            puts "ERROR: nil line found #{version_line}, #{advisory_line}, #{criticality_line}, #{url_line}, #{title_line}, #{solution_line}"
           end
+        elsif name_line.strip == "Vulnerabilities found!"
+          puts "End of output reached!"
         else
-          puts "ERROR: nil line found #{version_line}, #{advisory_line}, #{criticality_line}, #{url_line}, #{title_line}, #{solution_line}"
+          puts "ERROR: FOUND ERROR PARSING"
+          puts name_line.inspect
+          errors << "Error parsing NAME LINE: #{name_line}"
         end
-      elsif name_line.strip == "Vulnerabilities found!"
-        puts "End of output reached!"
       end
     end
     # iterate through remaining vulnerabilties and send them in an email if any are remaining
+    if errors.present?
+      ApplicationMailer.error_in_running(errors).deliver_now
+    end
     if vulnerabilities.present?
-      BundlerAuditIssuesMailer.vulnerability_email(vulnerabilities).deliver_now
+      ApplicationMailer.vulnerability_email(vulnerabilities).deliver_now
     end
+    return [vulnerabilities, errors]
   end
-end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler_audit_notifier
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Marley Stipich
@@ -158,6 +158,7 @@ files:
 - app/mailers/bundler_audit_issues_mailer.rb
 - app/models/bundler_audit_issue.rb
 - app/views/bundler_audit_issues/ignore.html.erb
+- app/views/bundler_audit_issues_mailer/error_in_running.html.erb
 - app/views/bundler_audit_issues_mailer/vulnerability_email.html.erb
 - lib/auditer_script.rb
 - lib/bundler_audit_notifier.rb