alipay-easysdk-ruby 1.0.2 → 1.0.3

data/lib/alipay/easysdk/kernel/factory.rb

@@ -2,6 +2,7 @@ require_relative 'alipay_constants'
 require_relative 'config'
 require_relative 'cert_environment'
 require_relative 'easy_sdk_kernel'
+require_relative '../payment/app/client'
 require_relative '../payment/wap/client'
 require_relative '../payment/page/client'
 require_relative '../payment/common/client'
@@ -13,10 +14,13 @@ module Alipay
         class ConfigurationNotSetError < StandardError; end
 
         class << self
-          def set_options(options = nil)
+          def set_options(options)
+            raise ArgumentError, '配置参数不能为空' if options.nil?
+            return @instance if defined?(@instance) && @instance
+
             config = normalize_config(options)
             initialize_context(config)
-            @instance
+            @instance = self
           end
 
           alias setOptions set_options
@@ -27,14 +31,18 @@ module Alipay
             @config
           end
 
-          def payment
-            ensure_context_set!
-            @payment
-          end
+      def payment
+        ensure_context_set!
+        @payment
+      end
 
-          def wap
-            payment.wap
-          end
+      def app
+        payment.app
+      end
+
+      def wap
+        payment.wap
+      end
 
           def page
             payment.page
@@ -56,17 +64,15 @@ module Alipay
           private
 
           def normalize_config(options)
-            raise ArgumentError, '配置参数不能为空' if options.nil?
-            options.is_a?(Config) ? options : Config.new(options)
+            return options if options.is_a?(Config)
+            Config.new(options)
           end
 
           def initialize_context(config)
             apply_cert_environment(config)
-            config.validate
             @config = config
             @kernel = EasySDKKernel.new(config)
             @payment = Payment.new(@kernel)
-            @instance = self
           end
 
           def ensure_context_set!
@@ -74,13 +80,13 @@ module Alipay
           end
 
           def apply_cert_environment(config)
-            return if config.alipay_cert_path.nil? || config.alipay_cert_path.to_s.strip.empty?
+            return if config.alipayCertPath.nil? || config.alipayCertPath.to_s.strip.empty?
 
             cert_env = CertEnvironment.new
-            cert_env.setup(config.merchant_cert_path, config.alipay_cert_path, config.alipay_root_cert_path)
-            config.merchant_cert_sn = cert_env.merchant_cert_sn
-            config.alipay_root_cert_sn = cert_env.root_cert_sn
-            config.alipay_public_key ||= cert_env.cached_alipay_public_key
+            cert_env.setup(config.merchantCertPath, config.alipayCertPath, config.alipayRootCertPath)
+            config.merchantCertSN = cert_env.merchant_cert_sn
+            config.alipayRootCertSN = cert_env.root_cert_sn
+            config.alipayPublicKey ||= cert_env.cached_alipay_public_key
           end
         end
 
@@ -89,6 +95,10 @@ module Alipay
             @kernel = kernel
           end
 
+          def app
+            @app ||= Alipay::EasySDK::Payment::App::Client.new(@kernel)
+          end
+
           def wap
             @wap ||= Alipay::EasySDK::Payment::Wap::Client.new(@kernel)
           end

data/lib/alipay/easysdk/kernel/util/aes.rb

