tigre-client 0.3.8 → 0.3.9

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    tigre-client (0.3.7)
+    tigre-client (0.3.8)
       faraday (~> 0.6.0)
+      right_aws (~> 2.1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -16,6 +17,9 @@ GEM
     json (1.5.1)
     multipart-post (1.1.0)
     rack (1.2.2)
+    right_aws (2.1.0)
+      right_http_connection (>= 1.2.5)
+    right_http_connection (1.3.0)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/lib/tigre-client/analysis.rb

@@ -4,6 +4,8 @@ module Tigre
     extend Tigre::CommonParams
     extend Tigre::CommonGetters
     
+    # required
+    #   analysis_id => String
     def get(analysis_id)
       if analysis_id == '' 
         raise "Missing analysis_id parameter"

data/lib/tigre-client/sample.rb

@@ -1,3 +1,5 @@
+require 'digest'
+
 module Tigre
   class Sample
     
@@ -6,24 +8,92 @@ module Tigre
     extend Tigre::TagComponents
 
     # required params
-    #   file_location => String path to the file
     #   md5 => String
     # optional params
+    #   file_location => String path to the file
     #   options => Hash 
     #     :tags => String => I.E 'foo'
     #     :tags => String (comma seperated) => I.E 'foo,bar,baz'
     #     :tags => Array => ['foo', 'bar', 'baz']
+    #     :dbts => Hash {:key1 => value, :key2 => value} where the key is what the name of the 
+    #              attribute is and the value should be a boolean
+    #     :mutex_name_list => String (comma seperated) => I.E 'foo,bar,baz'
+    #     :mutex_name_list => Array => ['foo', 'bar', 'baz']
     def self.post(file_location, md5, options={})
-      if file_location == ''|| md5 == ''
-        raise ArguementError, "File_location or md5 parameter cannot be empty"
-      end
+      raise "md5 parameter cannot be empty" if md5 == ''
       
       options[:tags] = package_array_list(options[:tags]) if options[:tags]
       
-      post_data = {:file => File.new(file_location), :md5 => md5}
-      Tigre.post_connection('/samples', post_data.merge(options))
+      post_data = {:md5 => md5}
+      
+      unless file_location == ''
+        if Tigre.s3_enabled?
+          process_after = true
+        else
+          post_data[:file] = File.new(file_location)
+        end
+      end
+      
+      post_data[:metadatas] = self.get_metadatas(options)
+      
+      result = Tigre.post_connection('/samples', post_data.merge(options))
+      
+      case
+      when result[1] == 'success_nofile' && process_after
+        result = self.send_file_to_s3(md5, file_location)
+      when result[1] == 'success' && process_after && options[:force]
+        result = self.send_file_to_s3(md5, file_location)
+      end
+      
+      result
+    end
+
+    def self.get_metadatas(options)
+      hash = {}
+      if options[:dbts]
+        hash[:dbts] = options[:dbts]
+      end
+      
+      if options[:mutex_name_list]
+        hash[:mutex_name_list] = package_array_list(options[:mutex_name_list])
+      end
+      hash.empty? ? nil : hash
+    end
+
+    def self.send_file_to_s3(md5, file)
+      Tigre.logger.info 'Uploading file directly to S3'
+      s3        = RightAws::S3.new(Tigre.s3_key, Tigre.s3_secret)
+      bucket    = s3.bucket(Tigre.s3_bucket)
+      file_name = [md5[0],md5[1],md5[2],md5[3],md5].join('/')
+      
+      bucket.put(file_name, IO.binread(file))
+      
+      Tigre.logger.info 'Updating sample with filename / filesize'
+      f = File.new(file, 'r')
+      digest_hash = self.calculate_checksums(f)
+      post_data = {:md5    => md5,
+                   :sample => {:file_original_filename => File.basename(f),
+                               :file_size => File.size(f),
+                               :sha1      => digest_hash[:sha1],
+                               :sha256    => digest_hash[:sha256] 
+                              }
+                  }
+      Tigre.post_connection('/samples', post_data)
     end
-        
+
+    def self.calculate_checksums(file)
+      sha1   = Sample.calculate_file_digest(Digest::SHA1.new, file)
+      sha256 = Sample.calculate_file_digest(Digest::SHA2.new, file)
+      {:sha1 => sha1, :sha256 => sha256}
+    end
+
+    def self.calculate_file_digest(digest, file)
+      File.open(file, "rb") do |f|
+        digest.update f.read(8192) until f.eof
+      end
+      digest.hexdigest
+    end
+
     # required params
     #   md5 => String
     #   params_hash => Hash

data/lib/tigre-client/version.rb

@@ -1,5 +1,5 @@
 module Tigre
   module Client
-    VERSION = "0.3.8"
+    VERSION = "0.3.9"
   end
 end

data/lib/tigre-client.rb

@@ -1,6 +1,7 @@
-# faraday
+# 3rd party libs
 require 'faraday'
 require 'tigre-client/multipart_with_file'
+require 'right_aws'
 
 # common functionality libraries
 require 'tigre-client/common/analysis_components'
@@ -15,15 +16,19 @@ require 'tigre-client/sample'
 require 'tigre-client/url'
 
 module Tigre
-  
+
   class << self
-    attr_accessor :token, :server, :endpoint, :conn, :logger
-    
+    attr_accessor :token, :server, :endpoint, :conn, :logger, :s3_key, :s3_secret, :s3_bucket
+
     def configure
       yield self
       true
     end
-    
+
+    def s3_enabled?
+      !Tigre.s3_key.nil? && !Tigre.s3_secret.nil? && !Tigre.s3_bucket.nil?
+    end
+
     def build_get_connection
       @conn = Faraday.new(:url => "#{Tigre.server}") do |builder|
         builder.adapter :net_http
@@ -38,13 +43,13 @@ module Tigre
         builder.adapter :net_http
       end
     end
-    
+
     def get_connection(uri_string)
       build_get_connection
       response = Tigre.conn.get(Tigre.endpoint + uri_string, 'API-TOKEN' => Tigre.token)
       [response.status, response.body]
     end
-    
+
     def post_connection(uri_string, data)
       build_post_connection
       response = Tigre.conn.post do |req|
@@ -54,11 +59,11 @@ module Tigre
       end
       [response.status, response.body]
     end
-    
+
     # TODO do we need a post_connection and a post_file_connection?
     # def post_file_connection(uri_string, data)
     #   build_post_connection
-    #         
+    #
     #   response = Tigre.conn.post do |req|
     #     req.url Tigre.endpoint + uri_string
     #     req.headers['API-TOKEN'] = Tigre.token
@@ -66,10 +71,9 @@ module Tigre
     #   end
     #   [response.status, response.body]
     # end
-    
+
     def put_connection(uri_string, data)
       build_post_connection
-            
       response = Tigre.conn.put do |req|
         req.url Tigre.endpoint + uri_string
         req.headers['API-TOKEN'] = Tigre.token
@@ -77,7 +81,7 @@ module Tigre
       end
       [response.status, response.body]
     end
-    
+
   end
-  
+
 end

data/tigre-client.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "json" 
   
   s.add_dependency('faraday', '~> 0.6.0')
+  s.add_dependency('right_aws', '~> 2.1.0')
   
 end

metadata

@@ -2,7 +2,7 @@
 name: tigre-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Marcio Castilho
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -04:00
+date: 2011-05-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,17 @@ dependencies:
         version: 0.6.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: right_aws
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+  type: :runtime
+  version_requirements: *id004
 description: Tigre Client API Library
 email: 
 - marcioc@sunbelt-software.com