Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Schubert <mail@dennis-schubert.de>2015-05-09 22:38:51 +0300
committerJonne Haß <me@jhass.eu>2015-05-10 01:10:12 +0300
commit6273c2959ab044bbf00214b8c4727875323f91d7 (patch)
tree23647841db1ec7d466d441ed3ad0711a5ded30ee /app/workers
parent915dee3c4b9ec0b3f8413cf00b8251116143e3fd (diff)
Rescue from private objects sent to the public api
closes #5938
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/base.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/workers/base.rb b/app/workers/base.rb
index 7fb53f548..bb8315e50 100644
--- a/app/workers/base.rb
+++ b/app/workers/base.rb
@@ -14,7 +14,10 @@ module Workers
rescue Diaspora::ContactRequiredUnlessRequest,
Diaspora::RelayableObjectWithoutParent,
# Friendica seems to provoke these
- Diaspora::AuthorXMLAuthorMismatch => e
+ Diaspora::AuthorXMLAuthorMismatch,
+ # We received a private object to our public endpoint, again something
+ # Friendica seems to provoke
+ Diaspora::NonPublic => e
Rails.logger.info("error on receive: #{e.class}")
rescue ActiveRecord::RecordInvalid => e
Rails.logger.info("failed to save received object: #{e.record.errors.full_messages}")