vagrant-box-s3 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1643e17f9a726431fd44b34c7a87fe44e73070328d4c7bb261c2f12935c74834
-  data.tar.gz: 2f1e60867c1016ab3e349873b293b69d30142db898301b912e16bfdf8cbd95ed
+  metadata.gz: 857a4297cb7c77e6fc882a495a81de46e19ec48481e69394450349f4d2ab1462
+  data.tar.gz: 54fbc90963cefabf0318fadf73ef4e2370c4438862c75a00041fa727fd4f0780
 SHA512:
-  metadata.gz: 8d2c9963853012e0091c2c8fe8678c77d171c56d5662e28d670d728ee9d97e0123a25056bcb6d5cf9398983e0ad3541d3486cf635a00e4fb8af8ebeecfb9fe2c
-  data.tar.gz: dff68c70631396e84fd058e488583fce8c56e70fbc735981575f018ad91e0b710222e7cf7de721ad0c69f16a1e56da94444429c1d13e5764adb2f53e6fd85a36
+  metadata.gz: 15d7d800c9636bdcc0fbcab656b46d041f57ee018ac20220689135952289603d9dece21ef7b5c7b8700ca9672ba4e7c4231e09d25b1eade790cc7fdd05e7b39b
+  data.tar.gz: 141d2ca407dfda8c5fa8516732dbbafea8c19a15d9c451645a817b14f177a68362797fb22b57726472acbf9a352758440fc376e2f82b08c97031d6e9be8b6296

data/README.md

@@ -40,14 +40,14 @@ You can also use your credentials file to create a profile. Select the appropria
 
 #### ~/.aws/credentials
 
-    [vagrant-s3auth]
+    [vagrant-box-s3]
     aws_access_key_id = AKIA...
     aws_secret_access_key = ...
 
 #### Vagrantfile
 
     ENV.delete_if { |name| name.start_with?('AWS_') }  # Filter out rogue env vars.
-    ENV['AWS_PROFILE'] = 'vagrant-s3auth'
+    ENV['AWS_PROFILE'] = 'vagrant-box-s3'
 
     Vagrant.configure("2") { |config| ... }
 
@@ -60,10 +60,11 @@ You can use any valid HTTP(S) URL for your box URL:
 Specify the bucket name in the path of the URL. AWS has deprecated path-style URLs, but they might still be seen or used in legacy systems.
 
 - Format: https://s3.Region.amazonaws.com/bucket-name/key-name
-  Example: https://s3.eu-west-1.amazonaws.com/mybucket/mybox.box
+- Example: https://s3.eu-west-1.amazonaws.com/mybucket/mybox.box
+
 
 - Format: https://s3-Region.amazonaws.com/bucket-name/keyname
-  Example: https://s3-eu-west-1.amazonaws.com/bucket-name/mybox.box
+- Example: https://s3-eu-west-1.amazonaws.com/bucket-name/mybox.box
 
 #### Virtual-Hosted-Style URLs
 Virtual-hosted-style URLs use the bucket name as a subdomain. This is the recommended and most commonly used format.
@@ -124,6 +125,10 @@ Update the current version in `lib/vagrant-box-s3/version.rb`.
 
 To build the plugin, use `rake build`, this will create a file with the current version number, e.g. `pkg/vagrant-box-s3-0.1.2.gem`.
 
+Remove the old version:
+
+    vagrant plugin uninstall vagrant-box-s3
+
 Testing the plugin requires installing into vagrant from the build:
 
     vagrant plugin install ../vagrant-box-s3/pkg/vagrant-box-s3-0.1.2.gem

data/lib/vagrant-box-s3/downloader.rb

@@ -20,10 +20,14 @@ module Vagrant
         # Call original execute_curl (aliased).
         execute_curl_without_aws_auth(options, subprocess_options, &data_proc)
 
+      rescue Aws::Errors::MissingCredentialsError, Aws::Sigv4::Errors::MissingCredentialsError => e
+        message = "Missing AWS credentials: #{e.message}"
+        @logger.error(message) if defined?(@logger)
+        raise Errors::DownloaderError, message: message
       rescue Aws::S3::Errors::Forbidden => e
         message = "403 Forbidden: #{e.message}"
         raise Errors::DownloaderError, message: message
-      rescue Seahorse::Client::NetworkingError => e
+      rescue => e
         raise Errors::DownloaderError, message: e
       end
 

data/lib/vagrant-box-s3/utils.rb

@@ -15,15 +15,15 @@ module VagrantPlugins
       S3_URL_PATH_REGEX = %r{^https?://s3[-\.]([\w\-]+)\.amazonaws\.com/([^/]+)/([^?]+)}
 
       # Parse an s3 URL.
-      def self.parse_s3_url(s3_url)
+      def self.parse_s3_url(url)
         region = bucket = key = nil
-        if s3_url =~ S3_URL_HOST_REGEX
-          match = S3_URL_HOST_REGEX.match(s3_url)
+        if url =~ S3_URL_HOST_REGEX
+          match = S3_URL_HOST_REGEX.match(url)
           region = match[2]
           bucket = match[1]
           key = match[3]
-        elsif s3_url =~ S3_URL_PATH_REGEX
-          match = S3_URL_PATH_REGEX.match(s3_url)
+        elsif url =~ S3_URL_PATH_REGEX
+          match = S3_URL_PATH_REGEX.match(url)
           region = match[1]
           bucket = match[2]
           key = match[3]
@@ -32,33 +32,64 @@ module VagrantPlugins
         return region, bucket, key
       end
 
+      # Remove presigned URL params from box URL.
+      # We do this as URLs can be cached and do not want to want
+      # to include previously presigned URL parameters.
+      def self.remove_presigned_params(url)
+        # Parse the URL
+        uri = URI.parse(url)
+
+        # Split the query string into parameters
+        query_params = URI.decode_www_form(uri.query || '').to_h
+
+        # Remove any parameters that start with 'X-Amz-'
+        query_params.reject! { |k, _| k.start_with?('X-Amz-') }
+
+        # Check if there are any query parameters left
+        if query_params.empty?
+          # If no query parameters left, set uri.query to nil to remove the '?'
+          uri.query = nil
+        else
+          # Reconstruct the query string without AWS presigned parameters
+          uri.query = URI.encode_www_form(query_params)
+        end
+
+        return uri.to_s
+      end
+
       # Pre-sign an s3 URL, with given method.
       def self.presign_url(method, url, logger)
-          logger.info("BoxS3: Generating signed URL for #{method.upcase}")
-          logger.info("BoxS3: Discovered S3 URL: #{url}")
 
-          region, bucket, key = parse_s3_url(url)
+        url = remove_presigned_params(url)
+
+        logger.info("BoxS3: Generating signed URL for #{method.upcase}")
+        logger.info("BoxS3: Discovered S3 URL: #{url}")
+
+        region, bucket, key = parse_s3_url(url)
+
+        profile = ENV['AWS_PROFILE']
 
-          logger.debug("BoxS3: Region: #{region}")
-          logger.debug("BoxS3: Bucket: #{bucket}")
-          logger.debug("BoxS3: Key: #{key}")
+        logger.debug("BoxS3: Region: #{region}")
+        logger.debug("BoxS3: Bucket: #{bucket}")
+        logger.debug("BoxS3: Key: #{key}")
+        logger.debug("BoxS3: Profile: #{profile}")
 
-          client = Aws::S3::Client.new(
-            profile: ENV['AWS_PROFILE'],
-            region: region
-          )
-          presigner = Aws::S3::Presigner.new(client: client)
+        client = Aws::S3::Client.new(
+          profile: profile,
+          region: region
+        )
+        presigner = Aws::S3::Presigner.new(client: client)
 
-          presigned_url = presigner.presigned_url(
-            method,
-            bucket: bucket,
-            key: key,
-            expires_in: 3600
-          ).to_s
+        presigned_url = presigner.presigned_url(
+          method,
+          bucket: bucket,
+          key: key,
+          expires_in: 3600
+        ).to_s
 
-          logger.debug("BoxS3: Pre-signed URL: #{presigned_url}")
+        logger.debug("BoxS3: Pre-signed URL: #{presigned_url}")
 
-          return presigned_url
+        return presigned_url
       end
 
     end

data/lib/vagrant-box-s3/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module BoxS3
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-box-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Steve Whiteley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -68,7 +68,9 @@ files:
 homepage: https://github.com/memiah/vagrant-box-s3
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/memiah/vagrant-box-s3
+  bug_tracker_uri: https://github.com/memiah/vagrant-box-s3/issues
 post_install_message:
 rdoc_options: []
 require_paths: