summaryrefslogtreecommitdiff
path: root/app/uploaders/object_storage/cdn/google_cdn.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/uploaders/object_storage/cdn/google_cdn.rb')
-rw-r--r--app/uploaders/object_storage/cdn/google_cdn.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/object_storage/cdn/google_cdn.rb b/app/uploaders/object_storage/cdn/google_cdn.rb
index ea7683f131c..91bad1f8d6b 100644
--- a/app/uploaders/object_storage/cdn/google_cdn.rb
+++ b/app/uploaders/object_storage/cdn/google_cdn.rb
@@ -19,7 +19,7 @@ module ObjectStorage
ip = IPAddr.new(request_ip)
- return false if ip.private?
+ return false if ip.private? || ip.link_local? || ip.loopback?
!GoogleIpCache.google_ip?(request_ip)
end
@@ -41,7 +41,7 @@ module ObjectStorage
private
def config_valid?
- [key_name, decoded_key, cdn_url].all?(&:present?)
+ [key_name, decoded_key, cdn_url].all?(&:present?) && cdn_url.start_with?('https://')
end
def key_name