activestorage-aliyun 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfac27721ec3ce8613444b343030117a4ddf6d28
-  data.tar.gz: 7ed58307e3dec06209a29436127d5f4f188dae0f
+  metadata.gz: 796ec942f06897cf76873d1b6dadeb23a565345f
+  data.tar.gz: fd06616edba762ac6ccf4e352cbec7a17fc220dd
 SHA512:
-  metadata.gz: 7dfb3e7aa65baa48d1040fcb8b11f867b1fab78a0eedb21b7ce1ca7ab37d05b0e56521c61fc5ca195f2f72adeaf6ed66b346bcca0349e9b9bf7ec1a2c7c27f46
-  data.tar.gz: dcf684e6ff9ffce4ef3e75ec5f7db26513cad9cf8ce45de3a68a501fd048a95365ab396185d6e6d28868d7e53f66e0f904d3676e10e69e969d4d68baf5b1e617
+  metadata.gz: 91698652328b356a3df0c7fbd1fa45a4f5e7185df39d097d19402fdf77e3eaad9190af997c4b21ed89dac385e87c9cebf27ef6303ca222a912291c8feec77f1b
+  data.tar.gz: d935a34961783cd60f41055480557a14017a01b3db3b60194c39a2801f8907c38ed403cb578b6244803070e30f1c037cbbc85d8330421ea61bff2e40049aff69

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0
+
+- Add `mode` config for setup OSS ACL, `mode: "private"` will always output URL that have signature info.
+- Support `disposition: :attachment` option for `service_url` method for download original filename.
+
 ## 0.2.0
 
 - Add url_for_direct_upload support.

data/README.md

@@ -33,13 +33,29 @@ production:
   endpoint: "https://oss-cn-beijing.aliyuncs.com"
   # path prefix, default: /
   path: "my-app-files"
+  # Bucket mode: [public, private], default: public
+  mode: "public"
 ```
 
-Use image:
+### Use for image url
 
 ```erb
-- Orignial File URL: <%= image_tag @photo.image.service_url %>
-- Thumb with OSS image service: <%= image_tag @photo.image.service_url(filename: 'x-oss-process=image/resize,h_100,w_100') %>
+Orignial File URL:
+
+<%= image_tag @photo.image.service_url %>
+
+Thumb with OSS image service:
+
+<%= image_tag @photo.image.service_url(filename: 'x-oss-process=image/resize,h_100,w_100') %>
+```
+
+### Use for file download
+
+If you want to get original filename (Include Chinese and other UTF-8 chars), for example: `演示文件 download.zip`, you need present `disposition: :attachment` option.
+
+```erb
+#
+<%= image_tag @photo.image.service_url(disposition: :attachment) %>
 ```
 
 ## Contributing

data/lib/active_storage/service/aliyun_service.rb

@@ -54,14 +54,21 @@ module ActiveStorage
 
     def url(key, expires_in:, filename:, content_type:, disposition:)
       instrument :url, key: key do |payload|
-        generated_url = bucket.object_url(path_for(key), false, expires_in)
-        generated_url.gsub('http://', 'https://')
-        if filename.to_s.include?("x-oss-process")
-          generated_url = [generated_url, filename].join("?")
+        sign    = private_mode? || disposition == :attachment
+        filekey = path_for(key)
+        params  = {}
+
+        if disposition == :attachment
+          params["response-content-type"] = content_type if content_type
+          params["response-content-disposition"] = "attachment;filename*=UTF-8''#{CGI.escape(filename.to_s)}"
+        else
+          if filename.to_s.include?("x-oss-process")
+            params["x-oss-process"] = filename.to_s.split("=").last
+          end
         end
 
+        generated_url = object_url(filekey, sign: sign, expires_in: expires_in, params: params)
         payload[:url] = generated_url
-
         generated_url
       end
     end
@@ -97,21 +104,51 @@ module ActiveStorage
       attr_reader :config
 
       def path_for(key)
-        return key if !config.fetch(:path, nil)
+        return key unless config.fetch(:path, nil)
         File.join(config.fetch(:path), key)
       end
 
+      def object_url(key, sign:, expires_in: 60, params: {})
+        url = bucket.object_url(key, false)
+        unless sign
+          return url if params.blank?
+          return url + "?" + params.to_query
+        end
+
+        resource = "/#{bucket.name}/#{key}"
+        expires  = Time.now.to_i + expires_in
+        query    = {
+          "Expires" => expires,
+          "OSSAccessKeyId" => config.fetch(:access_key_id)
+        }
+        query.merge!(params)
+
+        if params.present?
+          resource += "?" + params.map { |k, v| "#{k}=#{v}" }.sort.join("&")
+        end
+
+        string_to_sign = ["GET", "", "", expires, resource].join("\n")
+        query["Signature"] = bucket.sign(string_to_sign)
+
+        [url, query.to_query].join('?')
+      end
+
       def bucket
         return @bucket if defined? @bucket
         @bucket = client.get_bucket(config.fetch(:bucket))
         @bucket
       end
 
+      # Bucket mode :public | :private
+      def private_mode?
+        @private_mode ||= config.fetch(:mode, "public").to_s == "private"
+      end
+
       def authorization(key, content_type, checksum, date)
         filename = File.expand_path("/#{bucket.name}/#{path_for(key)}")
-        addition_headers = "x-oss-date:"+date
+        addition_headers = "x-oss-date:#{date}"
         sign = ["PUT", checksum, content_type, date, addition_headers, filename].join("\n")
-        signature = Base64.strict_encode64(OpenSSL::HMAC.digest('sha1', config.fetch(:access_key_secret), sign))
+        signature = bucket.sign(sign)
         "OSS " + config.fetch(:access_key_id) + ":" + signature
       end
 

data/lib/active_storage_aliyun/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageAliyun
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Lee