@@ -0,0 +1,75 @@
+require 'openssl'
+require 'base64'
+
+module Alipay
+  module EasySDK
+    module Kernel
+      module Util
+        class AES
+          def aes_encrypt(plain_text, key)
+            raise encryption_error(plain_text, key) if key.to_s.empty?
+
+            secret_key = Base64.decode64(key)
+            padded = add_pkcs7_padding(plain_text.to_s)
+
+            cipher = OpenSSL::Cipher.new('AES-128-CBC')
+            cipher.encrypt
+            cipher.key = secret_key
+            cipher.iv = "\0" * 16
+            cipher.padding = 0
+
+            encrypted = cipher.update(padded) + cipher.final
+            Base64.strict_encode64(encrypted)
+          rescue StandardError => e
+            raise StandardError, "AES加密失败，plainText=#{plain_text}，keySize=#{key.to_s.length}。#{e.message}"
+          end
+
+          def aes_decrypt(cipher_text, key)
+            raise decryption_error(cipher_text, key) if key.to_s.empty?
+
+            secret_key = Base64.decode64(key)
+            encrypted = Base64.decode64(cipher_text)
+
+            decipher = OpenSSL::Cipher.new('AES-128-CBC')
+            decipher.decrypt
+            decipher.key = secret_key
+            decipher.iv = "\0" * 16
+            decipher.padding = 0
+
+            decrypted = decipher.update(encrypted) + decipher.final
+            strip_pkcs7_padding(decrypted)
+          rescue StandardError => e
+            raise StandardError, "AES解密失败，cipherText=#{cipher_text}，keySize=#{key.to_s.length}。#{e.message}"
+          end
+
+          private
+
+          def add_pkcs7_padding(source)
+            str = source.to_s.strip
+            block = 16
+            pad = block - (str.bytesize % block)
+            pad = block if pad.zero?
+            str + (pad.chr * pad)
+          end
+
+          def strip_pkcs7_padding(source)
+            return source if source.nil? || source.empty?
+
+            char = source[-1]
+            num = char.ord
+            return source if num == 62
+            source[0...-num]
+          end
+
+          def encryption_error(plain_text, key)
+            StandardError.new("AES加密失败，plainText=#{plain_text}，AES密钥为空。")
+          end
+
+          def decryption_error(cipher_text, key)
+            StandardError.new("AES解密失败，cipherText=#{cipher_text}，AES密钥为空。")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alipay/easysdk/kernel/util/ant_certification_util.rb

