diff --git a/src/application-globals.rkt b/src/application-globals.rkt index 9a21592..c214924 100644 --- a/src/application-globals.rkt +++ b/src/application-globals.rkt @@ -9,8 +9,6 @@ "url-utils.rkt") (provide - ; header to not send referers to fandom - referrer-policy ; timeout durations for http-easy requests timeouts ; generates a consistent footer @@ -24,7 +22,6 @@ (require rackunit html-writing)) -(define referrer-policy (header #"Referrer-Policy" #"no-referrer")) (define timeouts (easy:make-timeout-config #:lease 5 #:connect 5)) (define (application-footer source-url #:license [license-in #f]) diff --git a/src/page-category.rkt b/src/page-category.rkt index c9c3ec2..f7c43b2 100644 --- a/src/page-category.rkt +++ b/src/page-category.rkt @@ -113,7 +113,6 @@ (xexp->html body)) (response/output #:code 200 - #:headers (list referrer-policy) (λ (out) (write-html body out)))))) (module+ test diff --git a/src/page-file.rkt b/src/page-file.rkt index d20365f..d04c135 100644 --- a/src/page-file.rkt +++ b/src/page-file.rkt @@ -33,24 +33,13 @@ (easy:response-headers-ref dest-res 'content-type)) (define (get-media-html url content-type) - (define maybe-proxied-url (if (config-true? 'strict_proxy) (u-proxy-url url) url)) (cond [(eq? content-type #f) `""] - [(regexp-match? #rx"(?i:^image/)" content-type) `(img (@ (src ,maybe-proxied-url)))] + [(regexp-match? #rx"(?i:^image/)" content-type) `(img (@ (src ,url)))] [(regexp-match? #rx"(?i:^audio/|^application/ogg(;|$))" content-type) - `(audio (@ (src ,maybe-proxied-url) (controls)))] - [(regexp-match? #rx"(?i:^video/)" content-type) `(video (@ (src ,maybe-proxied-url) (controls)))] + `(audio (@ (src ,url) (controls)))] + [(regexp-match? #rx"(?i:^video/)" content-type) `(video (@ (src ,url) (controls)))] [else `""])) -(module+ test - (require rackunit) - (parameterize ([config-parameter 'strict_proxy "true"]) - (check-equal? (get-media-html "https://static.wikia.nocookie.net/a" "image/jpeg") (img (@ (src "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fa")))) - (check-equal? (get-media-html "https://static.wikia.nocookie.net/b" "audio/mp3") (audio (@ (src "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fb"))))) - (parameterize ([config-parameter 'strict_proxy "no"]) - (check-equal? (get-media-html "https://static.wikia.nocookie.net/c" "application/ogg") (audio (@ (src "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fc")))) - (check-equal? (get-media-html "https://static.wikia.nocookie.net/d" "video/mp4") (video (@ (src "/proxy?dest=https%3A%2F%2Fstatic.wikia.nocookie.net%2Fd"))))) - (check-equal? (get-media-html "https://example.com" "who knows") "") - (check-equal? (get-media-html #f "who knows") "")) (define (generate-results-page #:source-url source-url #:wikiname wikiname @@ -136,7 +125,6 @@ ; convert to string with error checking, error will be raised if xexp is invalid (xexp->html body)) (response/output #:code 200 - #:headers (list referrer-policy) (λ (out) (write-html body out))))))) ;(module+ test ; (check-not-false ((query-selector (attribute-selector 'href "/test/wiki/Ankle_Monitor") diff --git a/src/page-search.rkt b/src/page-search.rkt index d42fce9..387deab 100644 --- a/src/page-search.rkt +++ b/src/page-search.rkt @@ -81,7 +81,6 @@ (xexp->html body)) (response/output #:code 200 - #:headers (list referrer-policy) (λ (out) (write-html body out)))))) (module+ test diff --git a/src/page-wiki.rkt b/src/page-wiki.rkt index be24af8..a218dfe 100644 --- a/src/page-wiki.rkt +++ b/src/page-wiki.rkt @@ -152,17 +152,15 @@ (λ (v) (dict-update v 'rel (λ (s) (list (string-append (car s) " noreferrer"))) '("")))) - ; proxy images from inline styles, if strict_proxy is set - (curry u - (λ (v) (config-true? 'strict_proxy)) - (λ (v) (attribute-maybe-update 'style - (λ (style) - (regexp-replace #rx"url\\(['\"]?(.*?)['\"]?\\)" style - (λ (whole url) - (string-append - "url(" - (u-proxy-url url) - ")")))) v))) + ; proxy images from inline styles + (curry attribute-maybe-update 'style + (λ (style) + (regexp-replace #rx"url\\(['\"]?(.*?)['\"]?\\)" style + (λ (whole url) + (string-append + "url(" + (u-proxy-url url) + ")"))))) ; and also their links, if strict_proxy is set (curry u (λ (v) @@ -170,10 +168,8 @@ (eq? element-type 'a) (has-class? "image-thumbnail" v))) (λ (v) (attribute-maybe-update 'href u-proxy-url v))) - ; proxy images from src attributes, if strict_proxy is set - (curry u - (λ (v) (config-true? 'strict_proxy)) - (λ (v) (attribute-maybe-update 'src u-proxy-url v))) + ; proxy images from src attributes + (curry attribute-maybe-update 'src u-proxy-url) ; don't lazyload images (curry u (λ (v) (dict-has-key? v 'data-src)) @@ -280,8 +276,8 @@ (define headers (if redirect-msg (let* ([dest (get-attribute 'href (bits->attributes ((query-selector (λ (t a c) (eq? t 'a)) redirect-msg))))] [value (bytes-append #"0;url=" (string->bytes/utf-8 dest))]) - (list (header #"Refresh" value) referrer-policy)) - (list referrer-policy))) + (list (header #"Refresh" value))) + (list))) (when (config-true? 'debug) ; used for its side effects ; convert to string with error checking, error will be raised if xexp is invalid