codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3821 from mpalmer/letter-avatar-proxy

Browse source 
Proxy letter avatars by default
This commit is contained in:
Sam 2015-11-19 20:02:16 +11:00
commit 88f1a8f0b1
4 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -472,6 +472,7 @@ class User < ActiveRecord::Base
url.gsub! "{color}", letter_avatar_color(username.downcase) url.gsub! "{color}", letter_avatar_color(username.downcase)
url.gsub! "{username}", username url.gsub! "{username}", username
url.gsub! "{first_letter}", username[0].downcase url.gsub! "{first_letter}", username[0].downcase
url.gsub! "{hostname}", Discourse.current_hostname
url url
else else
"#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png"

21
config/nginx.sample.conf
View file

@ -180,7 +180,7 @@ server {
# This big block is needed so we can selectively enable # This big block is needed so we can selectively enable
# acceleration for backups and avatars # acceleration for backups and avatars
# see note about repetition above # see note about repetition above
location ~ ^/(letter_avatar|user_avatar|highlight-js|stylesheets|favicon/proxied) { location ~ ^/(letter_avatar/|user_avatar|highlight-js|stylesheets|favicon/proxied) {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -199,6 +199,25 @@ server {
break; break;
} }
location /letter_avatar_proxy/ {
# Don't send any client headers to the avatars service
proxy_method GET;
proxy_pass_request_headers off;
proxy_pass_request_body off;
# Don't let cookies interrupt caching, and don't pass them to the
# client
proxy_ignore_headers "Set-Cookie";
proxy_hide_header "Set-Cookie";
proxy_cache one;
proxy_cache_key $uri;
proxy_cache_valid 200 7d;
proxy_cache_valid 404 1m;
proxy_pass https://avatars.discourse.org/;
}
# this means every file in public is tried first # this means every file in public is tried first
try_files $uri @discourse; try_files $uri @discourse;
} }

4
config/site_settings.yml
View file

@ -595,9 +595,9 @@ files:
client: true client: true
shadowed_by_global: true shadowed_by_global: true
external_system_avatars_url: external_system_avatars_url:
default: "https://avatars.discourse.org/v2/letter/{first_letter}/{color}/{size}.png" default: "/letter_avatar_proxy/v2/letter/{first_letter}/{color}/{size}.png"
client: true client: true
regex: '^https?:\/\/.+[^\/]' regex: '^((https?:)?\/)?\/.+[^\/]'
default_opengraph_image_url: '' default_opengraph_image_url: ''
trust: trust:

2
spec/models/user_spec.rb
View file

@ -912,7 +912,7 @@ describe User do
expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar/sam/45/#{LetterAvatar.version}.png") expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar/sam/45/#{LetterAvatar.version}.png")
SiteSetting.external_system_avatars_enabled = true SiteSetting.external_system_avatars_enabled = true
expect(user.small_avatar_url).to eq("https://avatars.discourse.org/v2/letter/s/5f9b8f/45.png") expect(user.small_avatar_url).to eq("//test.localhost/letter_avatar_proxy/v2/letter/s/5f9b8f/45.png")
end end
end end