gitlab-fog-azure-rm 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a0941da3e69509575eca6b720890940f33e8617e32bbb37121e19c9e1087e33
-  data.tar.gz: '09b4913d90bcbba439e9501df86dcc5e4d3d012a57941e2bc7033e4ac7d97806'
+  metadata.gz: ff14f21c88b74f1fcebcd7b5b755fcfb0ce5e38878ea4bdc8742f3bd0bf9cfb6
+  data.tar.gz: 0e98eeae909840a4bb1370ac392a171f3d017832c623efb7c3e2ba345b0715ef
 SHA512:
-  metadata.gz: 6df48a1e91089a7c7af40addf64716b712daee65ea431edc4cffc98f1912c85538c5547eddced2bf512bdee1fbcca1cdd43eb2eb76022055a837f07bdad54d8c
-  data.tar.gz: b4696c93d25c11b5344410a09cd8142eae252350030000c3f6d041b85f69273f2196fa1715e1428ce9105471d150f1d3b036834140813d148b5ff54883481c24
+  metadata.gz: 6efb40c94a812fb275c8175972b8b41091c090bf05fbedd9cd57de61fd0baa2f98069006f8053af33a28b620a9cd1f2eb1de8fe3c8c02c1afd9a14c2f226886b
+  data.tar.gz: ed51ec358917aaca4e042e7cf298b5b45e9898829edd250067e71e4d2a6f55154d1a54f4ade1c152a50ec718a2b4899f5f00d65a5ad95c74e772e4d922d0ff43

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## 1.1.1
+
+- Remove trailing periods per path segment when retrieving blob URLs !23
+
+## 1.1.0
+
+- Yanked
+
 ## 1.0.1
 
 - Fix URL generation for files with UTF-8 characters !21

data/lib/fog/azurerm/requests/storage/get_blob_http_url.rb

@@ -15,6 +15,7 @@ module Fog
         #
         def get_blob_http_url(container_name, blob_name, expires)
           relative_path = "#{container_name}/#{blob_name}"
+          relative_path = remove_trailing_periods_from_path_segments(relative_path)
           params = {
             service: 'b',
             resource: 'b',

data/lib/fog/azurerm/requests/storage/get_blob_https_url.rb

@@ -15,6 +15,7 @@ module Fog
         #
         def get_blob_https_url(container_name, blob_name, expires)
           relative_path = "#{container_name}/#{blob_name}"
+          relative_path = remove_trailing_periods_from_path_segments(relative_path)
           params = {
             service: 'b',
             resource: 'b',

data/lib/fog/azurerm/utilities/general.rb

@@ -189,3 +189,7 @@ end
 def get_subscription_id(id)
   id.split('/')[2]
 end
+
+def remove_trailing_periods_from_path_segments(path)
+  path.split('/').map { |segment| segment.gsub(/\.*$/, '') }.join('/')
+end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/test/requests/storage/test_get_blob_http_url.rb

@@ -24,6 +24,22 @@ class TestGetBlobHttpUrl < Minitest::Test
     end
   end
 
+  def test_get_url_remove_trailing_periods_from_path_segments
+    mock_generate_uri = Minitest::Mock.new
+    mock_generate_service_token = Minitest::Mock.new
+
+    mock_generate_uri.expect(:call, @url, ['.test0/..test1/...test2', {}, { encode: true }])
+    mock_generate_service_token.expect(:call, @token) do |relative_path, _|
+      relative_path == '.test0/..test1/...test2'
+    end
+
+    @blob_client.stub :generate_uri, mock_generate_uri do
+      @signature_client.stub :generate_service_sas_token, mock_generate_service_token do
+        assert_equal "#{@url}?#{@token}", @service.get_blob_http_url('.test0.', '..test1../...test2...', Time.now.utc + 3600)
+      end
+    end
+  end
+
   def test_get_blob_http_url_mock
     assert_equal "#{@url}?#{@token}", @mock_service.get_blob_http_url('test_container', 'test_blob', Time.now.utc + 3600)
   end

data/test/requests/storage/test_get_blob_https_url.rb

@@ -31,6 +31,25 @@ class TestGetBlobHttpsUrl < Minitest::Test
     end
   end
 
+  def test_get_url_remove_trailing_periods_from_path_segments
+    mock_generate_uri = Minitest::Mock.new
+    mock_generate_service_token = Minitest::Mock.new
+
+    2.times do
+      mock_generate_uri.expect(:call, @url, ['.test0/..test1/...test2', {}, { encode: true }])
+      mock_generate_service_token.expect(:call, @token) do |relative_path, _|
+        relative_path == '.test0/..test1/...test2'
+      end
+    end
+
+    @blob_client.stub :generate_uri, mock_generate_uri do
+      @signature_client.stub :generate_service_sas_token, mock_generate_service_token do
+        assert_equal "#{@url}?#{@token}", @service.get_blob_https_url('.test0.', '..test1../...test2...', Time.now.utc + 3600)
+        assert_equal "#{@url}?#{@token}", @service.get_object_url('.test0.', '..test1../...test2...', Time.now.utc + 3600)
+      end
+    end
+  end
+
   def test_get_blob_https_url_with_domain_success
     service = Fog::Storage::AzureRM.new(storage_account_credentials_with_domain)
     blob_client = service.instance_variable_get(:@blob_client)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter