Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/web/templates/adblockplus.org.conf.erb

Issue 29601555: #4846 - Replace legacy redirect with new URL redirects entry (Closed) Base URL: https://hg1/infrastructure
Patch Set: Created Nov. 8, 2017, 9:35 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « hiera/roles/web/redirect/eyeo.yaml ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # XSS and clickjacking prevention headers 1 # XSS and clickjacking prevention headers
2 2
3 set $csp_frame ""; 3 set $csp_frame "";
4 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-ex plorer|safari|yandex-browser|maxthon)?$|^/blog/) 4 if ($uri ~ ^/(:?\w\w(_\w\w)?/)?(?:index|firefox|chrome|opera|android|internet-ex plorer|safari|yandex-browser|maxthon)?$|^/blog/)
5 { 5 {
6 set $csp_frame "; frame-src www.youtube-nocookie.com;"; 6 set $csp_frame "; frame-src www.youtube-nocookie.com;";
7 } 7 }
8 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-s rc 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_ frame"; 8 add_header Content-Security-Policy "default-src 'self'; img-src * data:; style-s rc 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' $csp_ frame";
9 add_header X-Frame-Options "sameorigin"; 9 add_header X-Frame-Options "sameorigin";
10 10
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 335 }
336 if ($arg_link = "acceptable_ads") 336 if ($arg_link = "acceptable_ads")
337 { 337 {
338 set $link "acceptable-ads"; 338 set $link "acceptable-ads";
339 } 339 }
340 if ($arg_link = "acceptable_ads_criteria") 340 if ($arg_link = "acceptable_ads_criteria")
341 { 341 {
342 set $link "acceptable-ads"; 342 set $link "acceptable-ads";
343 set $anchor "#criteria"; 343 set $anchor "#criteria";
344 } 344 }
345 if ($arg_link = "privacy_friendly_ads")
346 {
347 set $link "acceptable-ads";
348 set $anchor "#privacy-friendly-acceptable-ads";
349 }
350 if ($arg_link = "contributors") 345 if ($arg_link = "contributors")
351 { 346 {
352 set $link "contributors"; 347 set $link "contributors";
353 } 348 }
354 if ($arg_link = "whitelist") 349 if ($arg_link = "whitelist")
355 { 350 {
356 set $link "faq_basics"; 351 set $link "faq_basics";
357 set $anchor "#disable"; 352 set $anchor "#disable";
358 } 353 }
359 354
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 location /403.html 429 location /403.html
435 { 430 {
436 try_files $uri @proxied; 431 try_files $uri @proxied;
437 } 432 }
438 location @proxied 433 location @proxied
439 { 434 {
440 proxy_pass https://server16.adblockplus.org; 435 proxy_pass https://server16.adblockplus.org;
441 proxy_set_header Host adblockplus.org; 436 proxy_set_header Host adblockplus.org;
442 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 437 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
443 } 438 }
OLDNEW
« no previous file with comments | « hiera/roles/web/redirect/eyeo.yaml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld