wechat-callback 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6d866c6ff02037f220c42b497664f852ecde60f
-  data.tar.gz: 41a81672c3920de6822ccb57554d97d6c77c16f1
+  metadata.gz: abe8b742f4d7992685d0be99900192815cf46f4f
+  data.tar.gz: e3f8689b852a2fb649e0d334498b983698982934
 SHA512:
-  metadata.gz: 5128379e8b0edbbed039f7947c6ed4cb4450be89f4fffefae80d33b231e3fadc35ee582a81fc93ef93d1655264c3d1b285334f2230cc4394d584a0adf3a4589e
-  data.tar.gz: 08a025cd499b20325cdb42ae0159180ba83d35ae1ee2955a891aa1b15f688aaa281ff23a2569f514bcbf88d460ccfe590bc02b36d53169851543f5f6e83acf84
+  metadata.gz: 4b2588006ae7d1c992252d1cacaa220c5fd3ea6add64a003cff401851dae98b76461213e1f2830e6c0df206a7de03faaec2eae078a6cd70c6c86fe75a2e66319
+  data.tar.gz: 1d1d278dfdee0101ebc72da2d1be2171ae3d5485b187a04b1f211a59c683d2c62da3908f511e0d4f6d33b9d96a5df67c6d870cf95e4d279c1f276e5c000ad68a

data/CHANGELOG.md

@@ -8,3 +8,7 @@
 ## v0.2
 1. Message Encryption class
 2. Message Decryption class
+
+## v0.3
+1. Random Byte Array class
+2. Secure Message class

data/lib/wechat/callback.rb

@@ -7,6 +7,9 @@ require 'wechat/callback/xml_document'
 require 'wechat/callback/message_decryption'
 require 'wechat/callback/message_encryption'
 
+require 'wechat/callback/random_byte_array'
+require 'wechat/callback/secure_message'
+
 module Wechat
   module Callback
     # Your code goes here...

data/lib/wechat/callback/random_byte_array.rb

@@ -0,0 +1,9 @@
+class Wechat::Callback::RandomByteArray
+
+  LENGTH = 16
+
+  def self.create(length)
+    [*0..255].sample length
+  end
+
+end

data/lib/wechat/callback/secure_message.rb

@@ -0,0 +1,46 @@
+class Wechat::Callback::SecureMessage
+
+  RANDOM_LENGTH   = 16
+  XML_SIZE_LENGTH = 4
+
+  # 消息加解密
+  # http://mp.weixin.qq.com/wiki/6/90f7259c0d0739bbb41d9f4c4c8e59a2.html
+  #
+  # random(16B) + msg_len(4B) + msg + $AppId + padding
+  # padding: AES采用CBC模式，秘钥长度为32个字节，数据采用PKCS#7填充；PKCS#7：K为秘钥字节数（采用32），buf为待加密的内容，N为其字节数。Buf需要被填充为K的整数倍。在buf的尾部填充(K-N%K)个字节，每个字节的内容是(K- N%K)； 
+  # 去掉rand_msg头部的16个随机字节，4个字节的msg_len,和尾部的$AppId即为最终的xml消息体
+  def self.load(message_decryption)
+
+    random_bytes = message_decryption[0..(RANDOM_LENGTH-1)].bytes
+    xml_size     = message_decryption[RANDOM_LENGTH..(RANDOM_LENGTH+XML_SIZE_LENGTH-1)].reverse.unpack('l').first
+
+    text_decryption = message_decryption.bytes[(RANDOM_LENGTH+XML_SIZE_LENGTH)..(message_decryption.length-1)]
+    xml_text        = byte_array_to_string text_decryption[0..(xml_size-1)]
+
+    padding_length = message_decryption.last.unpack('C').first
+    app_id         = byte_array_to_string text_decryption[xml_size..(text_decryption.length-1-padding_length)]
+    padding_bytes  = text_decryption[(text_decryption.length-padding_length)..(text_decryption.length-1)]
+
+    [ random_bytes, xml_size, xml_text, app_id, padding_bytes ]
+
+  end
+
+  # 消息加解密
+  # http://mp.weixin.qq.com/wiki/6/90f7259c0d0739bbb41d9f4c4c8e59a2.html
+  # 
+  # random(16B) + msg_len(4B) + msg + $AppId + padding
+  # padding: AES采用CBC模式，秘钥长度为32个字节，数据采用PKCS#7填充；PKCS#7：K为秘钥字节数（采用32），buf为待加密的内容，N为其字节数。Buf需要被填充为K的整数倍。在buf的尾部填充(K-N%K)个字节，每个字节的内容是(K- N%K)； 
+  # 去掉rand_msg头部的16个随机字节，4个字节的msg_len,和尾部的$AppId即为最终的xml消息体
+  def self.create(random_bytes, xml_text, app_id)
+    xml_size_bytes = [ xml_text.bytes.length ].pack('l').reverse.bytes
+    buffer         = random_bytes+xml_size_bytes+xml_text.bytes+app_id.bytes
+    padding_length = 32-buffer.length%32
+    buffer         += [ padding_length ]*padding_length
+    byte_array_to_string buffer
+  end
+
+  def self.byte_array_to_string(bytes)
+    bytes.inject('') do |buffer, byte| buffer += [ byte ].pack 'C' end
+  end
+
+end

data/lib/wechat/callback/version.rb

@@ -1,5 +1,5 @@
 module Wechat
   module Callback
-    VERSION = '0.2'.freeze
+    VERSION = '0.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-callback
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,8 @@ files:
 - lib/wechat/callback/message_decryption.rb
 - lib/wechat/callback/message_encryption.rb
 - lib/wechat/callback/message_signature.rb
+- lib/wechat/callback/random_byte_array.rb
+- lib/wechat/callback/secure_message.rb
 - lib/wechat/callback/signature.rb
 - lib/wechat/callback/version.rb
 - lib/wechat/callback/xml_document.rb