about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-07-22 21:37:11 -0500
committermultiple creatures <dev@multiple-creature.party>2019-07-22 21:37:11 -0500
commitc2e47f58713373c3d10423bb5d07c51309f40f70 (patch)
treeb7c0c54aff5896201522c6ab81b313fd4834bd8e /app
parent2822fbc443addf08651961543e1a63abdd409d87 (diff)
autoreject check before fetching link preview cards & feeds
Diffstat (limited to 'app')
-rw-r--r--app/services/fetch_atom_service.rb6
-rw-r--r--app/services/fetch_link_card_service.rb6
-rw-r--r--app/services/fetch_oembed_service.rb7
3 files changed, 19 insertions, 0 deletions
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index ce148bfb4..b6a33706f 100644
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -2,9 +2,11 @@
 
 class FetchAtomService < BaseService
   include JsonLdHelper
+  include AutorejectHelper
 
   def call(url)
     return if url.blank?
+    return if autoreject?(url)
 
     result = process(url)
   rescue OpenSSL::SSL::SSLError => e
@@ -77,4 +79,8 @@ class FetchAtomService < BaseService
   def parse_link_header(response)
     LinkHeader.parse(response['Link'].is_a?(Array) ? response['Link'].first : response['Link'])
   end
+
+  def object_uri
+    nil
+  end
 end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 561daf6e1..b23090cd7 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -2,6 +2,7 @@
 
 class FetchLinkCardService < BaseService
   include UrlHelper
+  include AutorejectHelper
 
   URL_PATTERN = %r{
     (                                                                                                 #   $1 URL
@@ -21,6 +22,7 @@ class FetchLinkCardService < BaseService
 
     @url = sanitize_query_string(@url.to_s)
     return if @url.nil?
+    return if autoreject?(url)
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
@@ -174,4 +176,8 @@ class FetchLinkCardService < BaseService
   def lock_options
     { redis: Redis.current, key: "fetch:#{@url}" }
   end
+
+  def object_uri
+    nil
+  end
 end
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index 10176cfb9..528881911 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 class FetchOEmbedService
+  include AutorejectHelper
+
   attr_reader :url, :options, :format, :endpoint_url
 
   def call(url, options = {})
     @url     = url
     @options = options
 
+    return if autoreject?(url)
     discover_endpoint!
     fetch!
   end
@@ -68,4 +71,8 @@ class FetchOEmbedService
       res.code != 200 || res.mime_type != 'text/html' ? nil : res.body_with_limit
     end
   end
+
+  def object_uri
+    nil
+  end
 end