tonglian-ruby-sdk 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49ce7186f7a279006ad84373d7953bd427a5a6ee02d75a89f3badba8d270adc8
-  data.tar.gz: cac13ca36e52d2c23f4d6dd3fa335a4fa4b42291e5144884041b9ca2ee66b6a4
+  metadata.gz: 7f4d54ded35c1a345b7c1523f59e561e70d08d6bad618e2c83a14d33ab532065
+  data.tar.gz: d37d2482450c7a156674fe5ec2b71e5b69eb415ee949aaea55392068113357c1
 SHA512:
-  metadata.gz: 57319941384bfb56c30c4a439b00970dc17120dc6c4c7f4538006d5051bf42901ccab770284179afeffd9ca403917a9102e87a490599e7e691d0a7be663e1a09
-  data.tar.gz: d68bc1ace21cae2b279eee74776be06ab01214862872c81379c06a2ba2762b953625ac24805d5202205d1857be63b14fe9ab15cfa9524714afa2a4f23e62787b
+  metadata.gz: 8d3afc6f5ad630dae3dfca5346a196493c7ef3ed217a862dc2946e766515434e8bef43bc22d4b21339d57f9df122f2e939f50af5ca4167e2ee0fbabe5f584557
+  data.tar.gz: f82d4d303edf28781dfa7f86bc0df7ead862f6dcb14dda96bfa00e775128f8088346ff8be1aa14a364e0c84dbded75be3eaf6ac60ea4acd91c9bd9673db803c7

data/lib/tonglian-ruby-sdk.rb

@@ -5,8 +5,57 @@ require 'openssl'
 require 'cgi'
 require 'digest'
 require 'base64'
+require 'net/http'
+require 'active_support/all'
 
 module TonglianRubySdk
+  # Client class to handle request and responses to and from Tonglian gateway
+  class Client
+    REQUEST_STUB = {
+      'charset'  => 'utf-8',
+      'format'   => 'JSON',
+      'signType' => 'SHA256WithRSA',
+      'version'  => '1.0'
+    }.freeze
+
+    def initialize(api_end_point, app_id, private_path, private_passwd, public_path)
+      @api_end_point = api_end_point
+      @app_id = app_id
+      @signer = Signer.new(private_path, private_passwd, public_path)
+    end
+
+    def request(method, params)
+      data = REQUEST_STUB.dup
+      data['appId']      = @app_id
+      data['method']     = method
+      data['timestamp']  = timestamp
+      data['bizContent'] = params.to_json
+      data['sign']       = @signer.sign(data)
+
+      url = URI(@api_end_point)
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true if @api_end_point.downcase.starts_with?('https') # Enable SSL for HTTPS
+
+      request = Net::HTTP::Post.new(url.request_uri)
+      request['Content-Type'] = 'application/x-www-form-urlencoded'
+      request.body = URI.encode_www_form(data)
+      response = http.request(request)
+
+      object = JSON.parse(response.body)
+      @signer.verify?(object) || raise('Invalid response signature!')
+      { 'code' => response.code, 'data' => object }
+    end
+
+    private
+
+    def timestamp
+      timezone = ActiveSupport::TimeZone.new('Asia/Shanghai')
+      current_time = Time.now.in_time_zone(timezone)
+      current_time.strftime('%Y-%m-%d %H:%M:%S')
+    end
+  end
+
+  # To sign client request message and verify tonglian's response message
   class Signer
     def initialize(private_path, private_passwd, public_path)
       @private_path = private_path
@@ -15,34 +64,72 @@ module TonglianRubySdk
     end
 
     def sign(params)
-      str = make_sign_message(params)
-      private_file = File.open(@private_path)
-      private_key = OpenSSL::PKCS12.new(private_file, @private_passwd).key.export
+      message = make_sign_message(params)
       rsa = OpenSSL::PKey::RSA.new private_key
-      Base64.encode64(rsa.sign('sha1', str.force_encoding('UTF-8')))
+      Base64.strict_encode64(rsa.sign(OpenSSL::Digest.new('SHA256'), message))
     end
 
     def verify?(params, signature = nil)
       signature = params['sign'] if signature.nil? || signature.to_s.empty?
-      str = make_sign_message(params)
+      params.delete('sign')
+      message = make_verify_message(params)
+
       public_file = File.open(@public_path)
       public_key = OpenSSL::X509::Certificate.new(public_file).public_key.export
       rsa = OpenSSL::PKey::RSA.new(public_key)
-      rsa.verify('sha1', Base64.decode64(signature), str)
+      rsa.verify(OpenSSL::Digest.new('SHA256'), Base64.decode64(signature), message)
     end
 
     private
 
+    def private_key
+      return @private_key if @private_key
+
+      private_file = File.open(@private_path)
+      @private_key = OpenSSL::PKCS12.new(private_file, @private_passwd).key.export
+    end
+
+    def public_key
+      return @public_key if @public_key
+
+      public_file = File.open(@public_path)
+      @public_key = OpenSSL::X509::Certificate.new(public_file).public_key.export
+    end
+
     def make_sign_message(params)
       sorted_params = []
       params.keys.sort.map do |k|
         next if %w[sign signType].include? k
         next if params[k].nil? || params[k].to_s.empty?
 
-        sorted_params.push("#{k}=#{CGI.escape(params[k])}")
+        sorted_params.push("#{k}=#{params[k]}")
       end
 
-      Base64.encode64(Digest::MD5.hexdigest(sorted_params.join('&')))
+      flattened_params = sorted_params.join('&')
+      md5_digest = Digest::MD5.digest(flattened_params)
+      Base64.strict_encode64(md5_digest)
+    end
+
+    def make_verify_message(params)
+      params = sort_object(params)
+      flattened_params = params.to_json
+      Base64.strict_encode64(Digest::MD5.digest(flattened_params))
+    end
+
+    # In Ruby 3, a hash preserves the order the keys are inserted
+    # So we can make a 'sorted' hash and generate a sorted json later
+    def sort_object(obj)
+      result = nil
+      if obj.is_a? Hash
+        result = {}
+        obj.keys.sort.each { |k| result[k] = sort_object(obj[k]) }
+      elsif obj.is_a? Array
+        result = []
+        obj.sort.each { |k| result.push(k) }
+      else
+        result = obj
+      end
+      result
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tonglian-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yi Zhang