hakiri 0.4.0 → 0.5.0

data/.gitignore

@@ -16,4 +16,4 @@ capybara-*.html
 **.orig
 *.gem
 /manifest.json
-.ruby-version
+.ruby-version

data/.ruby-gemset

@@ -0,0 +1 @@
+hakiri_cli

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+env:
+  - JRUBY_OPTS=--1.9 RBXOPT=-X19
+script: "./test/ci/ci_runner.sh"

data/Gemfile

@@ -1,3 +1,10 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec
+
+group :test do
+  platforms :ruby do
+    gem "cane", "~> 2.6.0"
+    gem "simplecov", ">= 0.8.0.pre"
+  end
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hakiri (0.3.2)
+    hakiri (0.4.0)
       active_support
       bundler
       commander
@@ -17,15 +17,24 @@ GEM
     active_support (3.0.0)
       activesupport (= 3.0.0)
     activesupport (3.0.0)
+    cane (2.6.0)
+      parallel
     commander (4.1.3)
       highline (~> 1.6.11)
     highline (1.6.19)
     i18n (0.6.4)
     json_pure (1.8.0)
     mime-types (1.23)
+    minitest (5.0.6)
+    multi_json (1.7.7)
+    parallel (0.7.1)
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    simplecov (0.8.0.pre)
+      multi_json
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     terminal-table (1.4.5)
 
 PLATFORMS
@@ -33,4 +42,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  cane (~> 2.6.0)
   hakiri!
+  minitest (~> 5.0.0)
+  simplecov (>= 0.8.0.pre)

data/README.md

@@ -90,15 +90,15 @@ Hakiri supports vulnerability detection for a collection of gems listed in [the
 $ hakiri gemfile:scan
 ~~~
 
-To scan a specific `Gemfile.lock` add the `-m` parameter at the end:
+To scan a specific `Gemfile.lock` add the `-g` parameter at the end:
 
 ~~~
-$ hakiri gemfile:scan -m ../Gemfile.lock
+$ hakiri gemfile:scan -g ../Gemfile.lock
 ~~~
 
-This will scan your `Gemfile.lock` and check with the server whether it has any vulnerable gems. It only checks gems that are [supported by Hakiri]((https://www.hakiriup.com/docs/manifest-file)).
+This will scan your `Gemfile.lock` and check with the server whether it has any vulnerable gems. It only checks gems that are [supported by Hakiri](https://www.hakiriup.com/docs/manifest-file).
 
-You can also [sync your gems]((https://www.hakiriup.com/docs/syncing-with-the-cloud)) with the cloud and get notified when new vulnerabilities come out.
+You can also [sync your gems](https://www.hakiriup.com/docs/syncing-with-the-cloud) with the cloud and get notified when new vulnerabilities come out.
 
 ## Advanced Usage
 

data/Rakefile

@@ -0,0 +1,3 @@
+Dir["./tasks/**/*.rake"].sort.each{ |task| load task }
+
+task default: :test

data/bin/hakiri

@@ -38,12 +38,13 @@ command 'system:sync' do |c|
   c.summary = 'Sync your system\'s software versions with the cloud.'
   c.description = 'This command grabs your custom stack JSON file, and syncs it with your project on www.hakiriup.com.'
   c.option '--manifest STRING', String, 'Path to your manifest JSON file stack'
-  c.option '--project INTEGER', Integer, 'Your project ID.'
+  c.option '--stack INTEGER', Integer, 'Your stack ID.'
   c.option '--force', 'Force syncing without asking for it first.'
 
   c.action do |args, options|
     options.default :manifest => './manifest.json'
-    options.default :project => nil
+    options.default :stack => nil
+
     cli = Hakiri::System.new(args, options)
     cli.sync
   end
@@ -79,13 +80,26 @@ command 'gemfile:sync' do |c|
   c.summary = 'Sync your system\'s Gemfile.lock gem versions with the cloud.'
   c.description = 'This command grabs your Gemfile.lock file, and syncs it with your project on www.hakiriup.com.'
   c.option '--gemfile STRING', String, 'Path to your Gemfile.lock'
-  c.option '--project INTEGER', Integer, 'Your project ID.'
+  c.option '--stack INTEGER', Integer, 'Your stack ID.'
   c.option '--force', 'Force syncing without asking for it first.'
 
   c.action do |args, options|
     options.default :gemfile => './Gemfile.lock'
-    options.default :project => nil
+    options.default :stack => nil
+
     cli = Hakiri::Gemfile.new(args, options)
     cli.sync
   end
+end
+
+command 'code:report' do |c|
+  c.syntax = 'hakiri code:report [options]'
+  c.summary = 'Check code report on the latest push.'
+  c.description = 'This command connects to Hakiri and returns a report on vulnerabilities from the latest push.'
+  c.option '--stack INTEGER', Integer, 'Your stack ID.'
+
+  c.action do |args, options|
+    cli = Hakiri::Code.new(args, options)
+    cli.report
+  end
 end

data/hakiri.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n'
   s.add_dependency 'rest-client'
   s.add_dependency 'json_pure'
+
+  s.add_development_dependency 'minitest', '~> 5.0.0'
 end

data/lib/hakiri.rb

@@ -10,6 +10,7 @@ require 'bundler/lockfile_parser'
 
 require 'hakiri/cli/cli'
 require 'hakiri/cli/system'
+require 'hakiri/cli/code'
 require 'hakiri/cli/manifest'
 require 'hakiri/cli/gemfile'
 
@@ -17,7 +18,7 @@ require 'hakiri/stack'
 require 'hakiri/version'
 require 'hakiri/http_client'
 
-require 'hakiri/technologies/technology'
+require 'hakiri/technology'
 require 'hakiri/technologies/apache'
 require 'hakiri/technologies/apache_tomcat'
 require 'hakiri/technologies/java'

data/lib/hakiri/cli/code.rb

@@ -0,0 +1,44 @@
+class Hakiri::Code < Hakiri::Cli
+  #
+  # Walks the user through code report process.
+  #
+  def report
+    if @http_client.auth_token
+      say '-----> Loading code report...'
+      response = @http_client.code_report(@options.stack)
+
+      if response[:errors]
+        response[:errors].each do |error|
+          say "!      Server Error: #{error}"
+        end
+      else
+        say "       Repo: #{response[:repository][:name]}"
+        say "       Branch: #{response[:repository][:branch]}"
+        say "       Latest commit: #{response[:last_commit_id]}"
+
+        if response[:warnings_count] == 0
+          say '       No warnings were found in your code. Keep it up!'
+        else
+          say "!      #{response[:warnings_count]} warnings were found in the code"
+
+          if agree 'Show all of them? (yes or no) '
+            puts ' '
+            response[:warnings].each do |warning|
+              say warning[:warning_type]
+              say warning[:message]
+
+              if warning[:line]
+                say "| Detected in #{warning[:file]} on line #{warning[:line]}"
+              else
+                say "| Detected in #{warning[:file]}"
+              end
+              puts ' '
+            end
+          end
+        end
+      end
+    else
+      say '!      You have to setup HAKIRI_AUTH_TOKEN environmental variable with your Hakiri authentication token.'
+    end
+  end
+end

data/lib/hakiri/cli/gemfile.rb

@@ -15,7 +15,7 @@ class Hakiri::Gemfile < Hakiri::Cli
 
         # GETTING VULNERABILITIES
         say '-----> Searching for vulnerabilities...'
-        params = ({ :technologies => @stack.technologies }.to_param)
+        params = { :technologies => @stack.technologies }
         response = @http_client.get_issues(params)
 
         if response[:errors]
@@ -73,9 +73,9 @@ class Hakiri::Gemfile < Hakiri::Cli
         end
 
         # CHECK VERSIONS ON THE SERVER
-        params = { :project_id => @options.project, :technologies => @stack.technologies }
+        params = { :technologies => @stack.technologies }
         say '-----> Checking software versions on www.hakiriup.com...'
-        response = @http_client.check_versions_diff(params)
+        response = @http_client.check_versions_diff(@options.stack, params)
 
         if response[:errors]
           response[:errors].each do |error|
@@ -109,8 +109,8 @@ class Hakiri::Gemfile < Hakiri::Cli
 
             if update or @options.force
               say '-----> Syncing versions with www.hakiriup.com...'
-              params = ({ :project_id => @options.project, :technologies => @stack.technologies }.to_param)
-              response = @http_client.sync_project_versions(response[:project][:id], params)
+              params = { :stack => @options.stack, :technologies => @stack.technologies }
+              response = @http_client.sync_stack_versions(response[:project][:stack][:id], params)
 
               if response[:errors]
                 response[:errors].each do |error|

data/lib/hakiri/cli/manifest.rb

@@ -7,8 +7,8 @@ class Hakiri::Manifest < Hakiri::Cli
   def generate
     FileUtils::copy_file "#{File.dirname(__FILE__)}/manifest.json", "#{Dir.pwd}/manifest.json"
     File.chmod 0755, "#{Dir.pwd}/manifest.json"
-    say '-----> Generating the manifest file...'
-    say "       Generated the manifest file in #{Dir.pwd}/manifest.json"
+    say '-----> Generating a manifest file...'
+    say "       Generated a manifest file in #{Dir.pwd}/manifest.json"
     say "       Edit it and run \"hakiri system:scan\""
   end
 end

data/lib/hakiri/cli/system.rb

@@ -19,7 +19,7 @@ class Hakiri::System < Hakiri::Cli
 
         # GETTING VULNERABILITIES
         say '-----> Searching for vulnerabilities...'
-        params = ({ :technologies => @stack.technologies }.to_param)
+        params = { :technologies => @stack.technologies }
         response = @http_client.get_issues(params)
 
         if response[:errors]
@@ -79,9 +79,9 @@ class Hakiri::System < Hakiri::Cli
         end
 
         # CHECK VERSIONS ON THE SERVER
-        params = { :project_id => @options.project, :technologies => @stack.technologies }
+        params = { :technologies => @stack.technologies }
         say '-----> Checking software versions on www.hakiriup.com...'
-        response = @http_client.check_versions_diff(params)
+        response = @http_client.check_versions_diff(@options.stack, params)
 
         if response[:errors]
           response[:errors].each do |error|
@@ -115,8 +115,8 @@ class Hakiri::System < Hakiri::Cli
 
             if update or @options.force
               say '-----> Syncing versions with www.hakiriup.com...'
-              params = ({ :project_id => @options.project, :technologies => @stack.technologies }.to_param)
-              response = @http_client.sync_project_versions(response[:project][:id], params)
+              params = { :stack => @options.stack, :technologies => @stack.technologies }
+              response = @http_client.sync_stack_versions(response[:project][:stack][:id], params)
 
               if response[:errors]
                 response[:errors].each do |error|
@@ -193,7 +193,7 @@ class Hakiri::System < Hakiri::Cli
       end
 
       say '-----> Searching for vulnerabilities...'
-      params = ({ :technologies => @stack.technologies }.to_param)
+      params = { :technologies => @stack.technologies }
       response = @http_client.get_issues(params)
 
       if response[:errors]

data/lib/hakiri/http_client.rb

@@ -8,7 +8,7 @@ class Hakiri::HttpClient
   #
   def initialize
     @auth_token = (ENV['HAKIRI_AUTH_TOKEN'] or nil)
-    @api_url = (ENV['HAKIRI_API_URL'] or 'https://www.hakiriup.com/api/v1')
+    @api_url = 'http://0.0.0.0:5000/api/v1' or (ENV['HAKIRI_API_URL'] or 'https://www.hakiriup.com/api/v1')
   end
 
   #
@@ -21,10 +21,9 @@ class Hakiri::HttpClient
   #   Returns a hash of technologies with vulnerabilities.
   #
   def get_issues(params)
-    # { |response, request, result, &block|
-    #  JSON.parse(.to_str, symbolize_names: true)
-    # "!      Server Error: #{response.code}"
-    RestClient.post "#{@api_url}/issues.json?auth_token=#{@auth_token}", params do |response, request, result, &block|
+    params[:auth_token] = @auth_token
+
+    RestClient.post "#{@api_url}/issues/scan.json", params do |response, request, result, &block|
       case response.code
         when 200
           JSON.parse(response.to_str, :symbolize_names => true)
@@ -37,14 +36,19 @@ class Hakiri::HttpClient
   #
   # Checks system and server version differences.
   #
+  # @param [Integer] stack_id
+  #   Stack ID.
+  #
   # @param [String] params
   #   Hash of technologies with versions converted to a string.
   #
   # @return [Hash]
   #   Returns a hash of differences between technologies.
   #
-  def check_versions_diff(params)
-    RestClient.post "#{@api_url}/versions/diffs.json?auth_token=#{@auth_token}", params do |response, request, result, &block|
+  def check_versions_diff(stack_id, params)
+    params[:auth_token] = @auth_token
+
+    RestClient.post "#{@api_url}/stacks/#{stack_id}/versions/diffs.json", params do |response, request, result, &block|
       case response.code
         when 200
           JSON.parse(response.to_str, :symbolize_names => true)
@@ -55,7 +59,10 @@ class Hakiri::HttpClient
   end
 
   #
-  # Checks system and server version differences.
+  # Syncs system and server versions.
+  #
+  # @param [Integer] stack_id
+  #   Stack ID.
   #
   # @param [String] params
   #   Hash of technologies with versions converted to a string.
@@ -63,8 +70,30 @@ class Hakiri::HttpClient
   # @return [Hash]
   #   Returns a hash of updated versions.
   #
-  def sync_project_versions(project_id, params)
-    RestClient.put "#{@api_url}/projects/#{project_id}.json?auth_token=#{@auth_token}", params do |response, request, result, &block|
+  def sync_stack_versions(stack_id, params)
+    params[:auth_token] = @auth_token
+
+    RestClient.put "#{@api_url}/stacks/#{stack_id}/versions/update_all.json", params do |response, request, result, &block|
+      case response.code
+        when 200
+          JSON.parse(response.to_str, :symbolize_names => true)
+        else
+          { :errors => [response.code] }
+      end
+    end
+  end
+
+  #
+  # Gets latest build data.
+  #
+  # @param [Integer] stack_id
+  #   Stack ID.
+  #
+  # @return [Hash]
+  #   Returns a hash with build fields, repository fields and an array of warnings.
+  #
+  def code_report(stack_id)
+    RestClient.get "#{@api_url}/stacks/#{stack_id}/builds/last.json?auth_token=#{@auth_token}" do |response, request, result, &block|
       case response.code
         when 200
           JSON.parse(response.to_str, :symbolize_names => true)

data/lib/hakiri/version.rb

@@ -1,3 +1,3 @@
 module Hakiri
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/tasks/bundler.rake

@@ -0,0 +1,3 @@
+require "bundler/setup"
+
+Bundler::GemHelper.install_tasks

data/tasks/cane.rake

@@ -0,0 +1,7 @@
+begin
+  require "cane/rake_task"
+
+  Cane::RakeTask.new
+rescue LoadError
+  warn "unable to load 'cane'"
+end

data/tasks/test.rake

@@ -0,0 +1,8 @@
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = false
+end

data/test/ci/ci_runner.sh

@@ -0,0 +1,8 @@
+engine=$(ruby -e 'puts RUBY_ENGINE')
+
+case $engine in
+  "ruby" )
+    bundle exec rake test cane;;
+  * )
+    bundle exec rake test;;
+esac

data/test/hakiri/http_client_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+describe Hakiri::HttpClient do
+  subject { Hakiri::HttpClient.new }
+
+  it { subject.must_respond_to :auth_token }
+  it { subject.must_respond_to :auth_token= }
+  it { subject.must_respond_to :api_url }
+  it { subject.must_respond_to :api_url= }
+
+  describe "#get_issues" do
+  end
+
+  describe "#check_versions_diff" do
+  end
+
+  describe "#sync_project_versions" do
+  end
+
+end

data/test/hakiri/stack_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+describe Hakiri::Stack do
+  subject { Hakiri::Stack.new }
+
+  it { subject.must_respond_to :technologies }
+  it { subject.must_respond_to :technologies= }
+  it { subject.must_respond_to :default_command }
+  it { subject.must_respond_to :default_command= }
+
+  describe "#build_from_json_file" do
+  end
+
+  describe "#build_from_input" do
+  end
+
+  describe "#fetch_versions" do
+  end
+
+end

data/test/hakiri/technology_test.rb

@@ -0,0 +1,5 @@
+require "test_helper"
+
+describe Hakiri::Technology do
+
+end

data/test/hakiri_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+describe Hakiri do
+
+  it { Hakiri.must_be_kind_of Module }
+
+end

data/test/test_helper.rb

@@ -0,0 +1,18 @@
+begin
+  require "simplecov"
+  SimpleCov.start do
+    add_filter "test"
+    command_name "Minitest"
+  end
+rescue LoadError
+  warn "unable to load 'simplecov'"
+end
+
+require "minitest/autorun"
+require "minitest/pride"
+
+require File.expand_path("../../lib/hakiri", __FILE__)
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in test/support/ and its subdirectories.
+Dir[File.join("./test/support/**/*.rb")].sort.each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hakiri
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: Hakiri is a CLI for www.hakiriup.com—a cloud security platform for Ruby
   on Rails apps.
 email: vasinov@me.com
@@ -148,6 +164,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -157,6 +175,7 @@ files:
 - hakiri.gemspec
 - lib/hakiri.rb
 - lib/hakiri/cli/cli.rb
+- lib/hakiri/cli/code.rb
 - lib/hakiri/cli/gemfile.rb
 - lib/hakiri/cli/manifest.json
 - lib/hakiri/cli/manifest.rb
@@ -177,11 +196,20 @@ files:
 - lib/hakiri/technologies/redis.rb
 - lib/hakiri/technologies/ruby.rb
 - lib/hakiri/technologies/ruby_on_rails.rb
-- lib/hakiri/technologies/technology.rb
 - lib/hakiri/technologies/thin.rb
 - lib/hakiri/technologies/trinidad.rb
 - lib/hakiri/technologies/unicorn.rb
+- lib/hakiri/technology.rb
 - lib/hakiri/version.rb
+- tasks/bundler.rake
+- tasks/cane.rake
+- tasks/test.rake
+- test/ci/ci_runner.sh
+- test/hakiri/http_client_test.rb
+- test/hakiri/stack_test.rb
+- test/hakiri/technology_test.rb
+- test/hakiri_test.rb
+- test/test_helper.rb
 homepage: https://www.hakiriup.com
 licenses:
 - MIT