alipay 0.6.0.beta1 → 0.6.0.beta2

data/lib/alipay/sign/md5.rb

@@ -0,0 +1,15 @@
+require 'digest/md5'
+
+module Alipay
+  module Sign
+    class MD5
+      def self.sign(key, string)
+        Digest::MD5.hexdigest("#{string}#{key}")
+      end
+
+      def self.verify?(key, string, sign)
+        sign == sign(key, string)
+      end
+    end
+  end
+end

data/lib/alipay/sign/rsa.rb

@@ -0,0 +1,18 @@
+require 'openssl'
+require 'base64'
+
+module Alipay
+  module Sign
+    class RSA
+      def self.sign(key, string)
+        rsa = OpenSSL::PKey::RSA.new(key)
+        Base64.encode64(rsa.sign('sha1', string))
+      end
+
+      def self.verify?(key, string, sign)
+        rsa = OpenSSL::PKey::RSA.new(key)
+        rsa.verify('sha1', Base64.decode64(sign), string)
+      end
+    end
+  end
+end

data/lib/alipay/version.rb

@@ -1,3 +1,3 @@
 module Alipay
-  VERSION = "0.6.0.beta1"
+  VERSION = "0.6.0.beta2"
 end

data/lib/alipay/wap/notify.rb

@@ -0,0 +1,13 @@
+module Alipay
+  module Wap
+    module Notify
+      def self.verify?(params, options = {})
+        params = Utils.stringify_keys(params)
+        pid = options[:pid] || Alipay.pid
+        notify_id = params['notify_data'].scan(/\<notify_id\>(.*)\<\/notify_id\>/).flatten.first
+
+        Sign.verify?(params, options) && ::Alipay::Notify.verify_notify_id?(pid, notify_id)
+      end
+    end
+  end
+end

data/lib/alipay/wap/service.rb

@@ -0,0 +1,73 @@
+module Alipay
+  module Wap
+    module Service
+      GATEWAY_URL = 'https://wappaygw.alipay.com/service/rest.htm'
+
+      TRADE_CREATE_DIRECT_TOKEN_REQUIRED_PARAMS = %w( req_data )
+      REQ_DATA_REQUIRED_PARAMS = %w( subject out_trade_no total_fee call_back_url )
+      def self.trade_create_direct_token(params, options = {})
+        params = Utils.stringify_keys(params)
+        Alipay::Service.check_required_params(params, TRADE_CREATE_DIRECT_TOKEN_REQUIRED_PARAMS)
+
+        req_data = Utils.stringify_keys(params.delete('req_data'))
+        Alipay::Service.check_required_params(req_data, REQ_DATA_REQUIRED_PARAMS)
+
+        req_data = {
+          'seller_account_name' => options[:seller_email] || Alipay.seller_email
+        }.merge(req_data)
+
+        xml = req_data.map {|k, v| "<#{k}>#{v.encode(:xml => :text)}</#{k}>" }.join
+        req_data_xml = "<direct_trade_create_req>#{xml}</direct_trade_create_req>"
+
+        # About req_id: http://club.alipay.com/read-htm-tid-10078020-fpage-2.html
+        params = {
+          'service'  => 'alipay.wap.trade.create.direct',
+          'req_data' => req_data_xml,
+          'partner'  => options[:pid] || Alipay.pid,
+          'req_id'   => Time.now.strftime('%Y%m%d%H%M%s'),
+          'format'   => 'xml',
+          'v'        => '2.0'
+        }.merge(params)
+
+        xml = Net::HTTP.get(request_uri(params, options))
+        CGI.unescape(xml).scan(/\<request_token\>(.*)\<\/request_token\>/).flatten.first
+      end
+
+      AUTH_AND_EXECUTE_REQUIRED_PARAMS = %w( request_token )
+
+      def self.auth_and_execute_url(params, options = {})
+        params = Utils.stringify_keys(params)
+        Alipay::Service.check_required_params(params, AUTH_AND_EXECUTE_REQUIRED_PARAMS)
+
+        req_data_xml = "<auth_and_execute_req><request_token>#{params.delete('request_token')}</request_token></auth_and_execute_req>"
+
+        params = {
+          'service'  => 'alipay.wap.auth.authAndExecute',
+          'req_data' => req_data_xml,
+          'partner'  => options[:pid] || Alipay.pid,
+          'format'   => 'xml',
+          'v'        => '2.0'
+        }.merge(params)
+
+        request_uri(params, options).to_s
+      end
+
+      def self.request_uri(params, options = {})
+        uri = URI(GATEWAY_URL)
+        uri.query = URI.encode_www_form(sign_params(params, options))
+        uri
+      end
+
+      SIGN_TYPE_TO_SEC_ID = {
+        'MD5' => 'MD5',
+        'RSA' => '0001'
+      }
+
+      def self.sign_params(params, options = {})
+        sign_type = (options[:sign_type] ||= Alipay.sign_type)
+        params = params.merge('sec_id' => SIGN_TYPE_TO_SEC_ID[sign_type])
+        params.merge('sign' => Alipay::Sign.generate(params, options))
+      end
+    end
+  end
+end

