From 3eaf4e0ba1658d61c54a0f646650f3c649cbbe75 Mon Sep 17 00:00:00 2001 From: ilya Date: Sun, 3 Oct 2010 17:33:31 -0700 Subject: [PATCH] a couple of logger lines to help debug on remote --- lib/diaspora/user/receiving.rb | 1 + lib/encryptor.rb | 1 + lib/salmon/salmon.rb | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb index a16727c26..cf4015eeb 100644 --- a/lib/diaspora/user/receiving.rb +++ b/lib/diaspora/user/receiving.rb @@ -2,6 +2,7 @@ module Diaspora module UserModules module Receiving def receive_salmon salmon_xml + Rails.logger.info("#{self.real_name} got a salmon #{salmon_xml}") salmon = Salmon::SalmonSlap.parse salmon_xml, self if salmon.verified_for_key?(salmon.author.public_key) Rails.logger.info("data in salmon: #{salmon.parsed_data}") diff --git a/lib/encryptor.rb b/lib/encryptor.rb index e9c4936e1..232b10e0f 100644 --- a/lib/encryptor.rb +++ b/lib/encryptor.rb @@ -37,6 +37,7 @@ module Encryptor module Private def decrypt cipher_json + Rails.logger.info("#{self.real_name} is JSON parsing the #{ Base64.decode64 cipher_json} ") json = JSON.parse(Base64.decode64 cipher_json) aes_key = get_aes_key json['aes_key'] aes_decrypt(json['ciphertext'], aes_key) diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb index 9ed5567c5..4258a8d88 100644 --- a/lib/salmon/salmon.rb +++ b/lib/salmon/salmon.rb @@ -62,9 +62,9 @@ module Salmon ### Header ## decrypted_header = user.decrypt(doc.search('encrypted_header').text) - header_doc = Nokogiri::XML(decrypted_header) - slap.aes_key = header_doc.search('aes_key').text - slap.iv = header_doc.search('iv').text + header_doc = Nokogiri::XML(decrypted_header) + slap.aes_key = header_doc.search('aes_key').text + slap.iv = header_doc.search('iv').text slap.magic_sig = MagicSigEnvelope.parse sig_doc