dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

Oops, fix mall spider bug, added by our HTTPS fix

Browse source 
Oh, yeah, shit, okay, when we set `self.url` like that, it's supposed to be the _canonical_ URL for the SWF, not our proxied one—this is the URL that's gonna go in the database.

We do proxying late in the process, like when we're actually setting up to download something, but for just referencing where the asset lives, we use `images.neopets.com`.

In this change, we revert the use of `NEOPETS_IMAGES_URL_ORIGIN`, but we _do_ update this to `https` for good measure. (We currently have both HTTP and HTTPS urls in the database, I guess neopets.com started serving different URLs at some point, this is probably the future! And anything interpreting these URLs will need to handle both cases anyway, unless we do some kind of migration update situation thing.)

We're migrating the incorrect assets with the following query (with the limit changed to match the number we currently see in the DB, just as a safety check):
```
UPDATE swf_assets SET url = REPLACE(url, 'http://images.neopets-asset-proxy.openneo.net', 'https://images.neopets.com') WHERE url LIKE 'http://images.neopets-asset-proxy.openneo.net%' ORDER BY id LIMIT 2000;
```
This commit is contained in:
Emi Dunn-Rankin 2022-08-23 03:04:54 -07:00 committed by GitHub
parent 4446209ec4
commit fe9adb5766
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/swf_asset.rb
View file

@ -11,6 +11,9 @@ class SwfAsset < ActiveRecord::Base
'Cache-Control' => 'max-age=315360000', 'Cache-Control' => 'max-age=315360000',
'Content-Type' => 'image/png' 'Content-Type' => 'image/png'
} }
# This is the URL origin we should use when loading from images.neopets.com.
# It can be overridden in .env as `NEOPETS_IMAGES_URL_ORIGIN`, to use our
# asset proxy instead.
NEOPETS_IMAGES_URL_ORIGIN = ENV['NEOPETS_IMAGES_URL_ORIGIN'] || 'http://images.neopets.com' NEOPETS_IMAGES_URL_ORIGIN = ENV['NEOPETS_IMAGES_URL_ORIGIN'] || 'http://images.neopets.com'
set_inheritance_column 'inheritance_type' set_inheritance_column 'inheritance_type'
@ -248,7 +251,7 @@ class SwfAsset < ActiveRecord::Base
def mall_data=(data) def mall_data=(data)
self.zone_id = data['zone'].to_i self.zone_id = data['zone'].to_i
self.url = "#{NEOPETS_IMAGES_URL_ORIGIN}/#{data['url']}" self.url = "https://images.neopets.com/#{data['url']}"
end end
def self.from_wardrobe_link_params(ids) def self.from_wardrobe_link_params(ids)