Skip to content
Extraits de code Groupes Projets
Valider 9f11a474 rédigé par Raphael's avatar Raphael
Parcourir les fichiers

Take out some logging, put in log user on receive

parent 7feb30e3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -29,7 +29,6 @@ class PublicsController < ApplicationController ...@@ -29,7 +29,6 @@ class PublicsController < ApplicationController
Rails.logger.error("Received post #{params[:xml]} for nonexistent person #{params[:id]}") Rails.logger.error("Received post #{params[:xml]} for nonexistent person #{params[:id]}")
return return
end end
Rails.logger.debug "PublicsController has received: #{params[:xml]}"
@user.receive params[:xml] if params[:xml] @user.receive params[:xml] if params[:xml]
end end
......
...@@ -58,12 +58,7 @@ class Comment ...@@ -58,12 +58,7 @@ class Comment
end end
def signature_valid? def signature_valid?
if person Rails.logger.warn "Received comment has no person" unless person
Rails.logger.warn "Received comment has person #{person.inspect}" if person
Rails.logger.warn "Received comment has person key #{person.serialized_key}" if person
else
Rails.logger.warn "Received comment has no person"
end
verify_signature(creator_signature, person) verify_signature(creator_signature, person)
end end
......
...@@ -166,7 +166,7 @@ class User ...@@ -166,7 +166,7 @@ class User
def receive xml def receive xml
object = Diaspora::Parser.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}")
raise "Signature was not valid on: #{object.inspect}" unless object.signature_valid? raise "In receive for #{self.real_name}, signature was not valid on: #{object.inspect}" unless object.signature_valid?
if object.is_a? Retraction if object.is_a? Retraction
if object.type == 'Person' && object.signature_valid? if object.type == 'Person' && object.signature_valid?
...@@ -195,7 +195,7 @@ class User ...@@ -195,7 +195,7 @@ class User
person.save person.save
elsif object.is_a?(Comment) elsif object.is_a?(Comment)
raise "Signature was not valid on: #{object.inspect}" unless object.post.person == self || object.verify_post_creator_signature raise "In receive for #{self.real_name}, signature was not valid on: #{object.inspect}" unless object.post.person == self || object.verify_post_creator_signature
object.save object.save
dispatch_comment object unless owns?(object) dispatch_comment object unless owns?(object)
object.socket_to_uid(id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object)) object.socket_to_uid(id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter