From a6eb7ce7a61c124f6e8441c7c4e6368e8ae2dd9f Mon Sep 17 00:00:00 2001 From: cmrd Senya Date: Sun, 5 May 2019 10:54:42 +0300 Subject: [PATCH 1/2] Fix reshare import when root is not fetchable --- lib/archive_importer/entity_importer.rb | 2 ++ lib/archive_importer/own_entity_importer.rb | 4 ++- .../archive_importer/post_importer_spec.rb | 34 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/lib/archive_importer/entity_importer.rb b/lib/archive_importer/entity_importer.rb index 6314c9e21db..8d842287f99 100644 --- a/lib/archive_importer/entity_importer.rb +++ b/lib/archive_importer/entity_importer.rb @@ -15,8 +15,10 @@ def import rescue DiasporaFederation::Entities::Signable::SignatureVerificationFailed, DiasporaFederation::Discovery::InvalidDocument, DiasporaFederation::Discovery::DiscoveryError, + DiasporaFederation::Federation::Fetcher::NotFetchable, ActiveRecord::RecordInvalid => e logger.warn "#{self}: #{e}" + self.persisted_object = nil end attr_reader :json diff --git a/lib/archive_importer/own_entity_importer.rb b/lib/archive_importer/own_entity_importer.rb index 2d585c0cd4a..736115f63ad 100644 --- a/lib/archive_importer/own_entity_importer.rb +++ b/lib/archive_importer/own_entity_importer.rb @@ -21,7 +21,9 @@ def substitute_author attr_reader :old_author_id def persisted_object - @persisted_object ||= (instance if real_author == old_author_id) + return @persisted_object if defined?(@persisted_object) + + @persisted_object = (instance if real_author == old_author_id) end def real_author diff --git a/spec/lib/archive_importer/post_importer_spec.rb b/spec/lib/archive_importer/post_importer_spec.rb index e7702a566bb..aaab3a96c51 100644 --- a/spec/lib/archive_importer/post_importer_spec.rb +++ b/spec/lib/archive_importer/post_importer_spec.rb @@ -113,5 +113,39 @@ end end end + + context "with reshare" do + let!(:author) { FactoryGirl.create(:person, diaspora_handle: "author@example.com") } + let(:entity_json) { JSON.parse(<<~JSON) } + { + "entity_data" : { + "created_at" : "2015-10-19T13:58:16Z", + "guid" : "#{UUID.generate(:compact)}", + "text" : "test post", + "author" : "author@example.com", + "root_author": "root_author@remote-pod.com", + "root_guid": "#{UUID.generate(:compact)}" + }, + "entity_type": "reshare" + } + JSON + + context "when a remote pod responds 403 to discovery requests" do + before do + stub_request(:get, "https://remote-pod.com/.well-known/webfinger?resource=acct:root_author@remote-pod.com") + .to_return(status: 403, body: "", headers: {}) + stub_request(:get, "https://remote-pod.com/.well-known/host-meta") + .to_return(status: 403, body: "", headers: {}) + stub_request(:get, "http://remote-pod.com/.well-known/host-meta") + .to_return(status: 403, body: "", headers: {}) + end + + it "doesn't raise error" do + expect { + instance.import + }.not_to raise_error + end + end + end end end From a660e2b95874a92ab9b31d985f4737b45a4d5de3 Mon Sep 17 00:00:00 2001 From: cmrd Senya Date: Sun, 5 May 2019 19:38:34 +0300 Subject: [PATCH 2/2] Fix relayable import when parent is not fetchable --- lib/archive_importer/entity_importer.rb | 1 + .../own_relayable_importer.rb | 4 ++++ .../own_relayable_importer_spec.rb | 23 +++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/lib/archive_importer/entity_importer.rb b/lib/archive_importer/entity_importer.rb index 8d842287f99..a93317fcd60 100644 --- a/lib/archive_importer/entity_importer.rb +++ b/lib/archive_importer/entity_importer.rb @@ -16,6 +16,7 @@ def import DiasporaFederation::Discovery::InvalidDocument, DiasporaFederation::Discovery::DiscoveryError, DiasporaFederation::Federation::Fetcher::NotFetchable, + OwnRelayableImporter::NoParentError, ActiveRecord::RecordInvalid => e logger.warn "#{self}: #{e}" self.persisted_object = nil diff --git a/lib/archive_importer/own_relayable_importer.rb b/lib/archive_importer/own_relayable_importer.rb index a3325735a4c..c9ff6f82f0d 100644 --- a/lib/archive_importer/own_relayable_importer.rb +++ b/lib/archive_importer/own_relayable_importer.rb @@ -2,6 +2,8 @@ class ArchiveImporter class OwnRelayableImporter < OwnEntityImporter + class NoParentError < RuntimeError; end + def entity fetch_parent(symbolized_entity_data) entity_class.new(symbolized_entity_data) @@ -19,6 +21,8 @@ def fetch_parent(data) break entity_class::PARENT_TYPE if entity_class.const_defined?(:PARENT_TYPE) } entity = Diaspora::Federation::Mappings.model_class_for(type).find_by(guid: data.fetch(:parent_guid)) + raise NoParentError if entity.nil? + data[:parent] = Diaspora::Federation::Entities.related_entity(entity) end end diff --git a/spec/lib/archive_importer/own_relayable_importer_spec.rb b/spec/lib/archive_importer/own_relayable_importer_spec.rb index 7cd141cd044..84a173821e8 100644 --- a/spec/lib/archive_importer/own_relayable_importer_spec.rb +++ b/spec/lib/archive_importer/own_relayable_importer_spec.rb @@ -28,4 +28,27 @@ ).to_json } end + + context "with comment with unknown parent" do + let(:new_user) { FactoryGirl.create(:user) } + let(:instance) { described_class.new(entity_json, new_user) } + let(:entity_json) { JSON.parse(<<~JSON) } + { + "entity_data" : { + "created_at" : "2015-10-19T13:58:16Z", + "guid" : "#{UUID.generate(:compact)}", + "text" : "test post", + "author" : "author@example.com", + "parent_guid": "#{UUID.generate(:compact)}" + }, + "entity_type": "comment" + } + JSON + + it "doesn't raise error" do + expect { + instance.import + }.not_to raise_error + end + end end