wechat 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 458dae06ac4875c8cf283fbda7cb06fa8b2260bf
-  data.tar.gz: cecda681714c670bb60f582fac2d3f4b25999a0a
+  metadata.gz: 9f57875f2dee753674602e98333ae19b6a29c4ed
+  data.tar.gz: e0c6882f86e379bfd8ad74d31a3c6241cd47f0ae
 SHA512:
-  metadata.gz: d4c9ec8d9831c415a3d5a8557173e1f1c2cd37358f9b94191eafdf073b1158974954de842867d6e829150cdc95e904dcd2bc6c90c9bae877ad5dc1f50448a7b2
-  data.tar.gz: 8c3f2f89ec9a36d1e92af1b2408fc2de5a5f23ee8f20f924f64cb216c242253b04627169b3870ca7b51bc033491048a55726fe8ca17fff224706db664208b808
+  metadata.gz: 375da3a164458340900ed8d1ab1b4c864ce3b2f645f18ef19be010a67954018ff5a34da7273e12169c1654673d91c237ea99a633ef63b5630d84f04561e887e9
+  data.tar.gz: 9dba3994255e0cff1de66e7f125f30b9a6f836f81f98a327fab1180fc940e7fc40ed5169c10ff939264a2e314ae9b3412afbb3a9a8b6bda2920237d43799fa0e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.6.3 (released at 11/14/2015)
+
+* Official testing and support public encrypt mode, also fix one cipher bug, many thanks to hlltc #67
+* hlltc report public account FILE_BASE no longer needs, clean code #67
+* Media command line reflect recent Tecent json schema change. #67
+
 ## v0.6.2 (released at 11/05/2015)
 
 * Tecent report location API changed, so change wechat gems also. #64

data/README.md

@@ -88,6 +88,14 @@ test:
   <<: *default
 ```
 
+公众号可选安全模式（加密模式），通过添加如下配置可开启加密模式。
+
+```
+default: &default
+  encrypt_mode: true
+  encoding_aes_key:  "my_encoding_aes_key"
+```
+
 企业号配置下必须使用加密模式，其中token和encoding_aes_key可以从企业号管理界面的应用中心->某个应用->模式选择，选择回调模式后获得。
 
 ```

data/bin/wechat

@@ -360,8 +360,8 @@ HELP
     r = Helper.with(options).material_list(type, offset, count)
     if %w(image voice video file).include?(type)
       puts "errcode: #{r['errcode']} errmsg: #{r['errmsg']} total_count: #{r['total_count']} item_count: #{r['item_count']}"
-      r['itemlist'].each do |i|
-        puts "#{i['media_id']} #{i['filename']} #{Time.at(i['update_time'].to_i)}"
+      r['item'].each do |i|
+        puts "#{i['media_id']} #{i['name']} #{Time.at(i['update_time'].to_i)}"
       end
     else
       puts r

data/lib/generators/wechat/templates/config/wechat.yml

@@ -5,9 +5,10 @@ default: &default
 # Or if using public account, only need above two line
 #  appid: "my_appid"
 #  secret: "my_secret"
-  token:    "token"
+  token:    "my_token"
   access_token: "C:/Users/[username]/wechat_access_token"
-  encoding_aes_key:  "encoding_aes_key"
+  encrypt_mode: false # if true must fill encoding_aes_key
+  encoding_aes_key:  "my_encoding_aes_key"
 
 production:
   corpid:     <%%= ENV['WECHAT_CORPID'] %>
@@ -18,6 +19,7 @@ production:
 #  secret:     <%= ENV['WECHAT_APP_SECRET'] %>
   token:      <%%= ENV['WECHAT_TOKEN'] %>
   access_token:  <%%= ENV['WECHAT_ACCESS_TOKEN'] %>
+  encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  <%%= ENV['WECHAT_ENCODING_AES_KEY'] %>
 
 development:

data/lib/wechat/api.rb

@@ -8,7 +8,6 @@ module Wechat
     attr_reader :jsapi_ticket
 
     API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
-    FILE_BASE = 'http://file.api.weixin.qq.com/cgi-bin/'
     OAUTH2_BASE = 'https://api.weixin.qq.com/sns/oauth2/'
 
     def initialize(appid, secret, token_file, skip_verify_ssl, jsapi_ticket_file = '/var/tmp/wechat_jsapi_ticket')
@@ -84,16 +83,8 @@ module Wechat
       post 'menu/create', JSON.generate(menu)
     end
 
-    def media(media_id)
-      get 'media/get', params: { media_id: media_id }, base: FILE_BASE, as: :file
-    end
-
-    def media_create(type, file)
-      post 'media/upload', { upload: { media: file } }, params: { type: type }, base: FILE_BASE
-    end
-
     def material(media_id)
-      get 'material/get', params: { media_id: media_id }, base: FILE_BASE, as: :file
+      get 'material/get', params: { media_id: media_id }, as: :file
     end
 
     def material_count
@@ -105,7 +96,7 @@ module Wechat
     end
 
     def material_add(type, file)
-      post 'material/add_material', { upload: { media: file } }, params: { type: type }, base: FILE_BASE
+      post 'material/add_material', { upload: { media: file } }, params: { type: type }
     end
 
     def material_delete(media_id)

data/lib/wechat/api_base.rb

@@ -14,6 +14,14 @@ module Wechat
       client.get 'showqrcode', ticket: CGI.escape(ticket), base: MP_BASE, as: :file
     end
 
+    def media(media_id)
+      get 'media/get', params: { media_id: media_id }, as: :file
+    end
+
+    def media_create(type, file)
+      post 'media/upload', { upload: { media: file } }, params: { type: type }
+    end
+
     protected
 
     def get(path, headers = {})

data/lib/wechat/cipher.rb

@@ -14,11 +14,11 @@ module Wechat
       cipher.encrypt
 
       cipher.padding = 0
-      key_data = Base64.decode64(encoding_aes_key)
+      key_data = Base64.decode64(encoding_aes_key + '=')
       cipher.key = key_data
       cipher.iv = key_data[0..16]
 
-      cipher.update(encode_padding(plain)) + cipher.final
+      cipher.update(plain) + cipher.final
     end
 
     def decrypt(msg, encoding_aes_key)
@@ -26,7 +26,7 @@ module Wechat
       cipher.decrypt
 
       cipher.padding = 0
-      key_data = Base64.decode64(encoding_aes_key)
+      key_data = Base64.decode64(encoding_aes_key + '=')
       cipher.key = key_data
       cipher.iv = key_data[0..16]
 

data/lib/wechat/corp_api.rb

@@ -136,10 +136,6 @@ module Wechat
       post 'menu/create', JSON.generate(menu), params: { agentid: agentid }
     end
 
-    def media(media_id)
-      get 'media/get', params: { media_id: media_id }, as: :file
-    end
-
     def material_count
       get 'material/get_count', params: { agentid: agentid }
     end
@@ -148,10 +144,6 @@ module Wechat
       post 'material/batchget', JSON.generate(type: type, agentid: agentid, offset: offset, count: count)
     end
 
-    def media_create(type, file)
-      post 'media/upload', { upload: { media: file } }, params: { type: type }
-    end
-
     def material(media_id)
       get 'material/get', params: { media_id: media_id, agentid: agentid }, as: :file
     end

data/lib/wechat/responder.rb

@@ -153,10 +153,14 @@ module Wechat
     private
 
     def verify_signature
-      signature = params[:signature] || params[:msg_signature]
+      if self.class.encrypt_mode
+        signature = params[:signature] || params[:msg_signature]
+        msg_encrypt = params[:echostr] || request_encrypt_content
+      else
+        signature = params[:signature]
+      end
 
-      msg_encrypt = params[:echostr] if self.class.corpid.present?
-      msg_encrypt ||= request_encrypt_content if self.class.encrypt_mode
+      msg_encrypt = nil unless self.class.corpid.present?
 
       render text: 'Forbidden', status: 403 if signature != Signature.hexdigest(self.class.token,
                                                                                 params[:timestamp],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport