rock_fintech 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2eb674d07b211bc8b499ce2604c8f46b3b5a99
-  data.tar.gz: 9d2a4c654a7d920338c1134baaa42df71d9147e7
+  metadata.gz: 11ee283007f8bb9cec689fc9d8a03d9546a0261f
+  data.tar.gz: 85572febaf942ac11241c62348db66cdc59d3e4c
 SHA512:
-  metadata.gz: 6001ecd1d0b386e292e2454ffe27ddb88e1aca71e95226e18f1aa7e79f6d0ac6c607503149ba8512c04389142327431c49131da2d658eb71ef29bff1361f85a2
-  data.tar.gz: ad97c89fffce27be5ba7ec15d52bb3b5910d5b25cac72a3674f1a058839b465cbe9e413d129588028ead950b825ffe1f13fb81ed2f098ba7226f47f48f47d3fe
+  metadata.gz: c6535386a0ac3b7f9f9bfc305df13f4aa99d7488569e5a800077c7ca6f992d14443206a90cfd4e90fb8b5b6c3a8ec21cfc51f220911edb508137cebe2c2f41ea
+  data.tar.gz: 682dce780f210eec25838e1608b486fab1e1fe346f942150480ea1357892291c98535b6035103f3ee34cba390ecba55cceece6311832f1fc0c62e98419d72cab

data/lib/rock_fintech/client.rb

@@ -25,8 +25,8 @@ module RockFintech
       recursive_include_api('RockFintech::Form')
     end
 
-    def decode_notify_data(encryptkey, data)
-      # ::RockFintech::Http::Decode.decode_notify_data(encryptkey, data, @config)
+    def verify_data?(data)
+      Sign.verify(data, @config)
     end
 
     private

data/lib/rock_fintech/http/request.rb

@@ -29,7 +29,7 @@ module RockFintech
           encode: ENCODE,
           version: @version,
         }.merge(@params)
-        sign_str = sign(sign_body)
+        sign_str = Sign.sign(sign_body, @config)
 
         # 3. merge sign
         post_body = sign_body.merge({sign: sign_str})
@@ -47,57 +47,25 @@ module RockFintech
         http_response = RestClient.post(@uri, request_data, header)
         RockFintech.logger.info "#{identifier} 返回的报文为：\n#{http_response.body.force_encoding('utf-8')}\n"
 
-        res = decode_body(http_response.body)
+        # 6. decode http response
+        result_str = Encrypt::RSA.decrypt(http_response.body, @config[:private_key])
+        res = Utils.symbolize_keys(JSON.parse(result_str))
+
         RockFintech.logger.info "#{identifier} 返回的数据为：\n#{res}\n"
 
+        # 7. create response
         @response = RockFintech::Http::Response.new(service: @service,
                                                     flow_id: @params[:out_serial_no],
                                                     http_response: http_response,
                                                     raw_body: http_response.body,
                                                     data: res,
-                                                    data_valid: verify_sign(res))
+                                                    data_valid: Sign.verify(res, @config))
       end
 
       def identifier
         "[#{@service} - #{@params[:out_serial_no]}] "
       end
 
-      private
-
-      def sign(data)
-        serialize_str = serialize(data)
-        Sign::MD5.sign(serialize_str, Sign::MD5.sign(@config[:rft_key], @config[:rft_secret]))
-      end
-
-      def serialize(data)
-        data = Hash[data.sort] # key 按照 alphabet 排序
-
-        data.each{ |k, v|
-          if v.kind_of?(Hash)
-            data[k] = serialize(v)
-          elsif v.kind_of?(Array)
-            if v[0].kind_of?(Hash)
-              v.each_with_index{ |ele, index|
-                v[index] = sign(ele)
-              }
-            else
-              data[k] = v.join('&')
-            end
-          end
-        }
-
-        data.map{|k,v| "#{k}=#{v}"}.join('&')
-      end
-
-      def decode_body(body)
-        result_str = Encrypt::RSA.decrypt(body, @config[:private_key])
-        Utils.symbolize_keys(JSON.parse(result_str))
-      end
-
-      def verify_sign(body)
-        sign_str = body.delete(:sign)
-        sign(body) == sign_str
-      end
     end # end of class
   end
 end

data/lib/rock_fintech/http/response.rb

@@ -17,8 +17,8 @@ module RockFintech
         self.data = {} if self.data.nil? # 默认一定要有
 
         unless self.data_valid
-          self.data[:errorCode] = 'sign_valid_fail'
-          self.data[:errorMsg] = '数据签名错误'
+          self.data[:code] = 'sign_valid_fail'
+          self.data[:msg] = '数据签名错误'
         end
       end
 

data/lib/rock_fintech/sign/md5.rb

@@ -9,10 +9,6 @@ module RockFintech
         md5.hexdigest
       end
 
-      def self.verify?(content, key, sign_str)
-        sign(content, key) == sign_str
-      end
-
     end
   end
 end

data/lib/rock_fintech/sign/sign.rb

@@ -0,0 +1,38 @@
+# coding: utf-8
+module RockFintech
+  module Sign
+
+    def self.sign(data, config)
+      serialize_str = serialize(data)
+      Sign::MD5.sign(serialize_str, Sign::MD5.sign(config[:rft_key], config[:rft_secret]))
+    end # sign
+
+    def self.verify(data, config)
+      sign_str = data.delete(:sign)
+      self.sign(data, config) == sign_str
+    end # verify
+
+    private
+
+    def self.serialize(data)
+      data = Hash[data.sort]     # key 按照 alphabet 排序
+
+      data.each{ |k, v|
+        if v.kind_of?(Hash)      # 如果是 hash 接着 serialize
+          data[k] = serialize(v)
+        elsif v.kind_of?(Array)
+          if v[0].kind_of?(Hash) # 如果是 hash 数组对元素接着 serialize
+            v.each_with_index{ |ele, index|
+              v[index] = ele.to_json #serialize(ele)
+            }
+          else                   # 如果是普通元素数组
+            data[k] = v.join('&')
+          end
+        end
+      }
+
+      data.map{|k,v| "#{k}=#{v}"}.join('&')
+    end # serialize
+
+  end
+end

data/lib/rock_fintech/version.rb

@@ -1,3 +1,3 @@
 module RockFintech
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/rock_fintech.rb

@@ -15,6 +15,7 @@ require "rock_fintech/version"
 require "rock_fintech/utils"
 require "rock_fintech/extensions"
 require "rock_fintech/sign/md5"
+require "rock_fintech/sign/sign"
 require "rock_fintech/encrypt/rsa"
 require "rock_fintech/http/request"
 require "rock_fintech/http/response"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rock_fintech
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - chenpengyu
@@ -229,6 +229,7 @@ files:
 - lib/rock_fintech/http/response.rb
 - lib/rock_fintech/railtie.rb
 - lib/rock_fintech/sign/md5.rb
+- lib/rock_fintech/sign/sign.rb
 - lib/rock_fintech/utils.rb
 - lib/rock_fintech/version.rb
 - rock_fintech.gemspec