fadada 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02debfe884b15344e0ad8038653660112430aa53fd0c99668bd3966841d3ac7a
-  data.tar.gz: 20e4f68966bdda8685448ea2916669c3967865820853cf5f8f8d0d7573705692
+  metadata.gz: 30a63692b47313b4aa60e29f7c426a45f9291e135fa32253da2ba5eff2e6e1e1
+  data.tar.gz: 73b3f16beaf6288da06696d12059dd6b43f1e84aac1ab6926f1578393ca92a35
 SHA512:
-  metadata.gz: 10203be71eec6e17d9c5df6bb9846d0db17d60a870263348912ca4ef7366b27a4e0811fa838aa400b402884fba9531853a886ccd4a516a2e5d8f0b5a8c603e84
-  data.tar.gz: 8e1e67dc0724f4f981f6e645c2c8dccf754d63c71e4e0a7b5a9f33caf436166c1e05734374a1e05eb789a6c6d967a7ee3e1a8dde47b835111f12165088bdea93
+  metadata.gz: b9f8fe4d6885ff2a004e2a8ae370fc36353c850540dd8d05a651945e04ba9a01fdca70ffcafa97ab0f92902bac51775b855f6d597ba284ba47bf09b45901c025
+  data.tar.gz: 2d89c51ce12a31869a846146918785406dec6e02ce82d53d73c65a68ac7ab262d0a61c9a170952fe45fafceb06a00efad4d10a5bb833aa0f6c9e39996509b01f

data/lib/fadada.rb

@@ -1,5 +1,6 @@
 require "fadada/version"
 require "fadada/configuration"
+require "fadada/digest"
 require "fadada/http_client"
 
 # resources

data/lib/fadada/digest.rb

@@ -0,0 +1,40 @@
+# 法大大摘要相关
+module Fadada
+  class Digest
+    # 生成摘要
+    # Base64(SHA1(app_id + MD5(timestamp + 参数集合1) + SHA1(app_secret + 参数集合) + 参数集合2 ))
+    # 示例：
+    # options = {
+    #   _params: { a: 1, b: 2 },
+    #   _md5_params: { a: 1, b: 2 },
+    #   _extend_params: { a: 1, b: 2 }
+    # }
+    #
+    def self.generate(timestamp, options = {})
+      _biz_data = Fadada::config.app_secret + params_transform(options[:_params])
+      _sha1_biz_data = ::Digest::SHA1.hexdigest(_biz_data).upcase
+      _md5 = ::Digest::MD5.hexdigest(params_transform(options[:_md5_params]) + timestamp).upcase
+      _extend = params_transform(options[:_extend_params])
+      _data = ::Digest::SHA1.hexdigest(::Fadada::config.app_id + _md5 + _sha1_biz_data + _extend).upcase
+      Base64.strict_encode64(_data)
+    end
+
+
+    # 验证摘要
+    def self.verify?(params = {})
+      options = params.transform_keys(&:to_sym)
+      _timestamp = options[:timestamp]
+      digest_params = { _params: { transaction_id: options[:transaction_id] } }
+      options[:msg_digest].to_s == generate(_timestamp, digest_params)
+    end
+
+    private
+
+    # 处理参数
+    # 需要排序后使用
+    def self.params_transform(options)
+      _options = options || {}
+      _options.delete_if { |key, value| value.blank? }.sort.map { |k,v| v }.join
+    end
+  end
+end

data/lib/fadada/http_client.rb

@@ -33,12 +33,6 @@ module Fadada
         Fadada::config.server + action
       end
 
-      # 处理参数
-      def params_transform(options)
-        _options = options || {}
-        _options.delete_if { |key, value| value.blank? }.sort.map { |k,v| v }.join
-      end
-
       def form_header
         { 'Content-Type' => 'application/x-www-form-urlencoded;charset=utf8' }
       end
@@ -50,30 +44,10 @@ module Fadada
           app_id: Fadada::config.app_id,
           timestamp: _timestamp,
           v: '2.0',
-          msg_digest: digest(_timestamp, options)
+          msg_digest: Fadada::Digest.generate(_timestamp, options)
         }
       end
 
-      # 摘要计算
-      # Base64(SHA1(app_id + MD5(timestamp + 参数集合1) + SHA1(app_secret + 参数集合) + 参数集合2 ))
-      # 示例：
-      # options = {
-      #   _params: { a: 1, b: 2 },
-      #   _md5_params: { a: 1, b: 2 },
-      #   _extend_params: { a: 1, b: 2 }
-      # }
-      #
-      # params 需要排序后使用
-      #
-      def digest(timestamp, options = {})
-        _biz_data = Fadada::config.app_secret + params_transform(options[:_params])
-        _sha1_biz_data = Digest::SHA1.hexdigest(_biz_data).upcase
-        _md5 = Digest::MD5.hexdigest(params_transform(options[:_md5_params]) + timestamp).upcase
-        _extend = params_transform(options[:_extend_params])
-        _data = Digest::SHA1.hexdigest(::Fadada::config.app_id + _md5 + _sha1_biz_data + _extend).upcase
-        Base64.strict_encode64(_data)
-      end
-
       # 处理异常
       def hander_exception(response)
         code = response['code'].to_s

data/lib/fadada/version.rb

@@ -1,3 +1,3 @@
 module Fadada
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fadada
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - wangrui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,7 @@ files:
 - lib/fadada/certificate.rb
 - lib/fadada/configuration.rb
 - lib/fadada/contract.rb
+- lib/fadada/digest.rb
 - lib/fadada/http_client.rb
 - lib/fadada/signature.rb
 - lib/fadada/version.rb