vagrant-s3auth 0.0.2 → 0.1.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092ce09db56f427904d76e1aca0b66f6adfa499a
-  data.tar.gz: 523c368c3d5c3fd13aa6216f1d864ffdec67ef90
+  metadata.gz: 24bd022cbfa2876c12e53ab63524d0223c1db2bc
+  data.tar.gz: a4c3000842d64b4cd7e86a1916f3059b82a29d59
 SHA512:
-  metadata.gz: 27af19fae218886584b4bf57efcfce1236cee5b270e1b7b36e46a38f9d3a8db3ae272684b6e86aaa27febb9ed2bc7075b9667512f5f5ff81240e2dd00178f984
-  data.tar.gz: 2d07e190738c9f79862a971f43294d81fad809b8494cef94c5225f9c3c964e531f388dbbab59a4e8b3b32a0e96ef72f6c83f13f44c888607a247f4622c10f7fe
+  metadata.gz: 9106c22b6c8982f6e2fe6f54d3c11835f6361d478b22b0128e862bb2f67d73a17d34570253283730f16cda6c04a05e0403e0a05a7b4dda013fa7d6a5d10939fd
+  data.tar.gz: 7a1be0554b1811f140a2ec74184869984ab4256d3389d2ba7e960c702821fd2a6626aed874a06ab2f30bdc7fb4f4008081ad43d802271f92331d3e2c33188c24

data/.rubocop.yml

@@ -1,20 +1,21 @@
-AlignParameters:
+Lint/AssignmentInCondition:
   Enabled: false
 
-AssignmentInCondition:
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/Documentation:
   Enabled: false
 
-Documentation:
+Style/FileName:
   Enabled: false
 
-LineLength:
+Style/LineLength:
   Max: 100
 
-MethodLength:
+Style/MethodLength:
   CountComments: false  # count full line comments?
   Max: 20
 
-SignalException:
+Style/SignalException:
   EnforcedStyle: only_raise
-  SupportedStyles:
-    - only_raise

data/Gemfile

@@ -5,5 +5,7 @@ group :plugins do
 end
 
 group :development do
+  gem 'rake', '~> 10.3.2'
+  gem 'rubocop', '~> 0.23.0'
   gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git'
 end

data/Gemfile.lock

@@ -1,58 +1,113 @@
 GIT
   remote: git://github.com/mitchellh/vagrant.git
-  revision: b97c509c15d94ee70af8ce25739934c5dccb7452
+  revision: f0cd8511ed3784415df14aa17b7e4b4935733b63
   specs:
-    vagrant (1.5.3.dev)
-      bundler (~> 1.5.2)
+    vagrant (1.6.4.dev)
+      bundler (>= 1.5.2, < 1.7.0)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
       listen (~> 2.7.1)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
-      net-ssh (>= 2.6.6, < 2.8.0)
+      net-ssh (>= 2.6.6, < 2.10.0)
       rb-kqueue (~> 0.2.0)
       wdm (~> 0.1.0)
+      winrm (~> 1.1.3)
 
 PATH
   remote: .
   specs:
-    vagrant-s3auth (0.0.2)
+    vagrant-s3auth (0.1.0.alpha1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    akami (1.2.2)
+      gyoku (>= 0.4.0)
+      nokogiri
+    ast (2.0.0)
+    builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    celluloid-io (0.15.0)
-      celluloid (>= 0.15.0)
-      nio4r (>= 0.5.0)
-    childprocess (0.5.2)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     erubis (2.7.0)
     ffi (1.9.3)
+    gssapi (1.0.3)
+      ffi (>= 1.0.1)
+    gyoku (1.1.1)
+      builder (>= 2.1.2)
+    httpclient (2.4.0)
+    httpi (0.9.7)
+      rack
     i18n (0.6.9)
-    listen (2.7.1)
+    json (1.8.1)
+    listen (2.7.8)
       celluloid (>= 0.15.2)
-      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    little-plugger (1.1.3)
     log4r (1.1.10)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    nio4r (1.0.0)
+    net-ssh (2.9.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    nori (1.1.5)
+    parser (2.1.9)
+      ast (>= 1.1, < 3.0)
+      slop (~> 3.4, >= 3.4.5)
+    powerpack (0.0.9)
+    rack (1.5.2)
+    rainbow (2.0.0)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rb-inotify (0.9.3)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.2)
+    rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
+    rubocop (0.23.0)
+      json (>= 1.7.7, < 2)
+      parser (~> 2.1.9)
+      powerpack (~> 0.0.6)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.5.1)
+    rubyntlm (0.1.1)
+    savon (0.9.5)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 1.0)
+    slop (3.5.0)
     timers (1.1.0)
+    uuidtools (2.1.4)
+    wasabi (1.0.0)
+      nokogiri (>= 1.4.0)
     wdm (0.1.0)
+    winrm (1.1.3)
+      gssapi (~> 1.0.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (~> 1.6, >= 1.6.1)
+      nokogiri (~> 1.5)
+      rubyntlm (~> 0.1.1)
+      savon (= 0.9.5)
+      uuidtools (~> 2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake (~> 10.3.2)
+  rubocop (~> 0.23.0)
   vagrant!
   vagrant-s3auth!

data/Rakefile

@@ -1,6 +1,11 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rubocop/rake_task'
 
 Dir.chdir(File.expand_path('../', __FILE__))
 
 Bundler::GemHelper.install_tasks
+
+RuboCop::RakeTask.new(:lint)
+
+task default: %w(lint)

data/lib/vagrant-s3auth/extensions/downloader.rb

@@ -0,0 +1,38 @@
+require 'uri'
+
+require 'vagrant/util/downloader'
+require 'vagrant-s3auth/util/authenticator'
+
+module Vagrant
+  module Util
+    class Downloader
+      def execute_curl_with_s3(options, subprocess_options, &data_proc)
+        begin
+          url = URI.parse(@source)
+        rescue URI::InvalidURIError
+          @logger.info("s3auth: Ignoring unparsable URL: #{url}")
+        end
+
+        if url && s3_url?(url)
+          @logger.info("s3auth: Signing S3 URL: #{url}")
+
+          method = options.any? { |o| o == '-I' } ? 'HEAD' : 'GET'
+          headers = VagrantPlugins::S3Auth::Util::Authenticator.sign(url, method)
+
+          headers.each do |name, value|
+            options << '-H' << "#{name}: #{value}"
+          end
+        end
+
+        execute_curl_without_s3(options, subprocess_options, &data_proc)
+      end
+
+      def s3_url?(url)
+        url.host =~ VagrantPlugins::S3Auth::S3_HOST_MATCHER
+      end
+
+      alias_method :execute_curl_without_s3, :execute_curl
+      alias_method :execute_curl, :execute_curl_with_s3
+    end
+  end
+end

data/lib/vagrant-s3auth/extensions.rb

@@ -0,0 +1,2 @@
+require_relative 'extensions/box_add'
+require_relative 'extensions/downloader'

data/lib/vagrant-s3auth/plugin.rb

@@ -8,8 +8,8 @@ if Vagrant::VERSION < '1.5.0'
   raise 'The Vagrant AWS plugin is only compatible with Vagrant 1.5+'
 end
 
-require_relative 'action'
 require_relative 'errors'
+require_relative 'extensions'
 
 module VagrantPlugins
   module S3Auth
@@ -20,34 +20,10 @@ module VagrantPlugins
         Use versioned Vagrant boxes with S3 authentication.
       DESC
 
-      action_hook 'authenticate-box-url', :authenticate_box_url do |hook|
-        setup_i18n
-        setup_logging
-
-        hook.append(Action.authenticate_box_url)
-      end
-
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml', VagrantPlugins::S3Auth.source_root)
         I18n.reload!
       end
-
-      def self.setup_logging
-        require 'log4r'
-
-        level = nil
-        begin
-          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
-        rescue NameError
-          level = nil
-        end
-
-        if level
-          logger = Log4r::Logger.new('vagrant_s3auth')
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-        end
-      end
     end
   end
 end

data/lib/vagrant-s3auth/util/authenticator.rb

@@ -0,0 +1,53 @@
+require 'base64'
+require 'cgi'
+require 'log4r'
+require 'openssl'
+require 'uri'
+
+require 'vagrant/util/downloader'
+
+module VagrantPlugins
+  module S3Auth
+    module Util
+      class Authenticator
+        def self.sign(url, method)
+          new.sign(url, method)
+        end
+
+        def initialize
+          @access_key = ENV['AWS_ACCESS_KEY_ID']
+          @secret_key = ENV['AWS_SECRET_ACCESS_KEY']
+
+          ensure_credentials
+        end
+
+        def sign(url, method)
+          now = CGI.rfc1123_date(Time.now)
+          message = "#{method}\n\n\n#{now}\n#{url.path}"
+          signature = Base64.strict_encode64(
+            OpenSSL::HMAC.digest('sha1', @secret_key, message))
+
+          {
+            date: now,
+            authorization: "AWS #{@access_key}:#{signature}"
+          }
+        end
+
+        protected
+
+        def ensure_credentials
+          missing_variables = []
+          missing_variables << 'AWS_ACCESS_KEY_ID' unless @access_key
+          missing_variables << 'AWS_SECRET_ACCESS_KEY' unless @secret_key
+
+          # rubocop:disable Style/GuardClause
+          unless missing_variables.empty?
+            raise Errors::MissingCredentialsError,
+              missing_variables: missing_variables.join(', ')
+          end
+          # rubocop:enable Style/GuardClause
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-s3auth/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module S3Auth
-    VERSION = '0.0.2'
+    VERSION = '0.1.0.alpha1'
   end
 end

data/lib/vagrant-s3auth.rb

@@ -5,6 +5,7 @@ require 'vagrant-s3auth/plugin'
 module VagrantPlugins
   module S3Auth
     S3_HOST         = 's3.amazonaws.com'
+    S3_HOST_MATCHER = /^s3([[:alnum:]\-\.]+)?\.amazonaws\.com$/
     BOX_URL_MATCHER = %r{^s3://(?<bucket>[[:alnum:]\-\.]+)(?<resource>.*)/?}
 
     def self.source_root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-s3auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0.alpha1
 platform: ruby
 authors:
 - Nikhil Benesch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,11 +54,12 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-s3auth.rb
-- lib/vagrant-s3auth/action.rb
-- lib/vagrant-s3auth/action/authenticate_box_url.rb
-- lib/vagrant-s3auth/action/box_add.rb
 - lib/vagrant-s3auth/errors.rb
+- lib/vagrant-s3auth/extensions.rb
+- lib/vagrant-s3auth/extensions/box_add.rb
+- lib/vagrant-s3auth/extensions/downloader.rb
 - lib/vagrant-s3auth/plugin.rb
+- lib/vagrant-s3auth/util/authenticator.rb
 - lib/vagrant-s3auth/version.rb
 - locales/en.yml
 - vagrant-s3auth.gemspec
@@ -77,9 +78,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14

data/lib/vagrant-s3auth/action/authenticate_box_url.rb

@@ -1,86 +0,0 @@
-require 'base64'
-require 'cgi'
-require 'log4r'
-require 'openssl'
-require 'uri'
-
-module VagrantPlugins
-  module S3Auth
-    module Action
-      class AuthenticateBoxUrl
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_s3auth::action::authenticate_box_url')
-          @access_key = ENV['AWS_ACCESS_KEY_ID']
-          @secret_key = ENV['AWS_SECRET_ACCESS_KEY']
-        end
-
-        def call(env)
-          env[:box_urls].map! do |url_string|
-            begin
-              url = URI.parse(url_string)
-            rescue URI::InvalidURIError
-              next url_string
-            end
-
-            unless s3_url?(url)
-              @logger.debug("Skipping non-S3 host: #{url}")
-              next url_string
-            end
-
-            # Vagrant makes a HEAD request for metadata. S3 doesn't support
-            # query-string authentication on HEAD requests, so skip signing. We
-            # need to provide a different "authenticated" URL, though, or
-            # Vagrant will think the box doesn't require authentication,
-            # and won't request an authenticated URL for the box itself.
-            unless box_url?(url)
-              @logger.debug("Munging S3 metadata URL: #{url}")
-              next url_string + '?'
-            end
-
-            @logger.info("Signing URL for S3 box: #{url}")
-            sign(url)
-          end
-
-          @app.call(env)
-        end
-
-        def sign(url)
-          ensure_credentials
-
-          expires = (Time.now + 20).to_i
-          message = "GET\n\n\n#{expires}\n#{url.path}"
-          signature = CGI.escape(Base64.strict_encode64(
-            OpenSSL::HMAC.digest('sha1', @secret_key, message)))
-
-          url.query = {
-            'AWSAccessKeyId' => @access_key,
-            'Expires'        => expires,
-            'Signature'      => signature
-          }.map { |k, v| "#{k}=#{v}" }.join('&')
-
-          url.to_s
-        end
-
-        def ensure_credentials
-          missing_variables = []
-          missing_variables << 'AWS_ACCESS_KEY_ID' unless @access_key
-          missing_variables << 'AWS_SECRET_ACCESS_KEY' unless @secret_key
-
-          unless missing_variables.empty?
-            raise Errors::MissingCredentialsError,
-              missing_variables: missing_variables.join(', ')
-          end
-        end
-
-        def s3_url?(url)
-          url.host == S3_HOST
-        end
-
-        def box_url?(url)
-          url.path.end_with?('.box')
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-s3auth/action.rb

@@ -1,14 +0,0 @@
-require_relative 'action/authenticate_box_url'
-require_relative 'action/box_add'
-
-module VagrantPlugins
-  module S3Auth
-    module Action
-      def self.authenticate_box_url
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use AuthenticateBoxUrl
-        end
-      end
-    end
-  end
-end