diff --git a/.gitignore b/.gitignore index dafc5e44d9b2dfc28e2bd042e6126f44a36b3b2b..d57f5a3387a0088a6448b4bf2f34d8479f786ccb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *~ .bundle db/*.sqlite3 -log/*.log +log/* tmp/**/* Gemfile.lock gpg/diaspora-development/*.gpg diff --git a/app/models/comment.rb b/app/models/comment.rb index b4f2fb2d97b46cafceb2b272d0fd2a3f490a63b8..bd72721eeb9a2329f4d15dc97f1210e654fe08d4 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -57,6 +57,11 @@ class Comment verify_signature(post_creator_signature, post.person) end + def signature_valid? + Rails.logger.warn "Received comment has person #{person.inspect}" + Rails.logger.warn "Received comment has person key #{person.serialized_key}" if person + verify_signature(creator_signature, person) && verify_signature(post_creator_signator, post.person) + end protected def sign_if_my_post diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb index bd2afb6ddb1d73ef90fd6b1812d3d1e5bc17ab5b..2a08ba76a151214e99f4d8c73479b94f58da8557 100644 --- a/spec/models/user/receive_spec.rb +++ b/spec/models/user/receive_spec.rb @@ -8,6 +8,10 @@ describe User do @user2 = Factory.create(:user) @group2 = @user2.group(:name => 'losers') + + @user3 = Factory.create(:user) + @group3 = @user3.group(:name => 'heroes') + friend_users(@user, @group, @user2, @group2) end @@ -36,11 +40,17 @@ describe User do @user.groups.size.should == num_groups end + describe 'comments' do + it 'should receive comments from unknown users' do + friend_users(@user, @group, @user2, @group2) + + status_message = @user.post, :status_message, :message => 'message', :to => @group.id + end + end describe 'post refs' do before do - @user3 = Factory.create(:user) - @group3 = @user3.group(:name => 'heroes') + end it "should add the post to that user's posts when a user posts it" do