qoobaa-d2s3 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/d2s3.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{d2s3}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Williams", "Jakub Kuźma"]
@@ -20,13 +20,11 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "d2s3.gemspec",
-     "generators/d2s3/d2s3.rb",
+     "generators/d2s3/d2s3_generator.rb",
      "generators/d2s3/templates/initializers/d2s3.rb",
      "lib/d2s3.rb",
      "lib/d2s3/configuration.rb",
-     "lib/d2s3/signature.rb",
      "lib/d2s3/view_helpers.rb",
-     "test/signature_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/qoobaa/d2s3}
@@ -35,8 +33,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{direct to s3}
   s.test_files = [
-    "test/signature_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/generators/d2s3/{d2s3.rb → d2s3_generator.rb}

@@ -1,6 +1,6 @@
 require 'rbconfig'
 
-class D2S3Generator < Rails::Generator::Base
+class D2s3Generator < Rails::Generator::Base
   def manifest
     record do |m|
       m.directory "config"

data/generators/d2s3/templates/initializers/d2s3.rb

@@ -1,5 +1,5 @@
-D2S3.configuration do |config|
+D2s3.configuration do |config|
   config.access_key_id = "your_access_key_id"
   config.secret_access_key = "your_secret_access_key"
-  config.bucket = "your_application_name"
+  config.bucket = "your_bucket_name"
 end

data/lib/d2s3.rb

@@ -1,3 +1,8 @@
-require 'd2s3/signature'
+require 'base64'
+require 'openssl'
+require 'digest/sha1'
+
 require 'd2s3/configuration'
 require 'd2s3/view_helpers'
+
+ActionView::Base.send(:include, D2s3::ViewHelpers) if defined?(ActionView::Base)

data/lib/d2s3/configuration.rb

@@ -1,6 +1,6 @@
 require "singleton"
 
-module D2S3
+module D2s3
   class Configuration
     include Singleton
 

data/lib/d2s3/view_helpers.rb

@@ -1,50 +1,52 @@
-require 'base64'
-
-module D2S3
+module D2s3
   module ViewHelpers
-    include D2S3::Signature
-
     def s3_upload_form_tag(options = {})
-      bucket          = D2S3.configuration.bucket
-      access_key_id   = D2S3.configuration.access_key_id
-      protocol        = options[:protocol] || "http"
-      key             = options[:key] || ''
-      redirect        = options[:redirect] || '/'
-      acl             = options[:acl] || 'public-read'
-      expiration_date = (options[:expiration_date] || 10.hours).from_now.strftime('%Y-%m-%dT%H:%M:%S.000Z')
-      max_filesize    = options[:max_filesize] || 1.megabyte
-      submit_button   = options[:submit_button] || %(<input type="submit" value="#{I18n.t("button.upload", :default => "Upload")}">)
+      bucket            = D2s3.configuration.bucket
+      access_key_id     = D2s3.configuration.access_key_id
+      secret_access_key = D2s3.configuration.secret_access_key
+
+      raise "Please configure D2s3 before use" unless bucket and access_key_id and secret_access_key
 
-      options[:form] ||= {}
-      options[:form][:id] ||= 'upload-form'
-      options[:form][:class] ||= 'upload-form'
+      protocol          = options.delete(:protocol) || "http"
+      key               = options.delete(:key) || ""
+      redirect          = options.delete(:redirect) || "/"
+      acl               = options.delete(:acl) || "public-read"
+      expiration_date   = (options.delete(:expiration_date) || 10.hours).from_now.strftime("%Y-%m-%dT%H:%M:%S.000Z")
+      max_filesize      = options.delete(:max_filesize) || 1.megabyte
+      submit            = options.delete(:submit_button) || submit_tag(I18n.t("button.upload", :default => "Upload"))
 
-      policy = Base64.encode64(
-                               %({"expiration": "#{expiration_date}",
-          "conditions": [
-            {"bucket": "#{bucket}"},
-            ["starts-with", "$key", "#{key}"],
-            {"acl": "#{acl}"},
-            {"success_action_redirect": "#{redirect}"},
-            ["content-length-range", 0, #{max_filesize}]
-          ]
-        })).gsub(/\n|\r/, '')
+      policy_document = <<-eos
+        {
+          "expiration": "#{expiration_date}",
+          "conditions":
+            [
+              {"bucket": "#{bucket}"},
+              ["starts-with", "$key", "#{key}"],
+              {"acl": "#{acl}"},
+              {"success_action_redirect": "#{redirect}"},
+              ["content-length-range", 0, #{max_filesize}]
+            ]
+        }
+      eos
 
-      signature = b64_hmac_sha1(D2S3.configuration.secret_access_key, policy)
-      out = ""
-      out << %(
-          <form action="#{protocol}://#{bucket}.s3.amazonaws.com/" method="post" enctype="multipart/form-data" id="#{options[:form][:id]}" class="#{options[:form][:class]}" style="#{options[:form][:style]}">
-          <input type="hidden" name="key" value="#{key}/${filename}">
-          <input type="hidden" name="AWSAccessKeyId" value="#{access_key_id}">
-          <input type="hidden" name="acl" value="#{acl}">
-          <input type="hidden" name="success_action_redirect" value="#{redirect}">
-          <input type="hidden" name="policy" value="#{policy}">
-          <input type="hidden" name="signature" value="#{signature}">
-          <input name="file" type="file">#{submit_button}
-          </form>
-        )
+      policy = Base64.encode64(policy_document).gsub("\n","")
+      signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new("sha1"), secret_access_key, policy)).gsub("\n","")
+
+      options[:action] ||= "#{protocol}://#{bucket}.s3.amazonaws.com/"
+      options[:method] ||= "post"
+      options[:enctype] ||= "multipart/form-data"
+
+      content_tag :form, options do
+        content = ""
+        content << hidden_field_tag("key", "#{key}/${filename}")
+        content << hidden_field_tag("AWSAccessKeyId", access_key_id)
+        content << hidden_field_tag("acl", acl)
+        content << hidden_field_tag("success_action_redirect", redirect)
+        content << hidden_field_tag("policy", policy)
+        content << hidden_field_tag("signature", signature)
+        content << file_field_tag("file")
+        content << submit
+      end
     end
   end
 end
-
-ActionView::Base.send(:include, D2S3::ViewHelpers) if defined?(ActionView::Base)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: qoobaa-d2s3
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matthew Williams
@@ -31,13 +31,11 @@ files:
 - Rakefile
 - VERSION
 - d2s3.gemspec
-- generators/d2s3/d2s3.rb
+- generators/d2s3/d2s3_generator.rb
 - generators/d2s3/templates/initializers/d2s3.rb
 - lib/d2s3.rb
 - lib/d2s3/configuration.rb
-- lib/d2s3/signature.rb
 - lib/d2s3/view_helpers.rb
-- test/signature_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/qoobaa/d2s3
@@ -66,5 +64,4 @@ signing_key:
 specification_version: 3
 summary: direct to s3
 test_files: 
-- test/signature_test.rb
 - test/test_helper.rb

data/lib/d2s3/signature.rb

@@ -1,194 +0,0 @@
-module D2S3
-  module Signature
-    HEXCASE = false  # hex output format. false - lowercase; true - uppercase
-    B64PAD  = "=" # base-64 pad character. "=" for strict RFC compliance
-    CHRSH   = 8  # bits per input character. 8 - ASCII; 16 - Unicode
-
-    def hex_sha1(s)
-      return binb2hex(core_sha1(str2binb(s), s.length * CHRSH))
-    end
-
-    def b64_hmac_sha1(key, data)
-      return binb2b64(core_hmac_sha1(key, data))
-    end
-
-    # 32-bit left shift
-    def js_shl(num, count)
-      v = (num << count) & 0xffffffff
-      v > 2**31 ? v - 2**32 : v
-    end
-
-    # 32-bit zero-fill right shift  (>>>)
-    def js_shr_zf(num, count)
-      num >> count & (2**(32-count)-1)
-    end
-
-    # Calculate the SHA-1 of an array of big-endian words, and a bit length
-    def core_sha1(x, len)
-      # append padding
-      x[len >> 5] ||= 0
-      x[len >> 5] |= 0x80 << (24 - len % 32)
-      x[((len + 64 >> 9) << 4) + 15] = len
-
-      w = Array.new(80, 0)
-      a =  1732584193
-      b = -271733879
-      c = -1732584194
-      d =  271733878
-      e = -1009589776
-
-      #for(var i = 0; i < x.length; i += 16)
-      i = 0
-      while(i < x.length)
-        olda = a
-        oldb = b
-        oldc = c
-        oldd = d
-        olde = e
-
-        #for(var j = 0; j < 80; j++)
-        j = 0
-        while(j < 80)
-          if(j < 16)
-            w[j] = x[i + j] || 0
-          else
-            w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1)
-          end
-
-          t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)),
-                       safe_add(safe_add(e, w[j]), sha1_kt(j)))
-          e = d
-          d = c
-          c = rol(b, 30)
-          b = a
-          a = t
-          j += 1
-        end
-
-        a = safe_add(a, olda)
-        b = safe_add(b, oldb)
-        c = safe_add(c, oldc)
-        d = safe_add(d, oldd)
-        e = safe_add(e, olde)
-        i += 16
-      end
-      return [a, b, c, d, e]
-    end
-
-    # Perform the appropriate triplet combination function for the current
-    # iteration
-    def sha1_ft(t, b, c, d)
-      return (b & c) | ((~b) & d) if(t < 20)
-      return b ^ c ^ d if(t < 40)
-      return (b & c) | (b & d) | (c & d) if(t < 60)
-      return b ^ c ^ d;
-    end
-
-    # Determine the appropriate additive constant for the current iteration
-    def sha1_kt(t)
-      return (t < 20) ?  1518500249 : (t < 40) ?  1859775393 :
-             (t < 60) ? -1894007588 : -899497514
-    end
-
-    # Calculate the HMAC-SHA1 of a key and some data
-    def core_hmac_sha1(key, data)
-      bkey = str2binb(key)
-      if(bkey.length > 16)
-        bkey = core_sha1(bkey, key.length * CHRSH)
-      end
-
-      ipad = Array.new(16, 0)
-      opad = Array.new(16, 0)
-      #for(var i = 0; i < 16; i++)
-      i = 0
-      while(i < 16)
-        ipad[i] = (bkey[i] || 0) ^ 0x36363636
-        opad[i] = (bkey[i] || 0) ^ 0x5C5C5C5C
-        i += 1
-      end
-
-      hash = core_sha1((ipad + str2binb(data)), 512 + data.length * CHRSH)
-      return core_sha1((opad + hash), 512 + 160)
-    end
-
-    # Add integers, wrapping at 2^32. This uses 16-bit operations internally
-    # to work around bugs in some JS interpreters.
-    def safe_add(x, y)
-      v = (x+y) % (2**32)
-      return v > 2**31 ? v- 2**32 : v
-    end
-
-    # Bitwise rotate a 32-bit number to the left.
-    def rol(num, cnt)
-      #return (num << cnt) | (num >>> (32 - cnt))
-      return (js_shl(num, cnt)) | (js_shr_zf(num, 32 - cnt))
-    end
-
-    # Convert an 8-bit or 16-bit string to an array of big-endian words
-    # In 8-bit function, characters >255 have their hi-byte silently ignored.
-    def str2binb(str)
-      bin = []
-      mask = (1 << CHRSH) - 1
-      #for(var i = 0; i < str.length * CHRSH; i += CHRSH)
-      i = 0
-      while(i < str.length * CHRSH)
-        bin[i>>5] ||= 0
-        byte = str.respond_to?(:getbyte) ? str.getbyte(i / CHRSH) : str[i / CHRSH]
-        bin[i>>5] |= (byte & mask) << (32 - CHRSH - i%32)
-        i += CHRSH
-      end
-      return bin
-    end
-
-    # Convert an array of big-endian words to a string
-    #   function binb2str(bin)
-    # {
-    #   var str = "";
-    #   var mask = (1 << CHRSH) - 1;
-    #   for(var i = 0; i < bin.length * 32; i += CHRSH)
-    #     str += String.fromCharCode((bin[i>>5] >>> (32 - CHRSH - i%32)) & mask);
-    #   return str;
-    # }
-    #
-
-    # Convert an array of big-endian words to a hex string.
-    def binb2hex(binarray)
-      hex_tab = HEXCASE ? "0123456789ABCDEF" : "0123456789abcdef"
-      str = ""
-      #for(var i = 0; i < binarray.length * 4; i++)
-      i = 0
-      while(i < binarray.length * 4)
-        str += hex_tab[(binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF].chr +
-               hex_tab[(binarray[i>>2] >> ((3 - i%4)*8  )) & 0xF].chr
-        i += 1
-      end
-      return str;
-    end
-
-    # Convert an array of big-endian words to a base-64 string
-    def binb2b64(binarray)
-      tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-      str = ""
-
-      #for(var i = 0; i < binarray.length * 4; i += 3)
-      i = 0
-      while(i < binarray.length * 4)
-        triplet = (((binarray[i   >> 2].to_i >> 8 * (3 -  i   %4)) & 0xFF) << 16) |
-                     (((binarray[i+1 >> 2].to_i >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 ) |
-                      ((binarray[i+2 >> 2].to_i >> 8 * (3 - (i+2)%4)) & 0xFF)
-        #for(var j = 0; j < 4; j++)
-        j = 0
-        while(j < 4)
-          if(i * 8 + j * 6 > binarray.length * 32)
-            str += B64PAD
-          else
-            str += tab[(triplet >> 6*(3-j)) & 0x3F].chr
-          end
-          j += 1
-        end
-        i += 3
-      end
-      return str
-    end
-  end
-end

data/test/signature_test.rb

@@ -1,57 +0,0 @@
-require 'test_helper'
-
-include D2S3::Signature
-
-class SignatureTest < Test::Unit::TestCase
-  should "return correct core_sha1 values" do
-    str = "abc"
-    assert [-519653305, -1566383753, -2070791546, -753729183, -204968198], core_sha1(str2binb(str), str.length)
-  end
-
-  should "return correct str2binb values" do
-    assert [1718578976, 1650553376, 1751480608, 1952998770, 1694498816],  str2binb('foo bar hey there')
-  end
-
-  should "return correct hex_sha1 value" do
-    assert "a9993e364706816aba3e25717850c26c9cd0d89d", hex_sha1("abc")
-  end
-
-  should "return correct b64_hmac_sha1 value" do
-    assert "frFXMR9cNoJdsSPnjebZpBhUKzI=", b64_hmac_sha1("foo", "abc")
-  end
-
-  context "with num=1732584193 and cnt=5" do
-    setup do
-      @num = 1732584193
-      @cnt = 5
-    end
-
-    should "return correct roll value" do
-      assert -391880660, rol(@num, @cnt)
-    end
-
-    should "return correct safe_add value" do
-      assert -519653305, safe_add(2042729798, @num)
-    end
-
-    should "return correct js_shl value" do
-      assert -391880672, js_shl(@num, @cnt)
-    end
-
-    should "return correct js_shr_zf value" do
-      assert 12, js_shr_zf(@num, 32 - @cnt)
-    end
-
-    should "return correct sha1_ft value" do
-      assert -1732584194, sha1_ft(0, -271733879, -1732584194, 271733878)
-    end
-
-    should "return correct sha1_kt value" do
-      assert 1518500249, sha1_kt(0)
-    end
-
-    should "return correct safe_add value" do
-      assert 286718899, safe_add(safe_add(rol(@num, @cnt), sha1_ft(0, -271733879, -1732584194, 271733878)), safe_add(safe_add(-1009589776, 1902273280), sha1_kt(0)))
-    end
-  end
-end