@@ -0,0 +1,63 @@
+require 'openssl'
+require 'digest/md5'
+
+module Alipay
+  module EasySDK
+    module Kernel
+      module Util
+        class AntCertificationUtil
+          SUPPORTED_SIGNATURES = %w[sha1WithRSAEncryption sha256WithRSAEncryption].freeze
+
+          def cert_sn(cert_path)
+            cert = load_certificate(cert_path)
+            signature_digest(cert.issuer.to_a, cert.serial)
+          end
+
+          def public_key(cert_path)
+            cert = load_certificate(cert_path)
+            key_pem = cert.public_key.to_pem
+            key_pem.gsub(/-----BEGIN PUBLIC KEY-----/, '')
+                   .gsub(/-----END PUBLIC KEY-----/, '')
+                   .gsub(/\s+/, '')
+                   .strip
+          end
+
+          def root_cert_sn(cert_path)
+            certs = load_cert_chain(cert_path)
+            sns = certs.each_with_object([]) do |cert, acc|
+              next unless SUPPORTED_SIGNATURES.include?(cert.signature_algorithm)
+
+              acc << signature_digest(cert.issuer.to_a, cert.serial)
+            end
+            sns.join('_')
+          end
+
+          private
+
+          def load_certificate(path)
+            raise ArgumentError, '证书路径不能为空' if path.nil? || path.to_s.strip.empty?
+
+            OpenSSL::X509::Certificate.new(File.read(path))
+          rescue Errno::ENOENT => e
+            raise RuntimeError, "无法读取证书文件: #{path} - #{e.message}"
+          end
+
+          def load_cert_chain(path)
+            pem = File.read(path)
+            pem.split(/(?=-----BEGIN CERTIFICATE-----)/)
+               .reject(&:empty?)
+               .map { |chunk| OpenSSL::X509::Certificate.new(chunk) }
+          rescue Errno::ENOENT => e
+            raise RuntimeError, "无法读取证书链文件: #{path} - #{e.message}"
+          end
+
+          def signature_digest(issuer_array, serial)
+            issuer_str = issuer_array.reverse.map { |name, data, _| "#{name}=#{data}" }.join(',')
+            serial_str = serial.to_i.to_s
+            Digest::MD5.hexdigest("#{issuer_str}#{serial_str}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alipay/easysdk/kernel/util/json_util.rb

@@ -7,14 +7,9 @@ module Alipay
         class JsonUtil
           # 完全复制PHP版本的toJsonString方法
           def to_json_string(obj)
-            case obj
-            when Hash, Array
-              JSON.generate(obj)
-            when String
-              obj
-            else
-              obj.to_s
-            end
+            return {} if obj.nil?
+            raise ArgumentError, 'to_json_string expects a Hash' unless obj.is_a?(Hash)
+            convert_map(obj)
           end
 
           def self.from_json_string(json_string)
@@ -23,6 +18,53 @@ module Alipay
           rescue JSON::ParserError
             json_string
           end
+
+          private
+
+          def convert_map(hash)
+            return hash unless hash.is_a?(Hash)
+
+            hash.each_with_object({}) do |(key, value), result|
+              result[underscore_key(key)] = convert_value(value)
+            end
+          end
+
+          def convert_value(value)
+            case value
+            when Hash
+              convert_map(value)
+            when Array
+              value.map { |item| convert_value(item) }
+            else
+              convert_object(value)
+            end
+          end
+
+          def convert_object(value)
+            return value if primitive?(value)
+
+            if value.respond_to?(:to_h)
+              convert_map(value.to_h)
+            elsif value.respond_to?(:to_hash)
+              convert_map(value.to_hash)
+            else
+              value
+            end
+          end
+
+          def underscore_key(key)
+            str = key.to_s
+            underscored = str.gsub(/([A-Z]+)/) { "_#{$1.downcase}" }
+            underscored.gsub(/__+/, '_').sub(/^_/, '')
+          end
+
+          def primitive?(value)
+            value.is_a?(String) ||
+              value.is_a?(Numeric) ||
+              value == true ||
+              value == false ||
+              value.nil?
+          end
         end
       end
     end

data/lib/alipay/easysdk/kernel/util/page_util.rb

@@ -0,0 +1,34 @@
+module Alipay
+  module EasySDK
+    module Kernel
+      module Util
+        class PageUtil
+          def build_form(action_url, parameters)
+            charset = Alipay::EasySDK::Kernel::AlipayConstants::DEFAULT_CHARSET
+            form = "<form id='alipaysubmit' name='alipaysubmit' action='#{action_url}?charset=#{charset}' method='POST'>"
+            params_enum(parameters).each do |key, val|
+              next if check_empty(val)
+
+              escaped = val.to_s.gsub("'", "&apos;")
+              form += "<input type='hidden' name='#{key}' value='#{escaped}'/>"
+            end
+            form += "<input type='submit' value='ok' style='display:none;'></form>"
+            form += "<script>document.forms['alipaysubmit'].submit();</script>"
+            form
+          end
+
+          private
+
+          def params_enum(parameters)
+            return [] if parameters.nil?
+            parameters.to_a
+          end
+
+          def check_empty(value)
+            !value || value.to_s.strip == ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alipay/easysdk/kernel/util/response_checker.rb

@@ -7,7 +7,12 @@ module Alipay
             return true if response.respond_to?(:code) && response.code.to_s == '10000'
 
             code_blank = !response.respond_to?(:code) || blank?(response.code)
-            sub_code_blank = !response.respond_to?(:sub_code) || blank?(response.sub_code)
+            sub_code_value = if response.respond_to?(:subCode)
+                               response.subCode
+                             elsif response.respond_to?(:sub_code)
+                               response.sub_code
+                             end
+            sub_code_blank = blank?(sub_code_value)
 
             code_blank && sub_code_blank
           end

data/lib/alipay/easysdk/kernel/util/signer.rb

@@ -49,7 +49,7 @@ module Alipay
               # 调用openssl内置方法验签，完全模仿PHP的openssl_verify
               public_key = OpenSSL::PKey::RSA.new(res)
               digest = OpenSSL::Digest::SHA256.new
-              decoded_sign = Base64.decode64(sign)
+              decoded_sign = Base64.decode64(sign.to_s)
 
               result = public_key.verify(digest, decoded_sign, content)
               return result
@@ -59,14 +59,16 @@ module Alipay
           end
 
           def verify_params(parameters, public_key)
-            sign = parameters['sign']
-            content = get_sign_content(parameters)
-            return verify(content, sign, public_key)
+            normalized = stringify_keys(parameters)
+            sign = normalized['sign'] || ''
+            content = get_sign_content(normalized)
+            verify(content, sign, public_key)
           end
 
           def get_sign_content(params)
+            normalized = stringify_keys(params)
             # 模拟PHP的ksort
-            sorted_params = params.sort_by { |k, _| k.to_s }.to_h
+            sorted_params = normalized.sort.to_h
 
             # 移除sign和sign_type字段
             sorted_params.delete('sign')
@@ -89,6 +91,14 @@ module Alipay
 
           private
 
+          def stringify_keys(hash)
+            return {} if hash.nil?
+
+            hash.each_with_object({}) do |(key, value), acc|
+              acc[key.to_s] = value
+            end
+          end
+
           # 完全复制PHP的wordwrap函数
           def wordwrap(str, width = 75, break_str = "\n", cut = false)
             if str.nil? || str.empty?

data/lib/alipay/easysdk/payment/app/client.rb

@@ -0,0 +1,75 @@
+require_relative '../../kernel/easy_sdk_kernel'
+require_relative 'models/alipay_trade_app_pay_response'
+
+module Alipay
+  module EasySDK
+    module Payment
+      module App
+        class Client
+          def initialize(kernel)
+            @kernel = kernel
+          end
+
+          def pay(subject, out_trade_no, total_amount)
+            system_params = {
+              'method' => 'alipay.trade.app.pay',
+              'app_id' => @kernel.get_config('appId'),
+              'timestamp' => @kernel.get_timestamp,
+              'format' => 'json',
+              'version' => '1.0',
+              'alipay_sdk' => @kernel.get_sdk_version,
+              'charset' => 'UTF-8',
+              'sign_type' => @kernel.get_config('signType'),
+              'app_cert_sn' => @kernel.get_merchant_cert_sn,
+              'alipay_root_cert_sn' => @kernel.get_alipay_root_cert_sn
+            }
+            biz_params = {
+              'subject' => subject,
+              'out_trade_no' => out_trade_no,
+              'total_amount' => total_amount
+            }
+            text_params = {}
+
+            sign = @kernel.sign(system_params, biz_params, text_params, @kernel.get_config('merchantPrivateKey'))
+            response = {
+              Alipay::EasySDK::Kernel::AlipayConstants::BODY_FIELD => @kernel.generate_order_string(system_params, biz_params, text_params, sign)
+            }
+            Models::AlipayTradeAppPayResponse.from_map(response)
+          end
+
+          def agent(app_auth_token)
+            @kernel.inject_text_param('app_auth_token', app_auth_token)
+            self
+          end
+
+          def auth(auth_token)
+            @kernel.inject_text_param('auth_token', auth_token)
+            self
+          end
+
+          def async_notify(url)
+            @kernel.inject_text_param('notify_url', url)
+            self
+          end
+
+          def route(test_url)
+            @kernel.inject_text_param('ws_service_url', test_url)
+            self
+          end
+
+          def optional(key, value)
+            @kernel.inject_biz_param(key, value)
+            self
+          end
+
+          def batch_optional(optional_args)
+            optional_args.each do |opt_key, opt_value|
+              @kernel.inject_biz_param(opt_key, opt_value)
+            end
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alipay/easysdk/payment/app/models/alipay_trade_app_pay_response.rb

@@ -0,0 +1,19 @@
+module Alipay
+  module EasySDK
+    module Payment
+      module App
+        module Models
+          class AlipayTradeAppPayResponse
+            attr_accessor :body
+
+            def self.from_map(response)
+              new.tap do |instance|
+                instance.body = response[Alipay::EasySDK::Kernel::AlipayConstants::BODY_FIELD]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/alipay/easysdk/payment/common/client.rb

@@ -17,6 +17,27 @@ module Alipay
     module Payment
       module Common
         class Client
+          class TeaError < StandardError
+            attr_reader :data, :code
+
+            def initialize(data = {}, message = '', code = nil, cause = nil)
+              super(message)
+              @data = data
+              @code = code
+              set_backtrace(cause.backtrace) if cause
+            end
+          end
+
+          class TeaUnableRetryError < StandardError
+            attr_reader :last_request, :last_exception
+
+            def initialize(last_request, last_exception)
+              super(last_exception&.message)
+              @last_request = last_request
+              @last_exception = last_exception
+            end
+          end
+
           def initialize(kernel)
             @kernel = kernel
           end
@@ -72,7 +93,7 @@ module Alipay
 
           def verify_notify(parameters)
             if @kernel.is_cert_mode
-              @kernel.verify_params(parameters, @kernel.extract_alipay_public_key(@kernel.get_alipay_cert_sn('')))
+              @kernel.verify_params(parameters, @kernel.extract_alipay_public_key(''))
             else
               @kernel.verify_params(parameters, @kernel.get_config('alipayPublicKey'))
             end
@@ -118,7 +139,7 @@ module Alipay
             sign = @kernel.sign(system_params, biz_params, text_params, @kernel.get_config('merchantPrivateKey'))
 
             text_query = (@kernel.text_params || {}).dup
-            query_params = { 'sign' => sign }.merge(system_params)
+            query_params = { Alipay::EasySDK::Kernel::AlipayConstants::SIGN_FIELD => sign }.merge(system_params)
             query_params.merge!(text_query) unless text_query.empty?
 
             uri = build_gateway_uri(query_params)
@@ -131,11 +152,15 @@ module Alipay
             resp_map = @kernel.read_as_json(response, api_method)
 
             unless verify_response(resp_map)
-              raise '验签失败，请检查支付宝公钥设置是否正确。'
+              raise TeaError.new({}, '验签失败，请检查支付宝公钥设置是否正确。')
             end
 
             map = @kernel.to_resp_model(resp_map)
             response_class.from_map(map)
+          rescue TeaError => e
+            raise e
+          rescue StandardError => e
+            raise TeaError.new({}, e.message, nil, e)
           ensure
             clear_optional_params
           end
@@ -156,8 +181,8 @@ module Alipay
           end
 
           def build_gateway_uri(query_params)
-            host = @kernel.get_config('gatewayHost').to_s.sub(%r{/gateway\.do$}, '')
-            scheme = @kernel.get_config('protocol') || 'https'
+            host = @kernel.get_config(Alipay::EasySDK::Kernel::AlipayConstants::HOST_CONFIG_KEY).to_s.sub(%r{/gateway\.do$}, '')
+            scheme = @kernel.get_config(Alipay::EasySDK::Kernel::AlipayConstants::PROTOCOL_CONFIG_KEY) || 'https'
             uri = URI("#{scheme}://#{host}/gateway.do")
             uri.query = URI.encode_www_form(query_params.sort.to_h)
             uri

data/lib/alipay/easysdk/payment/common/models/base_response.rb

@@ -20,20 +20,6 @@ module Alipay
                 end
               end
             end
-
-            def success?
-              respond_to?('code') ? public_send('code') == '10000' : false
-            end
-
-            def error_message
-              if respond_to?('sub_msg') && public_send('sub_msg')
-                public_send('sub_msg')
-              elsif respond_to?('msg')
-                public_send('msg')
-              else
-                nil
-              end
-            end
           end
         end
       end

data/lib/alipay/easysdk/payment/page/client.rb

@@ -36,7 +36,7 @@ module Alipay
             sign = @kernel.sign(system_params, biz_params, text_params, @kernel.get_config('merchantPrivateKey'))
 
             response = {
-              'body' => @kernel.generate_page('POST', system_params, biz_params, text_params, sign),
+              Alipay::EasySDK::Kernel::AlipayConstants::BODY_FIELD => @kernel.generate_page('POST', system_params, biz_params, text_params, sign),
               'payment_url' => @kernel.generate_payment_url(system_params, biz_params, text_params, sign)
             }
 

data/lib/alipay/easysdk/payment/page/models/alipay_trade_page_pay_response.rb

@@ -8,26 +8,10 @@ module Alipay
 
             def self.from_map(response)
               new.tap do |instance|
-                instance.body = response['body']
+                instance.body = response[Alipay::EasySDK::Kernel::AlipayConstants::BODY_FIELD]
                 instance.payment_url = response['payment_url']
               end
             end
-
-            def success?
-              !body.nil? && !body.to_s.empty?
-            end
-
-            def form
-              body
-            end
-
-            def error_message
-              nil
-            end
-
-            def to_s
-              body || ''
-            end
           end
         end
       end

data/lib/alipay/easysdk/payment/wap/client.rb

@@ -39,7 +39,7 @@ module Alipay
             sign = @kernel.sign(system_params, biz_params, text_params, @kernel.get_config("merchantPrivateKey"))
 
             response = {
-              "body" => @kernel.generate_page("POST", system_params, biz_params, text_params, sign),
+              Alipay::EasySDK::Kernel::AlipayConstants::BODY_FIELD => @kernel.generate_page("POST", system_params, biz_params, text_params, sign),
               "payment_url" => @kernel.generate_payment_url(system_params, biz_params, text_params, sign)
             }
             return Alipay::EasySDK::Payment::Wap::Models::AlipayTradeWapPayResponse.from_map(response)

data/lib/alipay/easysdk/payment/wap/models/alipay_trade_wap_pay_response.rb

@@ -8,26 +8,10 @@ module Alipay
 
             def self.from_map(response)
               new.tap do |instance|
-                instance.body = response['body']
+                instance.body = response[Alipay::EasySDK::Kernel::AlipayConstants::BODY_FIELD]
                 instance.payment_url = response['payment_url']
               end
             end
-
-            def success?
-              !body.nil? && !body.to_s.empty?
-            end
-
-            def form
-              body
-            end
-
-            def error_message
-              nil
-            end
-
-            def to_s
-              body || ''
-            end
           end
         end
       end

data/lib/alipay/easysdk/version.rb

@@ -1,5 +1,5 @@
 module Alipay
   module EasySDK
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end