zhima 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae4098fe5acc3b45025e6cd8603676362d4c7c3
-  data.tar.gz: b64c2616fa053692d59d8e86a30c3d256e2167e4
+  metadata.gz: 43037687ae73f8b71a5753c0996ea7bfa0cce3d0
+  data.tar.gz: 1286fc66a6246181c7ac8b0527ef8e78107bef9a
 SHA512:
-  metadata.gz: 7c0ed4896d352c4302ca8dbcf640f8fedbf4c2e4123c67d600eaa952cd292196917b1108554ae0d9da5f70141d58fde4084b3da53d758aa8ceabc43f11784f52
-  data.tar.gz: 2602e39b06060ba1d44970b8d9e50ebde5aa63b8e929f542045779ad4acef5e1a6bb7eb8c6c538479ae7ebb17672ec5ffd3c506032de6f97d1db62e72739fdf2
+  metadata.gz: 8c6fff8c94c128deef4616452768df00695351251daf63619841f1d7077c100e8a9670d2ce785c5eafe1b718643f83c1f7c2389edb91c1c6c665f0bc829b62cb
+  data.tar.gz: f555b189fc5da2a159de5c6bf09f3b54907b6ac3c62876c8cc5c6c6a5b3bca3b1c1407a8604585dd59fd523b2a20fa331770535ff5800e0380faeea145a3b5a8

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
+--require spec_helper
 --color

data/README.md

@@ -25,22 +25,39 @@ Or install it yourself as:
 ```ruby
 Zhima.configure do |config|
   config.app_id = 'xxxxxxx' # 应用id
-  config.private_key = private_key # 自己的私钥
-  config.public_key = public_key # 芝麻给的公钥
+  config.private_key = File.read('private_key.pkcs8') # 自己的私钥
+  config.public_key = File.read('public_key.pkcs8') # 芝麻给的公钥
 end
 ```
 
 芝麻信用分，调用方法如下(请自行查阅芝麻文档的业务参数组织params)：
 ```ruby
 # 认证url  业务参数请参考 https://b.zmxy.com.cn/technology/openDoc.htm?id=67
-Zhima::Score.auth_url(params)  # 第二个参数可hash传入芝麻需要的系统参数，不传亦可（下同，省略）
+params = {
+  identity_type: '2', 
+  identity_param: {certNo: 'idcard_no', name: 'name', certType: 'IDENTITY_CARD'}, 
+  biz_params: {auth_code: 'M_H5', channelType: 'app', state: '100111211'}
+}
+system_options = {charset: 'UTF-8', version: '1.0', channel: 'app'} # 可省略，默认为这些参数
+Zhima::Score.auth_url(params, system_options)  # 第二个参数system_options传入芝麻需要的系统参数，不传亦可（下同，省略）
 
 # 获取芝麻分
 # https://b.zmxy.com.cn/technology/openDoc.htm?relInfo=zhima.credit.score.get@1.0@1.4&relType=API_DOC&type=API_INFO_DOC&LEFT_MENU_MODEnull#Seq_1
+params = {
+  transaction_id: 'transaction_id', 
+  product_code: 'w1010100100000000001',
+  open_id: 'open_id'
+}
 Zhima::Score.get(params)
 
 # auth_query
 # https://b.zmxy.com.cn/technology/openDoc.htm?id=453
+params = {
+  identity_type: '2', 
+  identity_param: {
+    certNo: 'id_card_no', name: 'name', certType: 'IDENTITY_CARD'
+  }
+}
 Zhima::Score.auth_query(params)
 
 # 芝麻callback url中的params参数解密
@@ -50,7 +67,23 @@ Zhima::Score.param_decrypt(params_str)
 反欺诈信息验证：
 ```ruby
 # 参数 https://b.zmxy.com.cn/technology/openDoc.htm?relInfo=zhima.credit.ivs.detail.get@1.0@1.2&relType=API_DOC&type=API_INFO_DOC&LEFT_MENU_MODEnull
+params = {
+  product_code: 'w1010100000000000103',
+  transaction_id: 'transaction_id',
+  cert_no: '身份证',
+  cert_type: '100',
+  name: 'name',
+  mobile: '18888888888'
+}
 Zhima::Ivs.get(params)
