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

Merge pull request #95 from SuperTux88/fix-invalid-signatures-for-relayables

Browse source 
Fix relayable signatures for messages with invalid XML characters
This commit is contained in:
Dennis Schubert 2018-01-25 02:10:59 +01:00 committed by GitHub
commit 58de2c2bf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/diaspora_federation/entity.rb
View file

@ -277,7 +277,7 @@ module DiasporaFederation
case self.class.class_props[name] case self.class.class_props[name]
when :string when :string
value.to_s value.to_s.gsub(INVALID_XML_REGEX, "\uFFFD")
when :timestamp when :timestamp
value.nil? ? "" : value.utc.iso8601 value.nil? ? "" : value.utc.iso8601
else else
@ -310,7 +310,7 @@ module DiasporaFederation
# Create simple node, fill it with text and append to root # Create simple node, fill it with text and append to root
def simple_node(doc, name, value) def simple_node(doc, name, value)
Nokogiri::XML::Element.new(name.to_s, doc).tap do |node| Nokogiri::XML::Element.new(name.to_s, doc).tap do |node|
node.content = value.gsub(INVALID_XML_REGEX, "\uFFFD") unless value.empty? node.content = value unless value.empty?
end end
end end

16
spec/lib/diaspora_federation/entities/relayable_spec.rb
View file

@ -208,6 +208,22 @@ XML
expect(verify_signature(parent_pkey, parent_author_signature, signature_data)).to be_truthy expect(verify_signature(parent_pkey, parent_author_signature, signature_data)).to be_truthy
end end
it "computes correct signatures for the entity with invalid XML characters" do
expect_callback(:fetch_private_key, author).and_return(author_pkey)
expect_callback(:fetch_private_key, local_parent.author).and_return(parent_pkey)
invalid_property = "asdfasdf asdf💩asdf\nasdf"
signature_data_with_fixed_property = "#{author};#{guid};#{parent_guid};asdf<64>asdf asdf💩asdf\nasdf"
xml = Entities::SomeRelayable.new(hash.merge(property: invalid_property)).to_xml
author_signature = xml.at_xpath("author_signature").text
parent_author_signature = xml.at_xpath("parent_author_signature").text
expect(verify_signature(author_pkey, author_signature, signature_data_with_fixed_property)).to be_truthy
expect(verify_signature(parent_pkey, parent_author_signature, signature_data_with_fixed_property)).to be_truthy
end
it "computes correct signatures for the entity when the parent is a relayable itself" do it "computes correct signatures for the entity when the parent is a relayable itself" do
intermediate_author = Fabricate.sequence(:diaspora_id) intermediate_author = Fabricate.sequence(:diaspora_id)
parent = Fabricate(:related_entity, author: intermediate_author, local: true, parent: local_parent) parent = Fabricate(:related_entity, author: intermediate_author, local: true, parent: local_parent)