fog-aliyun 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8112e65fc18f3f89cf72ff352d04598767cd95e
-  data.tar.gz: b066bbda00dd2dca8ce98df46390a96d7cc84796
+SHA256:
+  metadata.gz: 3342904065d07911da7b06506be0f5d40755d48c07c6a37ebd2cc297dcc25955
+  data.tar.gz: 9e7de3b2b690382a19d8934bfb4d45393db51446fd7e9317c9499e4cfeb0ad6d
 SHA512:
-  metadata.gz: fe59bca5c4b8831600e06588444637efd12426a88535d742b140b44cdb05dde0049bf1af41cd06fd307137327c50c3d6ad2265cc7ba8e8d8c1ecbb6e6b5722b5
-  data.tar.gz: 96e3d984bba498615c0939a75182ff8d0d0f290642307e646bcb3c4d4c965f5c60483b01003d195ae8d6034027092192cfda40ef860777bdf1b17e4b77967e00
+  metadata.gz: 12161c7f4a12f82d37d495362ae4477e21535b87d40ab45519522816a99f89f51d5c4404c63ecc7d83128cf7dd80c550e435654ae75f3e6119fe0bf1a135f2c7
+  data.tar.gz: 6a4493f00253ed7ba9076fc66422ea70555cb416bda50e7895cada83739c12657219a2904f87482206624da729371e57dd5aeab34bbd7b544c7da3d0c7c0b985

data/lib/fog/aliyun/compute.rb

@@ -351,6 +351,20 @@ module Fog
           '?Format=JSON&AccessKeyId=' + @aliyun_accesskey_id + '&Action=' + action + '&SignatureMethod=HMAC-SHA1&RegionId=' + @aliyun_region_id + '&SignatureNonce=' + sigNonce + '&SignatureVersion=1.0&Version=2014-05-26&Timestamp=' + urlTimeFormat
         end
 
+        def defaultAliyunQueryParameters(action, sigNonce, time)
+          {
+            Format: 'JSON',
+            AccessKeyId: @aliyun_accesskey_id,
+            Action: action,
+            SignatureMethod: 'HMAC-SHA1',
+            RegionId: @aliyun_region_id,
+            SignatureNonce: sigNonce,
+            SignatureVersion: '1.0',
+            Version: '2014-05-26',
+            Timestamp: time.strftime('%Y-%m-%dT%H:%M:%SZ')
+          }
+        end
+
         def defaultAliyunVPCUri(action, sigNonce, time)
           parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
           urlTimeFormat = URI.encode(parTimeFormat, ':')
@@ -399,7 +413,14 @@ module Fog
         end
 
         # compute signature
+        # This method should be considered deprecated and replaced with sign_without_encoding, which is better for using querystring hashes and not 
+        # building querystrings with string concatination.
         def sign(accessKeySecret, parameters)
+          signature = sign_without_encoding(accessKeySecret, parameters)
+          URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
+        end
+
+        def sign_without_encoding(accessKeySecret, parameters)
           sortedParameters = parameters.sort
           canonicalizedQueryString = ''
           sortedParameters.each do |k, v|
@@ -414,9 +435,7 @@ module Fog
           digest = OpenSSL::HMAC.digest(digVer, key, stringToSign)
           signature = Base64.encode64(digest)
           signature[-1] = ''
-          encodedSig = URI.encode(signature, '/[^!*\'()\;?:@#&%=+$,{}[]<>`" ')
-
-          encodedSig
+          signature
         end
       end
     end

data/lib/fog/aliyun/models/compute/image.rb

@@ -29,7 +29,9 @@ module Fog
         attribute :snapshot_id, aliases: 'SnapshotId'
 
         def initialize(attributes)
-          self.snapshot_id = attributes['DiskDeviceMappings']['DiskDeviceMapping'][0]['SnapshotId']
+          unless attributes['DiskDeviceMappings']['DiskDeviceMapping'].empty?
+            self.snapshot_id = attributes['DiskDeviceMappings']['DiskDeviceMapping'][0]['SnapshotId']
+          end
           super
         end
 

data/lib/fog/aliyun/models/compute/server.rb

@@ -36,7 +36,7 @@ module Fog
         attribute :expired_at, aliases: 'ExpiredTime'
 
         def image
-          requires image_id
+          requires :image_id
           Fog::Compute::Aliyun::Image.new(service: service).all(imageId: image_id)[0]
         end
 

data/lib/fog/aliyun/models/compute/servers.rb

@@ -10,7 +10,8 @@ module Fog
         model Fog::Compute::Aliyun::Server
 
         def all(options = {})
-          Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
+          data = Fog::JSON.decode(service.list_servers(options).body)['Instances']['Instance']
+          load(data)
         end
 
         # Creates a new server and populates ssh keys

data/lib/fog/aliyun/models/storage/files.rb

@@ -156,6 +156,7 @@ module Fog
                      directory.key + '/' + key
                    end
           data = service.head_object(object).data
+          return nil if data[:status] == 404
           lastModified = data[:headers]['Last-Modified']
           last_modified = (Time.parse(lastModified).localtime if !lastModified.nil? && lastModified != '')
 

data/lib/fog/aliyun/requests/compute/list_server_types.rb

@@ -41,7 +41,7 @@ module Fog
           )
 
           _InstanceTypeId = nil
-          _InstanceTypeList = Fog::JSON.decode(response.body)['InstanceTypes']['InstanceType']
+          _InstanceTypeList = response.body['InstanceTypes']['InstanceType']
           _InstanceTypeList.each do |instance_type|
             next unless (instance_type['CpuCoreCount'] == cpuCount) && (instance_type['MemorySize'] == memorySize)
             _InstanceTypeId = instance_type['InstanceTypeId']

data/lib/fog/aliyun/requests/compute/list_servers.rb

@@ -11,7 +11,7 @@ module Fog
           _time = Time.new.utc
 
           _parameters = defalutParameters(_action, _sigNonce, _time)
-          _pathURL = defaultAliyunUri(_action, _sigNonce, _time)
+          _query_parameters = defaultAliyunQueryParameters(_action, _sigNonce, _time)
 
           _InstanceId = options[:instanceId]
           _VpcId = options[:vpcId]
@@ -22,35 +22,35 @@ module Fog
           unless _InstanceId.nil?
             _InstanceStr = "[\"#{_InstanceId}\"]"
             _parameters['InstanceIds'] = _InstanceStr
-            _pathURL += '&InstanceIds=' + _InstanceStr
+            _query_parameters[:InstanceIds] = _InstanceStr
           end
 
           unless _VpcId.nil?
             _parameters['VpcId'] = _VpcId
-            _pathURL += '&VpcId=' + _VpcId
+            _query_parameters[:VpcId] = _VpcId
           end
 
           unless _SecurityGroupId.nil?
             _parameters['SecurityGroupId'] = _SecurityGroupId
-            _pathURL += '&SecurityGroupId=' + _SecurityGroupId
+            _query_parameters[:SecurityGroupId] = _SecurityGroupId
           end
 
           unless _PageNumber.nil?
             _parameters['PageNumber'] = _PageNumber
-            _pathURL += '&PageNumber=' + _PageNumber
+            _query_parameters[:PageNumber] = _PageNumber
           end
 
           _PageSize ||= '50'
           _parameters['PageSize'] = _PageSize
-          _pathURL += '&PageSize=' + _PageSize
+          _query_parameters[:PageSize] = _PageSize
 
-          _signature = sign(@aliyun_accesskey_secret, _parameters)
-          _pathURL += '&Signature=' + _signature
+          _signature = sign_without_encoding(@aliyun_accesskey_secret, _parameters)
+          _query_parameters[:Signature] = _signature
 
           request(
             expects: [200, 203],
             method: 'GET',
-            path: _pathURL
+            query: _query_parameters
           )
         end
       end

data/lib/fog/aliyun/requests/storage/get_object_http_url.rb

@@ -22,7 +22,7 @@ module Fog
           location = get_bucket_location(bucket)
 
           if acl == 'private'
-            expires_time = (Time.now.to_i + expires).to_s
+            expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
             'http://' + bucket + '.' + location + '.aliyuncs.com/' + object +

data/lib/fog/aliyun/requests/storage/get_object_https_url.rb

@@ -22,7 +22,7 @@ module Fog
           location = get_bucket_location(bucket)
 
           if acl == 'private'
-            expires_time = (Time.now.to_i + expires).to_s
+            expires_time = (Time.now.to_i + (expires.nil? ? 0 : expires.to_i)).to_s
             resource = bucket + '/' + object
             signature = sign('GET', expires_time, nil, resource)
             'https://' + bucket + '.' + location + '.aliyuncs.com/' + object +

data/lib/fog/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Fog
   module Aliyun
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,159 +1,159 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support
@@ -164,13 +164,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -294,17 +294,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Fog provider for Aliyun Web Services.