data/lib/alipay/wap/sign.rb

@@ -0,0 +1,37 @@
+module Alipay
+  module Wap
+    module Sign
+      ALIPAY_RSA_PUBLIC_KEY = <<-EOF
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCQwpCPC4oB+clYNBkKQx3gfyFl
+Ut3cpRr5oErt OypLKh6j1UmTDSpfsac29h1kC0HIvLmxWbPuoxcsKDlclgRPeWn
+IxrpSF9k5Fu6SRy3+AOdIKrDO SHQ7VwUsNih2OnPbztMSMplGnQCBa1iec2r+38
+Udmh5Ua2xg6IEfk493VQIDAQAB
+-----END PUBLIC KEY-----
+      EOF
+
+      def self.verify?(params, options = {})
+        params = Utils.stringify_keys(params)
+        sign = params.delete('sign')
+        string = params_to_string(params)
+
+        case params['sec_id']
+        when 'MD5'
+          key = options[:pid] || Alipay.key
+          ::Alipay::Sign::MD5.verify?(key, string, sign)
+        when '0001' # RSA
+          ::Alipay::Sign::RSA.verify?(ALIPAY_RSA_PUBLIC_KEY, string, sign)
+        else
+          raise ArgumentError, "[Alipay] Invalid sec_id, allow value: 'MD5', '0001'"
+        end
+      end
+
+      SORTED_VERIFY_PARAMS = %w( service v sec_id notify_data )
+      def self.params_to_string(params)
+        SORTED_VERIFY_PARAMS.map do |key|
+          "#{key}=#{params[key]}"
+        end.join('&')
+      end
+    end
+  end
+end

data/test/alipay/notify_test.rb

@@ -2,25 +2,28 @@ require 'test_helper'
 
 class Alipay::NotifyTest < Minitest::Test
   def setup
-    @options = {
+    @params = {
       :notify_id => '1234',
-      :sign_type => 'MD5'
     }
-    @sign_options = @options.merge(:sign => Alipay::Sign.generate(@options))
+    @unsign_params = @params.merge(:sign_type => 'MD5', :sign => 'xxxx')
+    @sign_params = @params.merge(
+      :sign_type => 'MD5',
+      :sign      => '22fc7e38e5acdfede396aa463870d111'
+    )
   end
 
   def test_unsign_notify
     FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234", :body => "true")
-    assert !Alipay::Notify.verify?(@options)
+    assert !Alipay::Notify.verify?(@unsign_params)
   end
 
   def test_verify_notify_when_true
     FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234", :body => "true")
-    assert Alipay::Notify.verify?(@sign_options)
+    assert Alipay::Notify.verify?(@sign_params)
   end
 
   def test_verify_notify_when_false
     FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=1234", :body => "false")
-    assert !Alipay::Notify.verify?(@sign_options)
+    assert !Alipay::Notify.verify?(@sign_params)
   end
 end

data/test/alipay/service_test.rb

@@ -38,7 +38,7 @@ class Alipay::ServiceTest < Minitest::Test
     assert_equal 'https://mapi.alipay.com/gateway.do?service=create_direct_pay_by_user&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&payment_type=1&out_trade_no=1&subject=test&price=0.01&quantity=1&sign_type=MD5&sign=51c7f60e85eaff5136600d1942b2744c', Alipay::Service.create_direct_pay_by_user_url(options)
   end
 
-  def test_generate_create_refund_url
+  def test_refund_fastpay_by_platform_pwd_url
     data = [{
       :trade_no => '1',
       :amount   => '0.01',
@@ -50,10 +50,10 @@ class Alipay::ServiceTest < Minitest::Test
       :notify_url  => '/some_url',
       :refund_date => '2015-01-01 00:00:00'
     }
-    assert_equal "https://mapi.alipay.com/gateway.do?service=refund_fastpay_by_platform_pwd&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&refund_date=2015-01-01+00%3A00%3A00&batch_num=1&detail_data=1%5E0.01%5Etest&batch_no=123456789&notify_url=%2Fsome_url&sign_type=MD5&sign=3f5be5655b513334460a511e74a9ae57", Alipay::Service.create_refund_url(options)
+    assert_equal "https://mapi.alipay.com/gateway.do?service=refund_fastpay_by_platform_pwd&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&refund_date=2015-01-01+00%3A00%3A00&batch_num=1&detail_data=1%5E0.01%5Etest&batch_no=123456789&notify_url=%2Fsome_url&sign_type=MD5&sign=3f5be5655b513334460a511e74a9ae57", Alipay::Service.refund_fastpay_by_platform_pwd_url(options)
   end
 
-  def test_generate_create_forex_single_refund_url
+  def test_forex_refund_url
     options = {
       :out_return_no => '1',
       :out_trade_no  => '12345678980',
@@ -62,10 +62,10 @@ class Alipay::ServiceTest < Minitest::Test
       :reason        => 'reason',
       :gmt_return    => '2015-01-01 00:00:00'
     }
-    assert_equal 'https://mapi.alipay.com/gateway.do?service=forex_refund&partner=1000000000000000&_input_charset=utf-8&gmt_return=2015-01-01+00%3A00%3A00&out_return_no=1&out_trade_no=12345678980&return_amount=0.01&currency=USD&reason=reason&sign_type=MD5&sign=123c50e884e560801fee8b73f1ac6172', Alipay::Service.create_forex_single_refund_url(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=forex_refund&partner=1000000000000000&_input_charset=utf-8&gmt_return=2015-01-01+00%3A00%3A00&out_return_no=1&out_trade_no=12345678980&return_amount=0.01&currency=USD&reason=reason&sign_type=MD5&sign=123c50e884e560801fee8b73f1ac6172', Alipay::Service.forex_refund_url(options)
   end
 
-  def test_generate_create_forex_trade
+  def test_generate_create_forex_trade_url
     options = {
       :notify_url        => 'https://example.com/notify',
       :subject           => 'test',
@@ -73,7 +73,7 @@ class Alipay::ServiceTest < Minitest::Test
       :currency          => 'EUR',
       :total_fee         => '0.01',
     }
-    assert_equal 'https://mapi.alipay.com/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&notify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=test&out_trade_no=1&currency=EUR&total_fee=0.01&sign_type=MD5&sign=495a0e610134aa33f6ce021f8b8c6c8d', Alipay::Service.create_forex_trade(options)
+    assert_equal 'https://mapi.alipay.com/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=1000000000000000&seller_email=admin%40example.com&notify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=test&out_trade_no=1&currency=EUR&total_fee=0.01&sign_type=MD5&sign=495a0e610134aa33f6ce021f8b8c6c8d', Alipay::Service.create_forex_trade_url(options)
   end
 
   def test_close_trade

data/test/alipay/sign/md5_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class Alipay::Sign::MD5Test < Minitest::Test
+  def setup
+    @string = "partner=123&service=test"
+    @sign = 'bbd13b52823b576291595f472ebcfbc2'
+  end
+
+  def test_sign
+    assert_equal @sign, Alipay::Sign::MD5.sign(Alipay.key, @string)
+  end
+
+  def test_verify
+    assert Alipay::Sign::MD5.verify?(Alipay.key, @string, @sign)
+  end
+
+  def test_verify_fail_when_sign_not_true
+    assert !Alipay::Sign::MD5.verify?(Alipay.key, "danger#{@string}", @sign)
+  end
+end

data/test/alipay/sign_test.rb

@@ -7,21 +7,23 @@ class Alipay::SignTest < Minitest::Test
       :partner => '123'
     }
     @md5_sign = 'bbd13b52823b576291595f472ebcfbc2'
+
+    @key_2 = '20000000000000000000000000000000'
+    @md5_sign_2 = '6d581af270c023fdaaca6880491e9bf7'
   end
 
   def test_generate_sign
     assert_equal @md5_sign, Alipay::Sign.generate(@params)
-  end
-
-  def test_generate_md5_sign
-    assert_equal @md5_sign, Alipay::Sign.generate_md5(Alipay.key, @params)
+    assert_equal @md5_sign_2, Alipay::Sign.generate(@params, {:key => @key_2})
   end
 
   def test_verify_sign
     assert Alipay::Sign.verify?(@params.merge(:sign_type => 'MD5', :sign => @md5_sign))
+    assert Alipay::Sign.verify?(@params.merge(:sign_type => 'MD5', :sign => @md5_sign_2), {:key => @key_2})
   end
 
-  def test_verify_sign_when_fails
+  def test_verify_fail_when_sign_not_true
     assert !Alipay::Sign.verify?(@params.merge(:danger => 'danger', :sign_type => 'MD5', :sign => @md5_sign))
+    assert !Alipay::Sign.verify?(@params.merge(:sign_type => 'MD5', :sign => 'danger'))
   end
 end

data/test/alipay/{notify/wap_test.rb → wap/notify_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::Notify::WapTest < Minitest::Test
+class Alipay::Wap::NotifyTest < Minitest::Test
   def setup
     @notify_id = 'notify_id_test'
 
@@ -17,16 +17,16 @@ class Alipay::Notify::WapTest < Minitest::Test
 
   def test_unsign_notify
     FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}", :body => "true")
-    assert !Alipay::Notify::Wap.verify?(@notify_params)
+    assert !Alipay::Wap::Notify.verify?(@notify_params)
   end
 
   def test_verify_notify_when_true
     FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}", :body => "true")
-    assert Alipay::Notify::Wap.verify?(@sign_params)
+    assert Alipay::Wap::Notify.verify?(@sign_params)
   end
 
   def test_verify_notify_when_false
     FakeWeb.register_uri(:get, "https://mapi.alipay.com/gateway.do?service=notify_verify&partner=#{Alipay.pid}&notify_id=#{@notify_id}", :body => "false")
-    assert !Alipay::Notify::Wap.verify?(@sign_params)
+    assert !Alipay::Wap::Notify.verify?(@sign_params)
   end
 end

data/test/alipay/{service/wap_test.rb → wap/service_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::Service::WapTest < Minitest::Test
+class Alipay::Wap::ServiceTest < Minitest::Test
   def test_trade_create_direct_token
     token = 'REQUEST_TOKEN'
     body = <<-EOS
@@ -23,7 +23,7 @@ class Alipay::Service::WapTest < Minitest::Test
       :body => body
     )
 
-    assert_equal token, Alipay::Service::Wap.trade_create_direct_token(
+    assert_equal token, Alipay::Wap::Service.trade_create_direct_token(
       :req_data => {
         :out_trade_no  => '1',
         :subject       => 'subject',
@@ -34,7 +34,7 @@ class Alipay::Service::WapTest < Minitest::Test
   end
 
   def test_auth_and_execute_url
-    options = { :request_token => 'token_test' }
-    assert_equal 'https://wappaygw.alipay.com/service/rest.htm?service=alipay.wap.auth.authAndExecute&req_data=%3Cauth_and_execute_req%3E%3Crequest_token%3Etoken_test%3C%2Frequest_token%3E%3C%2Fauth_and_execute_req%3E&partner=1000000000000000&format=xml&v=2.0&sec_id=MD5&sign=3efe60d4a9b7960ba599da6764c959df', Alipay::Service::Wap.auth_and_execute_url(options)
+    params = { :request_token => 'token_test' }
+    assert_equal 'https://wappaygw.alipay.com/service/rest.htm?service=alipay.wap.auth.authAndExecute&req_data=%3Cauth_and_execute_req%3E%3Crequest_token%3Etoken_test%3C%2Frequest_token%3E%3C%2Fauth_and_execute_req%3E&partner=1000000000000000&format=xml&v=2.0&sec_id=MD5&sign=3efe60d4a9b7960ba599da6764c959df', Alipay::Wap::Service.auth_and_execute_url(params)
   end
 end

data/test/alipay/{sign/wap_test.rb → wap/sign_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Alipay::Sign::WapTest < Minitest::Test
+class Alipay::Wap::SignTest < Minitest::Test
   def setup
     @params = {
       :v => '1.0',
@@ -12,6 +12,6 @@ class Alipay::Sign::WapTest < Minitest::Test
   end
 
   def test_verify_sign
-    assert Alipay::Sign::Wap.verify?(@params.merge(:sign => @sign, :whatever => 'x'))
+    assert Alipay::Wap::Sign.verify?(@params.merge(:sign => @sign, :whatever => 'x'))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alipay
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta1
+  version: 0.6.0.beta2
 platform: ruby
 authors:
 - Rei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -82,20 +83,24 @@ files:
 - alipay.gemspec
 - lib/alipay.rb
 - lib/alipay/notify.rb
-- lib/alipay/notify/wap.rb
 - lib/alipay/service.rb
-- lib/alipay/service/wap.rb
 - lib/alipay/sign.rb
-- lib/alipay/sign/wap.rb
+- lib/alipay/sign/dsa.rb
+- lib/alipay/sign/md5.rb
+- lib/alipay/sign/rsa.rb
 - lib/alipay/utils.rb
 - lib/alipay/version.rb
-- test/alipay/notify/wap_test.rb
+- lib/alipay/wap/notify.rb
+- lib/alipay/wap/service.rb
+- lib/alipay/wap/sign.rb
 - test/alipay/notify_test.rb
-- test/alipay/service/wap_test.rb
 - test/alipay/service_test.rb
-- test/alipay/sign/wap_test.rb
+- test/alipay/sign/md5_test.rb
 - test/alipay/sign_test.rb
 - test/alipay/utils_test.rb
+- test/alipay/wap/notify_test.rb
+- test/alipay/wap/service_test.rb
+- test/alipay/wap/sign_test.rb
 - test/alipay_test.rb
 - test/test_helper.rb
 homepage: https://github.com/chloerei/alipay
@@ -123,12 +128,13 @@ signing_key:
 specification_version: 4
 summary: An unofficial simple alipay gem
 test_files:
-- test/alipay/notify/wap_test.rb
 - test/alipay/notify_test.rb
-- test/alipay/service/wap_test.rb
 - test/alipay/service_test.rb
-- test/alipay/sign/wap_test.rb
+- test/alipay/sign/md5_test.rb
 - test/alipay/sign_test.rb
 - test/alipay/utils_test.rb
+- test/alipay/wap/notify_test.rb
+- test/alipay/wap/service_test.rb
+- test/alipay/wap/sign_test.rb
 - test/alipay_test.rb
 - test/test_helper.rb