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

RS, DG; Cleaned up the switch in user.receive

Browse source
This commit is contained in:
Raphael 2010-08-11 16:01:16 -07:00
parent bee71c5a23
commit 0907d7a9fd
5 changed files with 39 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/publics_controller.rb
View file

@ -25,7 +25,7 @@ class PublicsController < ApplicationController
def receive def receive
@user = Person.first(:id => params[:id]).owner @user = Person.first(:id => params[:id]).owner
Rails.logger.debug "PublicsController has received: #{params[:xml]}" Rails.logger.debug "PublicsController has received: #{params[:xml]}"
@user.receive params[:xml] @user.receive params[:xml] if params[:xml]
render :nothing => true render :nothing => true
end end

8
app/models/user.rb
View file

@ -120,7 +120,7 @@ class User
###### Receiving ####### ###### Receiving #######
def receive xml def receive xml
object = Diaspora::Parser.parse_from_xml(xml) object = Diaspora::Parser.from_xml(xml)
Rails.logger.debug("Receiving object:\n#{object.inspect}") Rails.logger.debug("Receiving object:\n#{object.inspect}")
if object.is_a? Retraction if object.is_a? Retraction
@ -128,7 +128,7 @@ class User
object.perform object.perform
elsif object.is_a? Request elsif object.is_a? Request
person = get_or_create_person_object_from_xml( xml ) person = Diaspora::Parser.get_or_create_person_object_from_xml( xml )
person.serialized_key ||= object.exported_key person.serialized_key ||= object.exported_key
object.person = person object.person = person
object.person.save object.person.save
@ -136,10 +136,10 @@ class User
receive_friend_request(object) receive_friend_request(object)
elsif object.is_a? Profile elsif object.is_a? Profile
person = Diaspora::Parser.parse_owner_id_from_xml xml person = Diaspora::Parser.owner_id_from_xml xml
person.profile = object person.profile = object
person.save person.save
elsif object.respond_to?(:person) && !(object.person.nil?) && !(object.person.is_a? User) else
Rails.logger.debug("Saving object with success: #{object.save}") Rails.logger.debug("Saving object with success: #{object.save}")
end end
end end

14
lib/diaspora/parser.rb
View file

@ -1,17 +1,12 @@
module Diaspora module Diaspora
module Parser module Parser
def parse_body_contents_from_xml(xml) def self.owner_id_from_xml(xml)
doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks }
doc.xpath("/XML/post")
end
def parse_owner_id_from_xml(xml)
doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks } doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks }
id = doc.xpath("//person_id").text.to_s id = doc.xpath("//person_id").text.to_s
Person.first(:id => id) Person.first(:id => id)
end end
def get_or_create_person_object_from_xml(xml) def self.get_or_create_person_object_from_xml(xml)
doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks } doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks }
person_xml = doc.xpath("//request/person").to_s person_xml = doc.xpath("//request/person").to_s
person_id = doc.xpath("//request/person/_id").text.to_s person_id = doc.xpath("//request/person/_id").text.to_s
@ -19,9 +14,10 @@ module Diaspora
person ? person : Person.from_xml( person_xml) person ? person : Person.from_xml( person_xml)
end end
def parse_from_xml(xml) def self.from_xml(xml)
return unless body = parse_body_contents_from_xml(xml).children.first doc = Nokogiri::XML(xml) { |cfg| cfg.noblanks }
return unless body = doc.xpath("/XML/post").children.first
begin begin
body.name.camelize.constantize.from_xml body.to_s body.name.camelize.constantize.from_xml body.to_s

58
spec/lib/diaspora_parser_spec.rb
View file

@ -10,29 +10,35 @@ describe Diaspora::Parser do
@user = Factory.create(:user, :email => "bob@aol.com") @user = Factory.create(:user, :email => "bob@aol.com")
@person = Factory.create(:person_with_private_key, :email => "bill@gates.com") @person = Factory.create(:person_with_private_key, :email => "bill@gates.com")
end end
describe 'with encryption' do
before do
unstub_mocha_stubs
end
after do
stub_signature_verification
end
it "should not store posts from me" do
10.times {
message = Factory.build(:status_message, :person => @user)
xml = message.to_diaspora_xml
@user.receive xml
}
StatusMessage.count.should == 0
end
it "should reject xml with no sender" do
xml = "<XML>
<head>
</head>
<post><status_message>\n <message>Here is another message</message>\n <owner>a@a.com</owner>\n <snippet>a@a.com</snippet>\n <source>a@a.com</source>\n</status_message></post>
<post><person></person></post>
<post><status_message>\n <message>HEY DUDE</message>\n <owner>a@a.com</owner>\n <snippet>a@a.com</snippet>\n <source>a@a.com</source>\n</status_message></post>
</XML>"
@user.receive xml
Post.count.should == 0
it "should not store posts from me" do end
10.times { end
message = Factory.build(:status_message, :person => @user)
xml = message.to_diaspora_xml
@user.receive xml
}
StatusMessage.count.should == 0
end
it "should reject xml with no sender" do
xml = "<XML>
<head>
</head>
<post><status_message>\n <message>Here is another message</message>\n <owner>a@a.com</owner>\n <snippet>a@a.com</snippet>\n <source>a@a.com</source>\n</status_message></post>
<post><person></person></post>
<post><status_message>\n <message>HEY DUDE</message>\n <owner>a@a.com</owner>\n <snippet>a@a.com</snippet>\n <source>a@a.com</source>\n</status_message></post>
</XML>"
@user.receive xml
Post.count.should == 0
end
it 'should discard types which are not of type post' do it 'should discard types which are not of type post' do
xml = "<XML> xml = "<XML>
<post><person></person></post> <post><person></person></post>
@ -47,12 +53,6 @@ describe Diaspora::Parser do
before do before do
@xml = Factory.build(:status_message).to_diaspora_xml @xml = Factory.build(:status_message).to_diaspora_xml
end end
it 'should be able to parse the body\'s contents' do
body = parse_body_contents_from_xml(@xml).to_s
body.should include "<post>"
body.should include "</post>"
end
it 'should be able to correctly handle comments' do it 'should be able to correctly handle comments' do
person = Factory.create(:person, :email => "test@testing.com") person = Factory.create(:person, :email => "test@testing.com")
@ -60,7 +60,7 @@ describe Diaspora::Parser do
comment = Factory.build(:comment, :post => post, :person => person, :text => "Freedom!") comment = Factory.build(:comment, :post => post, :person => person, :text => "Freedom!")
xml = comment.to_diaspora_xml xml = comment.to_diaspora_xml
comment = parse_from_xml(xml) comment = Diaspora::Parser.from_xml(xml)
comment.text.should == "Freedom!" comment.text.should == "Freedom!"
comment.person.should == person comment.person.should == person
comment.post.should == post comment.post.should == post

2
spec/models/user_spec.rb
View file

@ -1,7 +1,5 @@
require File.dirname(__FILE__) + '/../spec_helper' require File.dirname(__FILE__) + '/../spec_helper'
include Diaspora::Parser
describe User do describe User do
before do before do
@user = Factory.create(:user) @user = Factory.create(:user)