diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-05 18:22:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-05 18:22:34 +0200 |
commit | c947e2e4c57dd6d351fd740c0070fefdc1e1298c (patch) | |
tree | daa83a5e0ed4db242ea4fd27061cf4844188c686 /app/lib/activitypub/tag_manager.rb | |
parent | 661f7e6d9d589315728f26e5cc5b345ee769f4b0 (diff) |
Fix handling of malformed ActivityPub payloads when URIs are nil (#7370)
* Fix handling of malformed ActivityPub payloads when URIs are nil * Gracefully handle JSON-LD canonicalization failures
Diffstat (limited to 'app/lib/activitypub/tag_manager.rb')
-rw-r--r-- | app/lib/activitypub/tag_manager.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb index 908ea9639..95d1cf9f3 100644 --- a/app/lib/activitypub/tag_manager.rb +++ b/app/lib/activitypub/tag_manager.rb @@ -86,6 +86,8 @@ class ActivityPub::TagManager end def local_uri?(uri) + return false if uri.nil? + uri = Addressable::URI.parse(uri) host = uri.normalized_host host = "#{host}:#{uri.port}" if uri.port @@ -99,6 +101,8 @@ class ActivityPub::TagManager end def uri_to_resource(uri, klass) + return if uri.nil? + if local_uri?(uri) case klass.name when 'Account' |