we_whisper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a56a0106dba9c9dec08902dab5edc2b149e2413
-  data.tar.gz: 6559b472e8beae2752e28dae4af52b996af1dcaf
+  metadata.gz: ef0014125cbf072561dad5656b85ebad5bcad239
+  data.tar.gz: 02cda09f0da1d9d7c3b7da424100cbfd0e2079fd
 SHA512:
-  metadata.gz: 0ce8d458f5ec1faa48f54fdaefe2cc3b35fffa5bd2f7a540ea182e5e5c400d10593dc8dcf5abdb333de09f5f00c1d3e03fa26226d5474063f2c1f111b905841f
-  data.tar.gz: 6f2c2d9c94c1368b56ef0f7cec5471d30b2b907f8b4062572e68399c8878ff5fbeb1f783a5331151da4f40ed0c15b7f9221391cbd35c826d95fde36883847fe9
+  metadata.gz: 442bf44e4f99d8f26620c3b26640c6a7aa8f524ba88067e9697b23151baef2ec7140590565aec3559a8110cdb67de238c30360e75b1a8f32425c108b4e1ad298
+  data.tar.gz: 5f41b5bb2da81e29cdd82036f34ebf30079ae1b2cf7a9e06f7fdc14077b758959a27f80642077ec93d26fe779990f740cf0b113e18ffd1238cbb0df3adaccf85

data/lib/we_whisper/cipher.rb

@@ -10,7 +10,7 @@ module WeWhisper
     BLOCK_SIZE = 32
     CIPHER = 'AES-256-CBC'.freeze
 
-    def encrypt(plain, encoding_aes_key)
+    def cipher_encrypt(plain, encoding_aes_key)
       cipher = OpenSSL::Cipher.new(CIPHER)
       cipher.encrypt
 
@@ -22,7 +22,7 @@ module WeWhisper
       cipher.update(plain) + cipher.final
     end
 
-    def decrypt(msg, encoding_aes_key)
+    def cipher_decrypt(msg, encoding_aes_key)
       cipher = OpenSSL::Cipher.new(CIPHER)
       cipher.decrypt
 

data/lib/we_whisper/cryptor.rb

@@ -0,0 +1,72 @@
+require_relative 'cipher'
+
+module WeWhisper
+  class Cryptor
+    include Cipher
+
+    attr_reader :value
+
+    def self.encrypt(content, appid, encoding_aes_key)
+      new(content).encrypt(appid, encoding_aes_key)
+    end
+
+    def self.decrypt(encrypted_content, encoding_aes_key)
+      new(encrypted_content).decrypt(encoding_aes_key)
+    end
+
+    def initialize(content)
+      @value = content
+      self
+    end
+
+    def encrypt(appid, encoding_aes_key)
+      pack_with_appid(appid)
+        .encrypt_with_aes_key(encoding_aes_key)
+        .encode()
+        .value
+    end
+
+    def decrypt(encoding_aes_key)
+      decode()
+        .decrypt_with_aes_key(encoding_aes_key)
+        .unpack_with_appid()
+        .value
+    end
+
+    protected
+
+    def decode
+      @value = Base64.decode64(@value)
+      self
+    end
+
+    def decrypt_with_aes_key(encoding_aes_key)
+      @value = cipher_decrypt(@value, encoding_aes_key)
+      self
+    end
+
+    def unpack_with_appid
+      @value = unpack(@value)
+      self
+    end
+
+    # pack
+    def pack_with_appid(appid)
+      @value = pack(@value, appid)
+      self
+    end
+
+    # encrypt
+    def encrypt_with_aes_key(encoding_aes_key)
+      @value = cipher_encrypt(@value, encoding_aes_key)
+      self
+    end
+
+    # encode
+    def encode
+      @value = Base64.strict_encode64(@value)
+      self
+    end
+
+  end
+end

data/lib/we_whisper/signature.rb

@@ -3,9 +3,8 @@ require 'digest/sha2'
 module WeWhisper
   module Signature
     def self.sign(token, timestamp, nonce, encrypted)
-      array = [token, timestamp, nonce]
-      array << encrypted unless encrypted.nil?
-      Digest::SHA1.hexdigest array.compact.collect(&:to_s).sort.join
+      Digest::SHA1.hexdigest \
+        [token, timestamp, nonce, encrypted].compact.collect(&:to_s).sort.join
     end
   end
 end

data/lib/we_whisper/version.rb

@@ -1,3 +1,3 @@
 module WeWhisper
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/we_whisper/whisper.rb

@@ -3,6 +3,7 @@ require 'base64'
 require_relative 'cipher'
 require_relative 'signature'
 require_relative 'message'
+require_relative 'cryptor'
 
 module WeWhisper
   InvalidSignature = Class.new StandardError
@@ -37,7 +38,7 @@ module WeWhisper
 
       # 3. Decode and decrypt the encrypted text
       decrypted_message, decrypted_appid = \
-        unpack(decrypt(Base64.decode64(encrypted_text), encoding_aes_key))
+        Cryptor.decrypt(encrypted_text, encoding_aes_key)
 
       if options[:assert_appid]
         raise AppIdNotMatch if decrypted_appid != appid
@@ -48,7 +49,7 @@ module WeWhisper
 
     def encrypt_message(message, nonce, timestamp)
       # 1. Encrypt and encode the xml message
-      encrypt = Base64.strict_encode64(encrypt(pack(message, appid), encoding_aes_key))
+      encrypt = Cryptor.encrypt(message, appid, encoding_aes_key)
 
       # 2. Create signature
       sign = Signature.sign(token, timestamp, nonce, encrypt)

data/spec/we_whisper/cryptor_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe WeWhisper::Cryptor do
+
+  let(:timestamp) { "1415979516" }
+  let(:nonce)     { "1320562132" }
+  let(:appid)     { "wx2c2769f8efd9abc2" }
+  let(:aes_key)   { "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG" }
+  let(:signature) { "096d8cda45e4678ca23460f6b8cd281b3faf1fc3" }
+  let(:encrypted) { "3kKZ++U5ocvIF8dAHPct7xvUqEv6vplhuzA8Vwj7OnVcBu9fdmbbI41zclSfKqP6/bdYAxuE3x8jse43ImHaV07siJF473TsXhl8Yt8task0n9KC7BDA73mFTwlhYvuCIFnU6wFlzOkHyM5Bh2qpOHYk5nSMRyUG4BwmXpxq8TvLgJV1jj2DXdGW4qdknGLfJgDH5sCPJeBzNC8j8KtrJFxmG7qIwKHn3H5sqBf6UqhXFdbLuTWL3jwE7yMLhzOmiHi/MX/ZsVQ7sMuBiV6bW0wkgielESC3yNUPo4q/RMAFEH0fRLr76BR5Ct0nUbf9PdClc0RdlYcztyOs54X/KLbYRNCQ2kXxmJYL6ekdNe70PCAReIEfXEp+pGpry4ss8bD6LKAtNvBJUwHshZe6sbf+fOiDiuKEqp1wdQLmgN+8nX62LklySWr8QrNCpsmKClxco0kbVYNX/QVh5yd0UA1sAqIn6baZ9G+Z/OXG+Q4n9lUuzLprLhDBPaCvXm4N14oqXNcw7tqU2xfhYNIDaD72djyIc/4eyAi2ZsJ+3hb+jgiISR5WVveRWYYqGZGTW3u+27JiXEo0fs3DQDbGVIcYxaMgU/RRIDdXzZSFcf6Z1azjzCDyV9FFEsicghHn" }
+  let(:message)   { "<xml><ToUserName><![CDATA[oia2TjjewbmiOUlr6X-1crbLOvLw]]></ToUserName><FromUserName><![CDATA[gh_7f083739789a]]></FromUserName><CreateTime>1407743423</CreateTime><MsgType>  <![CDATA[video]]></MsgType><Video><MediaId><![CDATA[eYJ1MbwPRJtOvIEabaxHs7TX2D-HV71s79GUxqdUkjm6Gs2Ed1KF3ulAOA9H1xG0]]></MediaId><Title><![CDATA[testCallBackReplyVideo]]></Title><Description><![CDATA[testCallBackReplyVideo]]></Description></Video></xml>" }
+  let(:encrypted_message) {
+    """<xml>
+<Encrypt><![CDATA[3kKZ++U5ocvIF8dAHPct7xvUqEv6vplhuzA8Vwj7OnVcBu9fdmbbI41zclSfKqP6/bdYAxuE3x8jse43ImHaV07siJF473TsXhl8Yt8task0n9KC7BDA73mFTwlhYvuCIFnU6wFlzOkHyM5Bh2qpOHYk5nSMRyUG4BwmXpxq8TvLgJV1jj2DXdGW4qdknGLfJgDH5sCPJeBzNC8j8KtrJFxmG7qIwKHn3H5sqBf6UqhXFdbLuTWL3jwE7yMLhzOmiHi/MX/ZsVQ7sMuBiV6bW0wkgielESC3yNUPo4q/RMAFEH0fRLr76BR5Ct0nUbf9PdClc0RdlYcztyOs54X/KLbYRNCQ2kXxmJYL6ekdNe70PCAReIEfXEp+pGpry4ss8bD6LKAtNvBJUwHshZe6sbf+fOiDiuKEqp1wdQLmgN+8nX62LklySWr8QrNCpsmKClxco0kbVYNX/QVh5yd0UA1sAqIn6baZ9G+Z/OXG+Q4n9lUuzLprLhDBPaCvXm4N14oqXNcw7tqU2xfhYNIDaD72djyIc/4eyAi2ZsJ+3hb+jgiISR5WVveRWYYqGZGTW3u+27JiXEo0fs3DQDbGVIcYxaMgU/RRIDdXzZSFcf6Z1azjzCDyV9FFEsicghHn]]></Encrypt>
+<MsgSignature><![CDATA[096d8cda45e4678ca23460f6b8cd281b3faf1fc3]]></MsgSignature>
+<TimeStamp>1415979516</TimeStamp>
+<Nonce><![CDATA[1320562132]]></Nonce>
+</xml>"""
+  }
+
+  it "decrypts message" do
+    decrypted, decrypted_appid = WeWhisper::Cryptor.decrypt(encrypted, aes_key)
+    expect(decrypted_appid).to eq 'wx2c2769f8efd9abc2'
+    expect(decrypted).to eq message
+  end
+
+  it "encryptes message" do
+    expect(SecureRandom).to receive(:hex).with(8).and_return("HLFOQjbkfgUh46s8")
+    _encrypted = WeWhisper::Cryptor.encrypt(message, appid, aes_key)
+    expect(_encrypted).to eq encrypted
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: we_whisper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Qi He
@@ -33,12 +33,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/we_whisper/cipher.rb
+- lib/we_whisper/cryptor.rb
 - lib/we_whisper/message.rb
 - lib/we_whisper/signature.rb
 - lib/we_whisper/version.rb
 - lib/we_whisper/whisper.rb
 - lib/we_whisper.rb
 - spec/spec_helper.rb
+- spec/we_whisper/cryptor_spec.rb
 - spec/we_whisper/message_spec.rb
 - spec/we_whisper/signature_spec.rb
 - spec/we_whisper/whisper_spec.rb
@@ -68,6 +70,7 @@ specification_version: 4
 summary: A Ruby Wrapper for Wechat Message Encryption.
 test_files:
 - spec/spec_helper.rb
+- spec/we_whisper/cryptor_spec.rb
 - spec/we_whisper/message_spec.rb
 - spec/we_whisper/signature_spec.rb
 - spec/we_whisper/whisper_spec.rb