From f8e7d3f313b369d626b9ab1738064dffee417bad Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 5 Aug 2010 11:14:40 -0700
Subject: [PATCH] RS, IZ; Rolling back special casing of friend-request
---
app/models/request.rb | 9 ++-------
lib/encryptable.rb | 8 ++------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/app/models/request.rb b/app/models/request.rb
index 78ae9d9ceb..f39d1267fb 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -41,16 +41,11 @@ class Request
#ENCRYPTION
before_validation :sign_if_mine
- validates_true_for :creator_signature, :logic => lambda {verify_exported_signature}
+ validates_true_for :creator_signature, :logic => lambda {self.verify_creator_signature}
xml_accessor :creator_signature
key :creator_signature, String
-
- def verify_exported_signature
- self.verify_signature_from_key(creator_signature,
- OpenSSL::PKey::RSA.new(exported_key))
- end
-
+
def signable_accessors
accessors = self.class.roxml_attrs.collect{|definition|
definition.accessor}
diff --git a/lib/encryptable.rb b/lib/encryptable.rb
index 0d1eef6432..4d352971e8 100644
--- a/lib/encryptable.rb
+++ b/lib/encryptable.rb
@@ -18,15 +18,11 @@
return false
end
Rails.logger.info("Verifying sig on #{signable_string} from person #{person.real_name}")
- verify_signature_from_key(signature, person.key)
- end
-
- def verify_signature_from_key signature, key
- validity = key.verify "SHA", Base64.decode64(signature), signable_string
+ validity = person.key.verify "SHA", Base64.decode64(signature), signable_string
Rails.logger.info("Validity: #{validity}")
validity
end
-
+
protected
def sign_if_mine
if self.person == User.owner
--
GitLab