nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed depricated non-encrypted author info fields from salmon

Browse source
This commit is contained in:
ilya 2010-10-06 23:20:28 -07:00
parent 131e905322
commit bb6866fa0f
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/salmon/salmon.rb
View file

@ -63,6 +63,7 @@ module Salmon
### Header ## ### Header ##
decrypted_header = user.decrypt(doc.search('encrypted_header').text) decrypted_header = user.decrypt(doc.search('encrypted_header').text)
header_doc = Nokogiri::XML(decrypted_header) header_doc = Nokogiri::XML(decrypted_header)
slap.author_email= header_doc.search('uri').text.split("acct:").last
slap.aes_key = header_doc.search('aes_key').text slap.aes_key = header_doc.search('aes_key').text
slap.iv = header_doc.search('iv').text slap.iv = header_doc.search('iv').text
@ -81,8 +82,6 @@ module Salmon
raise ArgumentError, "Magic Signature data must be signed with RSA-SHA256, was #{slap.magic_sig.alg}" unless 'RSA-SHA256' == slap.magic_sig.alg raise ArgumentError, "Magic Signature data must be signed with RSA-SHA256, was #{slap.magic_sig.alg}" unless 'RSA-SHA256' == slap.magic_sig.alg
uri = doc.search('uri').text
slap.author_email = uri.split("acct:").last
slap slap
end end
@ -91,10 +90,6 @@ module Salmon
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<entry xmlns='http://www.w3.org/2005/Atom'> <entry xmlns='http://www.w3.org/2005/Atom'>
<encrypted_header>#{person.encrypt(decrypted_header)}</encrypted_header> <encrypted_header>#{person.encrypt(decrypted_header)}</encrypted_header>
<author>
<name>#{@author.real_name}</name>
<uri>acct:#{@author.diaspora_handle}</uri>
</author>
#{@magic_sig.to_xml} #{@magic_sig.to_xml}
</entry> </entry>
ENTRY ENTRY