bundler-organization_audit 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbae92ba27efe58d7dcd0815e927cee9ee819af
-  data.tar.gz: 4d282857fa1e954191097cfe40643052c6353747
+  metadata.gz: 708695d5b54015a1a14008336d22d1213eeae7e5
+  data.tar.gz: 0c2987f848a7d9002aaf8bc883ff4bf3899c707a
 SHA512:
-  metadata.gz: 704c1cf251aa4dc836d8b1983a11c2ef11594d265fd396c661a8907511ec6af31ce732c542b2b8f8f06f9300875314743305a6791406f9a71761dccdc120f012
-  data.tar.gz: acd41b3091c673fae50ef1afb120021da6b33d20a3c2bab3df207df88a9e34e31346b74fe824256de175afc48f7a6d6d5b0afc9c0320c51f3d0b1910ba04594f
+  metadata.gz: 0f7f1174ba2f0969add5dba70d8a8758180b3f3cb664c03c75dad520dbbd0e02daa90b0d9e1eedbde9abfa7be60086571c385dc315bfb23d26a6a674083810a3
+  data.tar.gz: bb3e994690db9873c403a6f39cfbe53170e7c8762e1e91238a4c9327f91ece2b49b0fea2053dafbfe77782bd6480c6abca04b04b479746a23c78265418d337f5

data/bin/bundle-organization-audit

@@ -15,8 +15,8 @@ options = {
   :ignore_cves => [],
   :user => git_config("github.user")
 }
-OptionParser.new do |opts|
-  opts.banner = <<BANNER
+OptionParser.new do |parser|
+  parser.banner = <<BANNER
 Audit all Gemfiles of a user/organization on github for unpatched versions
 
 Usage:
@@ -24,14 +24,11 @@ Usage:
 
 Options:
 BANNER
-  opts.on("--token TOKEN", "Use token") { |token| options[:token] = token }
-  opts.on("--user USER", "Use user") { |user| options[:user] = user }
-  opts.on("--ignore REPO_URL", "Ignore given repo urls (use multiple times)") { |repo_url| options[:ignore] << repo_url }
-  opts.on("--ignore-gems", "Ignore repos that have a %{repo}.gemspec") { options[:ignore_gems] = true }
-  opts.on("--ignore-cve CVE_NUMBER", "Ignore CVE that you do not want to get warned about just number or number@gem-version") { |cve| options[:ignore_cves] << cve }
-  opts.on("--organization ORGANIZATION", "Use user") { |organization| options[:organization] = organization }
-  opts.on("-h", "--help", "Show this.") { puts opts; exit }
-  opts.on("-v", "--version", "Show Version"){ puts Bundler::OrganizationAudit::VERSION; exit}
+  OrganizationAudit.optparse(parser, options)
+  parser.on("--ignore-gems", "Ignore repos that have a %{repo}.gemspec") { options[:ignore_gems] = true }
+  parser.on("--ignore-cve CVE_NUMBER", "Ignore CVE that you do not want to get warned about just number or number@gem-version") { |cve| options[:ignore_cves] << cve }
+  parser.on("-h", "--help", "Show this.") { puts parser; exit }
+  parser.on("-v", "--version", "Show Version"){ puts Bundler::OrganizationAudit::VERSION; exit}
 end.parse!
 
 exit Bundler::OrganizationAudit.run(options)

data/lib/bundler/organization_audit.rb

@@ -1,6 +1,6 @@
 require "bundler/organization_audit/version"
+require "organization_audit"
 require "tmpdir"
-require "bundler/organization_audit/repo"
 
 module Bundler
   module OrganizationAudit
@@ -24,40 +24,38 @@ module Bundler
       end
 
       def find_vulnerable(options)
-        Repo.all(options).select do |repo|
-          next if (options[:ignore] || []).include? repo.url
+        ::OrganizationAudit.all(options).select do |repo|
+          next if options[:ignore_gems] && repo.gem?
           audit_repo(repo, options)
         end
       end
 
       def audit_repo(repo, options)
-        success = false
-        $stderr.puts repo.project
+        vulnerable = false
+        $stderr.puts repo.name
         in_temp_dir do
           if download_file(repo, "Gemfile.lock")
-            if options[:ignore_gems] && repo.gem?
-              $stderr.puts "Ignored because it's a gem"
-            else
-              command = "bundle-audit"
-              if options[:ignore_cves] && options[:ignore_cves].any?
-                command << " --ignore #{options[:ignore_cves].map { |cve| "'CVE-#{cve}'"  }.join(" ")}"
-              end
-              success = !sh(command)
+            command = "bundle-audit"
+            if options[:ignore_cves] && options[:ignore_cves].any?
+              command << " --ignore #{options[:ignore_cves].map { |cve| "'CVE-#{cve}'"  }.join(" ")}"
             end
+            vulnerable = !sh(command)
           else
             $stderr.puts "No Gemfile.lock found"
           end
         end
         $stderr.puts ""
-        success
+        vulnerable
       rescue Exception => e
-        $stderr.puts "Error auditing #{repo.project} (#{e})"
+        $stderr.puts "Error auditing #{repo.name} (#{e})"
+        true
       end
 
       def in_temp_dir(&block)
         Dir.mktmpdir { |dir| Dir.chdir(dir, &block) }
       end
 
+      # http://grosser.it/2010/12/11/sh-without-rake
       def sh(cmd)
         $stderr.puts cmd
         IO.popen(cmd) do |pipe|

data/lib/bundler/organization_audit/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module OrganizationAudit
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: bundler-organization_audit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: organization_audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -33,7 +33,6 @@ extra_rdoc_files: []
 files:
 - bin/bundle-organization-audit
 - lib/bundler/organization_audit.rb
-- lib/bundler/organization_audit/repo.rb
 - lib/bundler/organization_audit/version.rb
 homepage: http://github.com/grosser/bundler-organization_audit
 licenses:
@@ -55,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Audit all Gemfiles of a user/organization on github for unpatched versions

data/lib/bundler/organization_audit/repo.rb

@@ -1,134 +0,0 @@
-require "open-uri"
-require "json"
-require "base64"
-
-module Bundler
-  module OrganizationAudit
-    class Repo
-      HOST = "https://api.github.com"
-
-      def initialize(data, token=nil)
-        @data = data
-        @token = token
-      end
-
-      def gem?
-        !!gemspec_content
-      end
-
-      def gemspec_content
-        content("#{project}.gemspec")
-      end
-
-      def url
-        api_url.sub("api.", "").sub("/repos", "")
-      end
-
-      def to_s
-        "#{url} -- #{last_commiter}"
-      end
-
-      def project
-        api_url.split("/").last
-      end
-
-      def self.all(options)
-        user = if options[:organization]
-          "orgs/#{options[:organization]}"
-        elsif options[:user]
-          "users/#{options[:user]}"
-        else
-          "user"
-        end
-        url = File.join(HOST, user, "repos")
-
-        token = options[:token]
-        download_all_pages(url, headers(token)).map { |data| Repo.new(data, token) }
-      end
-
-      def content(file)
-        @content ||= {}
-        @content[file] ||= begin
-          if private?
-            download_content_via_api(file)
-          else
-            download_content_via_raw(file)
-          end
-        end
-      rescue OpenURI::HTTPError => e
-        raise "Error downloading #{file} from #{url} (#{e})" unless e.message.start_with?("404")
-      end
-
-      def private?
-        @data["private"]
-      end
-
-      def last_commiter
-        response = call_api("commits/#{branch}")
-        committer = response["commit"]["committer"]
-        "#{committer["name"]} <#{committer["email"]}>"
-      end
-
-      private
-
-      def self.download_all_pages(url, headers)
-        results = []
-        page = 1
-        loop do
-          response = decorate_errors do
-            open("#{url}?page=#{page}", headers).read
-          end
-          result = JSON.parse(response)
-          if result.size == 0
-            break
-          else
-            results.concat(result)
-            page += 1
-          end
-        end
-        results
-      end
-
-      def branch
-        @data["default_branch"] || @data["master_branch"] || "master"
-      end
-
-      def api_url
-        @data["url"]
-      end
-
-      def raw_url
-        url.sub("://", "://raw.")
-      end
-
-      # increases api rate limit
-      def download_content_via_api(file)
-        content = call_api("contents/#{file}?branch=#{branch}")["content"]
-        Base64.decode64(content)
-      end
-
-      def call_api(path)
-        content = self.class.decorate_errors do
-          open(File.join(api_url, path), self.class.headers(@token)).read
-        end
-        JSON.load(content)
-      end
-
-      def self.decorate_errors
-        yield
-      rescue OpenURI::HTTPError => e
-        e.message << " -- body: " << e.io.read
-        raise e
-      end
-
-      # unlimited
-      def download_content_via_raw(file)
-        open(File.join(raw_url, branch, file)).read
-      end
-
-      def self.headers(token)
-        token ? {"Authorization" => "token #{token}"} : {}
-      end
-    end
-  end
-end