+
+行业关注名单2.0
+params = {
+  product_code: 'w1010100100000000022',
+  transaction_id: 'transaction_id',
+  open_id: '268800000000000000000000'
+}
+Zhima::WatchList.get(params)
 ```
 
 ## Development

data/lib/zhima/param.rb

@@ -1,26 +1,23 @@
 module Zhima
   # 业务参数params加解密
   class Param
-    # {identity_type: 2, identity_param: URI.encode({certNo: '410526198605109070', name: '王智超', certType: 'IDENTITY_CARD'}.to_json), biz_params: URI.encode({auth_code: 'M_APPPC_CERT', channelType: 'apppc'}.to_json)}
+    # {identity_type: 2, identity_param: URI.encode({certNo: 'xxx', name: 'xxx', certType: 'IDENTITY_CARD'}.to_json), biz_params: URI.encode({auth_code: 'M_APPPC_CERT', channelType: 'apppc'}.to_json)}
     # 返回两个参数：加密后的params，及sign
-    # .slice(:identity_type, :identity_param, :biz_params)
     def self.encrypt(params)
       params = Util.symbolize_hash_keys(params)
       params.each { |key, value| params[key] = value.to_json if value.is_a? Hash }
       param_str = Util.to_query(params)
-      encrypted_str = param_str.split('').each_slice(117).inject('') do |str, bytes|
-        str += encrypt_str(bytes.join())
-        str
-      end
-
       [
-        Util.base64_encode(encrypted_str), 
+        Util.base64_encode(rsa_encrypt(param_str)), 
         Util.base64_encode(Sign.sign(param_str))
       ]
     end
 
-    def self.encrypt_str(str)
-      Config.zm_rsa.public_encrypt str
+    def self.rsa_encrypt(str)
+      str.split('').each_slice(117).inject('') do |s, bytes|
+        s += Config.zm_rsa.public_encrypt(bytes.join())
+        s
+      end
     end
 
     def self.decrypt(param_str)

data/lib/zhima/request.rb

@@ -25,12 +25,17 @@ module Zhima
 
     private
     # 芝麻返回的json数据解析，结果为真正的业务参数
-    # TODO verify sign
     def parse_response(response_str)
       response_hash = JSON.parse(response_str)
-      biz_response = response_hash["biz_response"]
+      biz_response_sign = response_hash['biz_response_sign']
+      biz_response = response_hash['biz_response']
       biz_response = Param.decrypt(biz_response) if response_hash["encrypted"]
-      JSON.parse(biz_response)
+
+      if response_hash["encrypted"] && !Sign.verify?(biz_response_sign, biz_response)
+        {error: true, error_msg: 'sign解签错误'}
+      else
+        JSON.parse(biz_response)
+      end
     end
   end
 end

data/lib/zhima/sign.rb

@@ -6,8 +6,9 @@ module Zhima
       Config.mech_rsa.sign(SIGN_METHOD, str)
     end
 
-    # TODO
-    def self.verify()
+    def self.verify?(sign, str)
+      decode64_sign = Base64.strict_decode64(sign.to_s)
+      Config.zm_rsa.verify(SIGN_METHOD, decode64_sign, str.force_encoding("utf-8"))
     end
   end
 end

data/lib/zhima/version.rb

@@ -1,3 +1,3 @@
 module Zhima
-  VERSION = "0.3.0"
+  VERSION = "0.3.3"
 end

data/lib/zhima/watch_list.rb

@@ -0,0 +1,11 @@
+module Zhima
+  # 行业关注名单2.0版
+  class WatchList
+    METHOD = 'zhima.credit.watchlistii.get'
+
+    # https://b.zmxy.com.cn/technology/openDoc.htm?relInfo=zhima.credit.watchlistii.get@1.0@1.0&relType=API_DOC&LEFT_MENU_MODE=null
+    def self.get(params, sys_options = {})
+      Request.new(params, sys_options.merge(method: METHOD)).execute
+    end
+  end
+end

data/lib/zhima.rb

@@ -14,6 +14,7 @@ end
 require_relative "zhima/config"
 require_relative "zhima/score"
 require_relative "zhima/ivs"
+require_relative "zhima/watch_list"
 require_relative "zhima/request"
 require_relative "zhima/param"
 require_relative "zhima/sign"

data/zhima.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["zhchsf@gmail.com"]
 
   spec.summary       = %q{芝麻信用}
-  spec.description   = %q{芝麻信用}
+  spec.description   = %q{芝麻信用 非官方ruby sdk}
   spec.homepage      = "https://github.com/zhchsf/zhima"
   spec.license       = "MIT"
 
@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "webmock", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zhima
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - sam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -66,7 +66,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: "芝麻信用"
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+description: "芝麻信用 非官方ruby sdk"
 email:
 - zhchsf@gmail.com
 executables: []
@@ -92,6 +106,7 @@ files:
 - lib/zhima/sign.rb
 - lib/zhima/util.rb
 - lib/zhima/version.rb
+- lib/zhima/watch_list.rb
 - zhima.gemspec
 homepage: https://github.com/zhchsf/zhima
 licenses: