wechat-validator 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52c70d489e2f730f37e5156c281389eefdd482b3
-  data.tar.gz: 07faf1150db584263433821e3e2165cd310027dd
+  metadata.gz: 5109b3bbb8a3e6360b6111134b4cb85d606c6682
+  data.tar.gz: ec6a546d8312f57b5ac0f5ef1b6c00b3d590614d
 SHA512:
-  metadata.gz: e9c4b0d7f70157b86b2b5b368d9127078cc61446e5573f3ab78c5d79f69ce82e2528fba2465ebafce166f643fa2098a0fc03f062439744018e1b878091f1efaf
-  data.tar.gz: 61208f0bca87d65209c8a68f5b42e1536d3c9ae2f846db89f4040a3fa2f360a064b2bf73fce9b789404e43d0266a1d1805e805505058cce9baf0c4c7b3226512
+  metadata.gz: 8e46448d4eb99540ceae67e5174fbdc0932d7d6ce9409f143ff5982190aa3435b070442280baab4b33b95ba852c777bfbc2c67586dfe241784aace40887b40a2
+  data.tar.gz: 6cbbb88bdafbc9aec64b8e73f642e3f93277200a7f1a16dbe866f8e8b2eed1253abb39be15bc4efc5b6cdb6d397c306bdef50e2822ef4dd825c081acaf140bcf

data/app/controllers/wechat/validator/concerns/signature_checker.rb

@@ -46,6 +46,9 @@ module Wechat
             value.present?
           end
 
+          deprecate check_signature: :'Wechat::Validator::Concerns::SignatureValidator.validate_signature', deprecator: ActiveSupport::Deprecation.new('1.0', 'wechat-validator')
+          deprecate check_parameter: :'Wechat::Validator::Concerns::SignatureValidator.validate_parameter', deprecator: ActiveSupport::Deprecation.new('1.0', 'wechat-validator')
+
         end
 
         module ClassMethods

data/app/controllers/wechat/validator/concerns/signature_validator.rb

@@ -0,0 +1,51 @@
+module Wechat::Validator::Concerns::SignatureValidator
+
+  extend ActiveSupport::Concern
+
+  self.included do |includer|
+
+    def validate_signature(token)
+
+      if token.blank?
+        Rails.logger.warn 'Token is required to validate URL by Wechat.'
+        render status: :forbidden, text: 'The token parameter is required.'
+        return
+      end
+
+      timestamp = params[:timestamp]
+      nonce     = params[:nonce]
+      signature = params[:signature]
+      echo      = params[:echostr]
+
+      return unless validate_parameter 'timestamp', timestamp
+      return unless validate_parameter 'nonce',     nonce
+      return unless validate_parameter 'signature', signature
+      return unless validate_parameter 'echo',      echo
+
+      actual_signature  = ::Wechat::Validation::Signature.create nonce, timestamp, token # ::Wechat::Validation.sign nonce, timestamp, token
+      signature_matched = signature==actual_signature
+      Rails.logger.warn "Actual signature is #{actual_signature}, which #{signature_matched ? 'equals' : 'does not equal'} to the given signature #{signature}."
+
+      if signature_matched
+        render text: echo
+      else
+        render status: :forbidden, text: "The signature parameter '#{signature}' and the generated parameter '#{actual_signature}' is not matched."
+      end
+
+    end
+
+    def validate_parameter(name, value)
+      if value.blank?
+        Rails.logger.warn "The #{name} parameter is blank. Failed to validate URL by Wechat."
+        render status: :bad_request, text: "The #{name} parameter is required."
+      end
+      value.present?
+    end
+
+  end
+
+  module ClassMethods
+    # def method_name do end
+  end
+
+end

data/lib/wechat/validator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat-validator
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,6 +53,7 @@ files:
 - app/assets/stylesheets/wechat/validator/application.css
 - app/controllers/wechat/validator/application_controller.rb
 - app/controllers/wechat/validator/concerns/signature_checker.rb
+- app/controllers/wechat/validator/concerns/signature_validator.rb
 - app/controllers/wechat/validator/server_validations_controller.rb
 - app/helpers/wechat/validator/application_helper.rb
 - app/views/layouts/wechat/validator/application.html.erb