Temporary URL generation workaround

pull/1338/head
Rick Carlino 2019-07-25 17:58:05 -05:00
parent 2e1e4a1ccc
commit 3440f0b7e2
2 changed files with 15 additions and 3 deletions

View File

@ -39,7 +39,6 @@ class Image < ApplicationRecord
GCS_SECRET_ACCESS_KEY = ENV.fetch("GCS_ID") { puts "Not using Google Cloud" }
# Worst case scenario for 1280x1280 BMP.
GCS_BUCKET_NAME = ENV["GCS_BUCKET"]
GCS_BUCKET_URL = "https://#{GCS_BUCKET_NAME}.storage.googleapis.com"
# ========= DEPRECATED PAPERCLIP STUFF =========
# has_attached_file :attachment, CONFIG
@ -78,11 +77,20 @@ class Image < ApplicationRecord
end
def regular_url
ROOT_PATH +
Rails.application.routes.url_helpers.rails_blob_path(attachment)
if BUCKET
# Not sure why. TODO: Investigate why Rails URL helpers don't work here.
"https://storage.cloud.google.com/#{BUCKET}/#{attachment.key}"
else
Rails
.application
.routes
.url_helpers
.rails_blob_url(x.attachment)
end
end
def legacy_url(size)
puts "Legacy URL"
url = IMAGE_URL_TPL % {
chunks: id.to_s.rjust(9, "0").scan(/.{3}/).join("/"),
filename: attachment_file_name,

View File

@ -13,6 +13,10 @@ class Rack::Attack
throttle("demo_accounts/ip", limit: 10, period: 10.minutes) do |req|
req.ip if req.path.downcase == "/demo"
end
throttle("password_resets/ip", limit: 3, period: 1.minutes) do |req|
req.ip if req.path.downcase == "api/password_resets"
end
end
# Always allow requests from localhost