qy_wechat 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0406f31fb56e074f7cf19633c0430a2a13dbedd
-  data.tar.gz: 44e9e8ae54ef833ab1ba3ba9c72ddb1f07d56d1b
+  metadata.gz: 505125c4235efd523f2774164afcc1c7b7521fc9
+  data.tar.gz: f2dc205a51ea586bc357e90f3df2a7c5bee7b444
 SHA512:
-  metadata.gz: 1e1f81653a492b0b5d755a7e3b1e548e95313a38232568e4725127ac4c3ea395fae18d9c8f1b18cecc6c8580562376dabb77b70c4a4e007a6d8345f9a1f7fb3d
-  data.tar.gz: e95dddb6e3f94d51cd24cb086fdc6f7c1db1a8e8a199ad58291805752729e44b69a44bfd312be5de43e8b8bb6a5be55e5bee0368ee0c1852510bb2479ac4d5e8
+  metadata.gz: 51c856d400d5bdd48e2a62a34f889837ccfb401fba7b27c52f9c177bd128cefa2e60dd87c485431d3284fce9eb4453a943a992b400aa20cc53804ec715132be6
+  data.tar.gz: 71d41f3170e57de76cab0d64a63dff263850e9688b66b5fff27adf06946a47e24b041b5a874b8ff6a57b352dcd7efafb7345fb13942fd5f7c0d3868402f7c1cf

data/app/controllers/qy_wechat/qy_wechat_controller.rb

@@ -5,15 +5,19 @@ module QyWechat
     include ReplyMessageHelper
 
     skip_before_filter :verify_authenticity_token, only: :reply
-    before_action :setup_qy_account, only: [:verify_url, :reply]
-    before_action :setup_wechat_message, only: :reply
+    before_filter :setup_qy_app, only: [:verify_url, :reply]
+    before_filter :setup_wechat_message, only: :reply
 
     # 验证URL有效性
+    # TODO: refactor
     def verify_url
-      raise "Not Match" if not valid_msg_signature(params)
-      params.delete(:qy_secret_key)
-      content = Prpcrypt.decrypt(aes_key, params[:echostr], corp_id)
-      render text: content
+      if not valid_msg_signature(params)
+        Rails.logger.debug("#{__FILE__}:#{__LINE__} Failure because signature is invalid")
+        render text: "", status: 401
+        return
+      end
+      content, status = Prpcrypt.decrypt(aes_key, params[:echostr], corp_id)
+      render text: content, status: status
     end
 
     def reply;end
@@ -21,31 +25,33 @@ module QyWechat
     private
 
       def setup_wechat_message
-        param_xml = request.body.read
-        hash = MultiXml.parse(param_xml)['xml']
-        @body_xml = OpenStruct.new(hash)
-        hash = MultiXml.parse(Prpcrypt.decrypt(aes_key, @body_xml.Encrypt, corp_id))["xml"]
+        param_xml       = request.body.read
+        hash            = MultiXml.parse(param_xml)['xml']
+        @body_xml       = OpenStruct.new(hash)
+        content         = Prpcrypt.decrypt(aes_key, @body_xml.Encrypt, corp_id)[0]
+        hash            = MultiXml.parse(content)["xml"]
         @weixin_message = Message.factory(hash)
-        @keyword = @weixin_message.Content
+        @keyword        = @weixin_message.Content
       end
 
       def encoding_aes_key
-        @qy_account.encoding_aes_key
+        key = @qy_app.encoding_aes_key
+        raise "长度固定为43个字符" if key.length != 43
+        key
       end
 
       def qy_token
-        @qy_account.qy_token
+        @qy_app.qy_token
       end
 
       def aes_key
-        Base64.decode64(@qy_account.encoding_aes_key + "=")
+        Base64.decode64(@qy_app.encoding_aes_key + "=")
       end
 
       def corp_id
-        @qy_account.corp_id
+        @qy_app.corp_id
       end
 
-      # String signature = SHA1.getSHA1(token, timeStamp, nonce, echoStr);
       def valid_msg_signature(params)
         timestamp         = params[:timestamp]
         nonce             = params[:nonce]
@@ -53,12 +59,13 @@ module QyWechat
         msg_signature     = params[:msg_signature]
         sort_params       = [qy_token, timestamp, nonce, echo_str].sort.join
         current_signature = Digest::SHA1.hexdigest(sort_params)
-        Rails.logger.info("current_signature: #{current_signature} " )
+        Rails.logger.info("current_signature: #{current_signature} ")
         current_signature == msg_signature
       end
 
-      def setup_qy_account
-        @qy_account ||= QyWechat.qy_model.find_by(qy_secret_key: params[:qy_secret_key])
+      def setup_qy_app
+        qy_secret_key = params.delete(:qy_secret_key)
+        @qy_app ||= QyWechat.qy_model.find_by_qy_secret_key!(qy_secret_key: qy_secret_key)
       end
   end
 end

data/lib/generators/templates/add_qy_wechat_columns.rb

@@ -1,6 +1,6 @@
 class AddQyWechatColumnsTo<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
-    create_table(:<%= table_name %>) do |t|
+    change_table(:<%= table_name %>) do |t|
       t.string :qy_token
       t.string :encoding_aes_key
       t.string :corp_id

data/lib/generators/templates/qy_wechat_config.rb

@@ -1,4 +1,7 @@
+# encoding: utf-8
+
 QyWechat.configure do |config|
-  # 配置保存你企业信息的Model
-  # config.qy_account = "QyAccount"
+  # 配置保存你企业应用的Model
+  # 特别注意: 由于一个企业号，可以对应多个应用，可以根据 `corp_id` 关联到企业号应用Model。
+  # config.qy_app = "QyApp"
 end

data/lib/generators/templates/qy_wechat_controller.rb

@@ -27,4 +27,9 @@ QyWechat::QyWechatController.class_eval do
       generate_video_message(new_video(@weixin_message.MediaId, "desc", "title"))
     end
 
+    # 用于响应事件
+    def response_event_message
+      generate_text_message("响应事件")
+    end
+
 end

data/lib/qy_wechat/configuration.rb

@@ -13,12 +13,12 @@ module QyWechat
     end
 
     def qy_model_name
-      @qy_model_name ||= QyWechat.config.qy_account
+      @qy_model_name ||= QyWechat.config.qy_app
     end
 
     def qy_model
       if qy_model_name.blank?
-        raise "You need to config `qy_account` in 'config/initializers/qy_wechat_config.rb'"
+        raise "You need to config `qy_app` in 'config/initializers/qy_wechat_config.rb'"
       end
       @qy_model ||= qy_model_name.to_s.constantize
     end
@@ -26,6 +26,6 @@ module QyWechat
   end
 
   class Configuration
-    attr_accessor :qy_account
+    attr_accessor :qy_app
   end
 end

data/lib/qy_wechat/helpers/pkcs7_encoder.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module QyWechat
   module PKCS7Encoder
     extend self

data/lib/qy_wechat/helpers/prpcrypt.rb

@@ -6,16 +6,21 @@ module QyWechat
     # 对密文进行解密.
     # text 需要解密的密文
     def decrypt(aes_key, text, corpid)
-      text          = Base64.decode64(text)
-      text          = handle_cipher(:decrypt, aes_key, text)
-      result        = PKCS7Encoder.decode(text)
-      content       = result[16...result.length]
-      len_list      = content[0...4].unpack("N")
-      xml_len       = len_list[0]
-      xml_content   = content[4...4 + xml_len]
+      status = 200
+      text        = Base64.decode64(text)
+      text        = handle_cipher(:decrypt, aes_key, text)
+      result      = PKCS7Encoder.decode(text)
+      content     = result[16...result.length]
+      len_list    = content[0...4].unpack("N")
+      xml_len     = len_list[0]
+      xml_content = content[4...4 + xml_len]
       from_corpid = content[xml_len+4...content.size]
-      raise "UnMatch corpid" if corpid != from_corpid
-      xml_content
+      # TODO: refactor
+      if corpid != from_corpid
+        Rails.logger.debug("#{__FILE__}:#{__LINE__} Failure because corpid != from_corpid")
+        status = 401
+      end
+      [xml_content, status]
     end
 
     # 加密

data/lib/qy_wechat/helpers/reply_message_helper.rb

@@ -1,9 +1,8 @@
+# encoding: utf-8
+
 module QyWechat
   module ReplyMessageHelper
 
-    # e.g.
-    # generate_text_message(@weixin_message.ToUserName, @weixin_message.FromUserName, "Your Message: #{@weixin_message.Content}")
-    # Or generate_text_message("Your Message: #{@weixin_message.Content}")
     def generate_text_message(from=nil, to=nil, content)
       message = TextResponseMessage.new
       message.FromUserName = from || @weixin_message.ToUserName
@@ -21,7 +20,6 @@ module QyWechat
       item
     end
 
-    # articles = [new_article]
     def generate_news_message(from=nil, to=nil, articles)
       message = NewsResponseMessage.new
       message.FromUserName = from || @weixin_message.ToUserName
@@ -39,18 +37,6 @@ module QyWechat
       video
     end
 
-    # <xml>
-    # <ToUserName><![CDATA[toUser]]></ToUserName>
-    # <FromUserName><![CDATA[fromUser]]></FromUserName>
-    # <CreateTime>12345678</CreateTime>
-    # <MsgType><![CDATA[video]]></MsgType>
-    # <Video>
-    # <MediaId><![CDATA[media_id]]></MediaId>
-    # <Title><![CDATA[title]]></Title>
-    # <Description><![CDATA[description]]></Description>
-    # </Video>
-    # </xml>
-
     def generate_video_message(from=nil, to=nil, video)
       message = VideoResponseMessage.new
       message.FromUserName = from || @weixin_message.ToUserName
@@ -100,14 +86,13 @@ module QyWechat
         msg = EncryptMessage.new
         msg.Encrypt = encrypt_xml
         msg.TimeStamp = Time.now.to_i.to_s
-        msg.Nonce = "123"
+        msg.Nonce = SecureRandom.hex(8)
         msg.MsgSignature = generate_msg_signature(encrypt_xml, msg)
         msg.to_xml
       end
 
       # dev_msg_signature=sha1(sort(token、timestamp、nonce、msg_encrypt))
       # 生成企业签名
-      # $array = array($encrypt_msg, $token, $timestamp, $nonce);
       def generate_msg_signature(encrypt_msg, msg)
         sort_params = [encrypt_msg, qy_token, msg.TimeStamp, msg.Nonce].sort.join
         Digest::SHA1.hexdigest(sort_params)

data/lib/qy_wechat/message/message.rb

@@ -1,10 +1,5 @@
 # encoding: utf-8
-# ref: https://github.com/wolfg1969/rack-weixin/lib/weixin/model.rb
-require 'roxml'
-require 'multi_xml'
-require 'ostruct'
 
-# multi_xml will use Nokogiri if it is available
 MultiXml.parser = :nokogiri
 
 module QyWechat

data/lib/qy_wechat/message/response_message.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# ref: https://github.com/wolfg1969/rack-weixin/lib/weixin/model.rb
-require 'roxml'
 
 module QyWechat
 

data/lib/qy_wechat/version.rb

@@ -1,3 +1,3 @@
 module QyWechat
-  VERSION = "1.0.0.beta1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qy_wechat
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "微信企业版本，应答API集成"
+description: Ruby on Rails 微信企业版本，应答API集成
 email:
 - huaitao-deng@foxmail.com
 executables: []
@@ -121,14 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: "微信企业版本"
+summary: Ruby on Rails 微信企业版本
 test_files: []
 has_rdoc: