From 00589c10c60fa4db8cec41d2101f79c22d136463 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Tue, 21 Jun 2011 21:13:51 -0700 Subject: [PATCH] If one user has a bad rsa key, don't abort all sends. --- app/models/jobs/http_multi.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/models/jobs/http_multi.rb b/app/models/jobs/http_multi.rb index ef3729a66..d9ef788b8 100644 --- a/app/models/jobs/http_multi.rb +++ b/app/models/jobs/http_multi.rb @@ -25,7 +25,14 @@ module Job people.each do |person| url = person.receive_url - xml = salmon.xml_for(person) + begin + xml = salmon.xml_for(person) + rescue OpenSSL::PKey::RSAError => e + Rails.logger.info(:event => :invalid_rsa_key, :identifier => person.diaspora_handle) + next + end + + Rails.logger.info("event=http_multi_send sender_id=#{user_id} recipient_id=#{person.id} url=#{url} xml='#{xml}'") request = Request.new(url, OPTS.merge(:params => {:xml => CGI::escape(xml)}))