weixin_message_encryptor 0.1.0 → 0.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 078898dc51a1a01e6f218666e45cb126ba076b54
-  data.tar.gz: af1e9443ae0b895c73c37e9f813d4f63cb547a3c
+  metadata.gz: b6049b7499b256402b46ba5a334a17da04973d3d
+  data.tar.gz: 50e24af04daa67cf41f71a9bb5c0eb4ef4d2c7e5
 SHA512:
-  metadata.gz: f6940aff753c0d4488bd1b4df4147e0ba9e1f5e84f249a4e064f2f638aff1735ad59192f8f6ab220fa0d0aacfef10ef73458635c607f64cbc121f2b04747738b
-  data.tar.gz: ba660926e5f548e659a7c74242a5fdedaf89ae116125df37f7cf415b3c392d9c267a3d76b5bf363eeb945d474621ad0be039c984c2a3efdfb5f51345388d7457
+  metadata.gz: 2020b76bcd5a7af06b99e81981b1b3e449d541838010c46dc9d3f920b76dbf4a1a5d813f58255f0229f588899c2a361c999f254f17f58088b4f47cd554c2a848
+  data.tar.gz: 7078ee2f92369d1929b2e32a07cc33ca9806ad4726f07cb329cb47ea0f6010758a731ea2e19590e9b1868a71044d908839a5cda36d6ffc7959a637798b712e91

data/lib/weixin_message_encryptor.rb

@@ -17,27 +17,19 @@ class WeixinMessageEncryptor
   end
 
   def encrypt(payload)
-    encrypted_payload = aes_encrypt(payload).delete("\n")
-    encrypted_message(encrypted_payload)
+    aes_encrypt(payload).delete("\n")
   end
 
-  def decrypt(payload)
-    encrypted_payload = payload['echostr'] || payload['xml']['Encrypt']
-    sign = generate_signature encrypted_payload, payload['timestamp'], payload['nonce']
-    message, app_id = decrypt_payload encrypted_payload
-    return message, app_id, sign
-  end
-
-  private
-
-  def aes_key
-    @aes_key ||= Base64.decode64 encoding_aes_key + '='
-  end
-
-  def encrypted_message(encrypted_payload)
+  def encrypt_with_signature(payload)
+    encrypted_payload = encrypt(payload)
     timestamp = Time.now.to_i.to_s
     nonce = SecureRandom.hex(8)
     signature = generate_signature(encrypted_payload, timestamp, nonce)
+    return [encrypted_payload, timestamp, nonce, signature]
+  end
+
+  def encrypt_to_xml(payload)
+    encrypted_payload, timestamp, nonce, signature = encrypt_with_signature(payload)
     <<XML
 <xml>
 <Encrypt><![CDATA[#{encrypted_payload}]]></Encrypt>
@@ -48,6 +40,19 @@ class WeixinMessageEncryptor
 XML
   end
 
+  def decrypt(payload)
+    encrypted_payload = payload['echostr'] || payload['xml']['Encrypt']
+    sign = generate_signature encrypted_payload, payload['timestamp'], payload['nonce']
+    message, app_id = decrypt_payload encrypted_payload
+    return message, app_id, sign
+  end
+
+  private
+
+  def aes_key
+    @aes_key ||= Base64.decode64 encoding_aes_key + '='
+  end
+
   def decrypt_payload(encrypted_payload)
     text = Base64.decode64 encrypted_payload
     text = handle_cipher(:decrypt, text)

data/lib/weixin_message_encryptor/version.rb

@@ -1,3 +1,3 @@
 class WeixinMessageEncryptor
-  VERSION = '0.1.0'
+  VERSION = '0.1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_message_encryptor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.1
 platform: ruby
 authors:
 - FENG Zhichao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A simple tool to decrypt and encrypt Weixin messages.