witness 2.0.0 → 2.1.0

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/witness/base.rb

@@ -2,19 +2,21 @@ module Witness
   class Base
     VALID_TYPES = [:string, :integer, :symbol]
 
-    class_inheritable_accessor :actions, :presence, :columns
+    class_inheritable_accessor :actions, :columns, :validates_presence, :validates_signature
 
-    self.actions  ||= []
-    self.columns  ||= {}
-    self.presence ||= {}
+    self.actions             ||= []
+    self.columns             ||= {}
+    self.validates_presence  ||= {}
+    self.validates_signature ||= {}
 
     def self.action(*action_names)
       [*action_names].each do |action_name|
         self.actions << action_name.to_sym
 
         class_eval <<-end_eval
-          def self.#{action_name.to_sym}(provided_params)
+          def self.#{action_name.to_sym}(provided_params, key = nil)
             command = "#{action_name}".to_sym
+            provided_params.merge!(:key => key) if key.present?
             construct(provided_params.update(:command => command))
           end
         end_eval
@@ -35,14 +37,30 @@ module Witness
       configuration.update(attr_names.extract_options!)
 
       [*configuration[:on]].each do |on|
-        self.presence[on] ||= []
+        self.validates_presence[on] ||= []
 
         [*attr_names].each do |attr_name|
-          self.presence[on] << attr_name
+          self.validates_presence[on] << attr_name
         end
       end
     end
 
+    def self.validates_signature_of(*attr_names)
+      configuration = { :on => self.actions }
+      configuration.update(attr_names.extract_options!)
+
+      [*configuration[:on]].each do |on|
+        self.validates_signature[on] ||= []
+
+        [*attr_names].each do |attr_name|
+          self.validates_signature[on] << attr_name
+        end
+      end
+
+      column :signature
+      column :key
+    end
+
     protected :initialize
 
     private
@@ -54,7 +72,7 @@ module Witness
 
         self.columns.each do |column, configuration|
           if provided_params[column] == nil || provided_params[column] == ""
-            if self.presence[command] && self.presence[command].include?(column)
+            if self.validates_presence[command] && self.validates_presence[command].include?(column)
               raise Witness::Error, "#{configuration[:name]} not set"
             end
           else
@@ -82,6 +100,32 @@ module Witness
           end
         end
 
+        if self.validates_signature[command]
+
+          if provided_params[:key].blank?
+            raise Witness::Error, "Key not set"
+          end
+
+          if provided_params[:signature].blank?
+            raise Witness::Error, "Signature not set"
+          end
+
+          secure_params = {}
+
+          self.validates_signature[command].each do |key|
+            secure_params[key] = provided_params[key]
+          end
+
+          sigil = Sigil::Base.new(secure_params, provided_params[:key])
+
+          verified = sigil.verify(provided_params[:signature])
+
+          if !verified
+            raise Witness::Error, "Signature does not match"
+          end
+
+        end
+
         result
       end
 

data/spec/support/sample_verification_response.rb

@@ -8,12 +8,11 @@ class SampleVerificationResponse < Witness::Base
   column :receive_contact_url, :name => "Receive Contact URL"
   column :contact_id, :type => :integer, :name => "Contact ID"
   column :authorized, :type => :boolean, :name => "Authorization"
-  column :key
 
-  validates_presence_of :slice_slug, :request_url, :contact_id, :key
+  validates_presence_of :slice_slug, :request_url, :contact_id
   validates_presence_of :receive_contact_url, :on => :generate
 
-  attr_accessor :signature
+  validates_signature_of :slice_slug, :contact_id, :secure_area_id, :authorized, :request_url, :on => :receive
 
   def url
     Witness.update_url(receive_contact_url, params)
@@ -36,27 +35,4 @@ class SampleVerificationResponse < Witness::Base
     _params.update(:signature => sigil.signature).reject { |k, v| v.nil? }
   end
 
-  def self.construct(provided_params)
-    response = super(provided_params)
-
-    command = provided_params[:command]
-
-    if command == :receive
-      if provided_params[:signature].blank?
-        raise Witness::Error, "Signature not set"
-      end
-
-      sigil = Sigil::Base.new(response.secure_params, response.key)
-
-      verified = sigil.verify(provided_params[:signature])
-
-      if !verified
-        raise Witness::Error, "Signature does not match"
-      end
-
-    end
-
-    response
-  end
-
 end

data/spec/witness/sample_verification_response_spec.rb

@@ -53,11 +53,6 @@ describe SampleVerificationResponse do
         lambda { SampleVerificationResponse.generate(@valid_generate_params) }.should raise_error(Witness::Error, /Contact ID not set/)
       end
 
-      it "should raise an error if Key is not set" do
-        @valid_generate_params.delete(:key)
-        lambda { SampleVerificationResponse.generate(@valid_generate_params) }.should raise_error(Witness::Error, /Key not set/)
-      end
-
       it "should recognise true authorizations" do
         @valid_generate_params[:authorized] = true
         response = SampleVerificationResponse.generate(@valid_generate_params)
@@ -124,13 +119,14 @@ describe SampleVerificationResponse do
   describe "receive" do
 
     before do
+      @key = "deadbeef"
+
       @valid_generate_params = {
         :slice_slug => "banana",
         :secure_area_id => 42,
         :request_url => "http://www.example.com/secure",
         :contact_id => 1234,
         :authorized => true,
-        :key => "deadbeef",
         :signature => "ffb581dbdf4d72f2c3c4d61af2fbaaa6fbcf66af",
       }
     end
@@ -138,27 +134,31 @@ describe SampleVerificationResponse do
     describe "initialization" do
 
       it "should generate" do
-        SampleVerificationResponse.receive(@valid_generate_params)
+        SampleVerificationResponse.receive(@valid_generate_params, @key)
       end
 
       it "should raise an error if Slice slug is not set" do
         @valid_generate_params.delete(:slice_slug)
-        lambda { SampleVerificationResponse.receive(@valid_generate_params) }.should raise_error(Witness::Error, /Slice not set/)
+        lambda { SampleVerificationResponse.receive(@valid_generate_params, @key) }.should raise_error(Witness::Error, /Slice not set/)
       end
 
       it "should raise an error if Request URL is not set" do
         @valid_generate_params.delete(:request_url)
-        lambda { SampleVerificationResponse.receive(@valid_generate_params) }.should raise_error(Witness::Error, /Request URL not set/)
+        lambda { SampleVerificationResponse.receive(@valid_generate_params, @key) }.should raise_error(Witness::Error, /Request URL not set/)
       end
 
       it "should raise an error if Signature is not set" do
         @valid_generate_params.delete(:signature)
-        lambda { SampleVerificationResponse.receive(@valid_generate_params) }.should raise_error(Witness::Error, /Signature not set/)
+        lambda { SampleVerificationResponse.receive(@valid_generate_params, @key) }.should raise_error(Witness::Error, /Signature not set/)
       end
 
       it "should raise an error if Signature does not match" do
         @valid_generate_params[:signature] = "incorrect"
-        lambda { SampleVerificationResponse.receive(@valid_generate_params) }.should raise_error(Witness::Error, /Signature does not match/)
+        lambda { SampleVerificationResponse.receive(@valid_generate_params, @key) }.should raise_error(Witness::Error, /Signature does not match/)
+      end
+
+      it "should raise an error if Key is not set" do
+        lambda { SampleVerificationResponse.receive(@valid_generate_params, "" )  }.should raise_error(Witness::Error, /Key not set/)
       end
 
     end

data/witness.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{witness}
-  s.version = "2.0.0"
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Hoeksema"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2010-12-13}
   s.description = %q{Witness}
   s.email = %q{steve@seven.net.nz}
   s.extra_rdoc_files = [

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Steve Hoeksema
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +13:00
+date: 2010-12-13 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 447726333830718148
+      hash: -3102975516984677801
       segments: 
       - 0
       version: "0"