mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix ThreadResolveWorker getting queued with invalid URLs (#9628)

Browse Source
This commit is contained in:
Eugen Rochko 2018-12-26 19:15:53 +01:00 committed by GitHub
parent 17cd91c777
commit aa9a20cde0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/create.rb
View File

@ -210,7 +210,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end end
def resolve_thread(status) def resolve_thread(status)
return unless status.reply? && status.thread.nil? return unless status.reply? && status.thread.nil? && Request.valid_url?(in_reply_to_uri)
ThreadResolveWorker.perform_async(status.id, in_reply_to_uri) ThreadResolveWorker.perform_async(status.id, in_reply_to_uri)
end end

2
app/lib/ostatus/activity/creation.rb
View File

@ -57,7 +57,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
save_emojis(status) save_emojis(status)
end end
if thread? && status.thread.nil? if thread? && status.thread.nil? && Request.valid_url?(thread.second)
Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}" Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"
ThreadResolveWorker.perform_async(status.id, thread.second) ThreadResolveWorker.perform_async(status.id, thread.second)
end end

12
app/lib/request.rb
View File

@ -66,6 +66,18 @@ class Request
(@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET) (@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
end end
class << self
def valid_url?(url)
begin
parsed_url = Addressable::URI.parse(url)
rescue Addressable::URI::InvalidURIError
return false
end
%w(http https).include?(parsed_url.scheme) && parsed_url.host.present?
end
end
private private
def set_common_headers! def set_common_headers!