X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=regression-tests.action;h=fe0f9df759953b512a5e74d6a8c58050224f7bd3;hp=a17d7d341351bc79a0eb702e0b44e1c711590b17;hb=dcdcbf3f494eedb979f27a7125585f49a3033141;hpb=f4107f65b676b63a199fe4230e58695757f9f199 diff --git a/regression-tests.action b/regression-tests.action index a17d7d34..fe0f9df7 100644 --- a/regression-tests.action +++ b/regression-tests.action @@ -1,15 +1,16 @@ ############################################################################# -# $Id: regression-tests.action,v 1.60 2008/03/27 07:46:54 fk Exp $ +# $Id: regression-tests.action,v 1.38 2011/10/30 16:21:19 fabiankeil Exp $ ############################################################################# # -# This is a configuration file for Privoxy-Regression-Test. +# This is a configuration file for Privoxy-Regression-Test +# (included in the source tarball's tools directory). # # After referencing it in your Privoxy configuration both Privoxy and # Privoxy-Regression-Test should be good to go. # ############################################################################# # -# Copyright (c) 2007-2008 Fabian Keil +# Copyright (c) 2007-2011 Fabian Keil # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -25,13 +26,24 @@ # ############################################################################# +# While the syntax used is understood by Privoxy 3.0.14 and later, +# some of the +fast-redirects{} tests require at least 3.0.18 to work. {{settings}} -for-privoxy-version=3.0.9 +for-privoxy-version=3.0.18 # Some dependencies Privoxy-Regression-Test should know about: # -# Level 9 needs = config line user-manual\s+/ +# Level 9 needs = config line user-manual\s+(\.?\.?/|[A-Za-z]:) # Level 12 needs = config line enable-edit-actions\s+1 +# Level 13 needs = feature status FEATURE_CONNECTION_KEEP_ALIVE Yes +# Level 13 needs = config line keep-alive-timeout\s+[1-9]+ +# Level 14 needs = feature status FEATURE_CONNECTION_KEEP_ALIVE No +# Level 15 needs = config line connection-sharing\s+0 +# Level 16 needs = feature status FEATURE_CONNECTION_KEEP_ALIVE Yes +# Level 16 needs = config line connection-sharing\s+1 +# Level 17 needs = feature status FEATURE_PTHREAD Yes +# Level 18 needs = feature status FEATURE_GRACEFUL_TERMINATION No +# Level 19 needs = feature status FEATURE_GRACEFUL_TERMINATION Yes ####################################################### # Enable taggers to activate the tests on demand @@ -45,6 +57,7 @@ for-privoxy-version=3.0.9 } config.privoxy.org/ p.p/ +127.0.0.1/ {-hide-user-agent} TAG:^User-Agent: Privoxy-Regression-Test @@ -70,37 +83,61 @@ TAG:^hide-accept-language\{block\}$ # 2) conditional-forge # 3) forge # 4) block -# 5) a parameter that looks like a valid fake referrer +# 5) a parameter that looks like a valid fake referrer # 6) a parameter that looks like an invalid fake referrer ####################################################### -# Set Header = Referer: http://www.example.org/foo +# Set Header = Referer: http://www.example.org/foo # Expect Header = REMOVAL # # Set Header = Referer: http://p.p/foo # Expect Header = NO CHANGE +# +# Set Header = Referer: p.p/ +# Expect Header = REMOVAL +# +# Set Header = Referer: p +# Expect Header = REMOVAL +# +# Set Header = Referer: http:// +# Expect Header = REMOVAL +# +# Set Header = Referer: https://p.p/ +# Expect Header = REMOVAL {+hide-referrer{conditional-block}} TAG:^hide-referrer\{conditional-block\}$ -# Set Header = Referer: http://www.example.org/foo +# Set Header = Referer: http://www.example.org/foo # Expect Header = Referer: http://p.p/ # # Set Header = Referer: http://p.p/foo # Expect Header = NO CHANGE +# +# Set Header = Referer: p.p/ +# Expect Header = Referer: http://p.p/ +# +# Set Header = Referer: p +# Expect Header = Referer: http://p.p/ +# +# Set Header = Referer: http:// +# Expect Header = Referer: http://p.p/ +# +# Set Header = Referer: https://p.p/ +# Expect Header = Referer: http://p.p/ {+hide-referrer{conditional-forge}} TAG:^hide-referrer\{conditional-forge\}$ -# Set Header = Referer: http://www.example.org/foo +# Set Header = Referer: http://www.example.org/foo # Expect Header = Referer: http://p.p/ {+hide-referrer{forge}} TAG:^hide-referrer\{forge\}$ -# Set Header = Referer: http://www.example.org/foo +# Set Header = Referer: http://www.example.org/foo # Expect Header = REMOVAL {+hide-referrer{block}} TAG:^hide-referrer\{block\}$ -# Set Header = Referer: http://www.example.org/foo +# Set Header = Referer: http://www.example.org/foo # Expect Header = Referer: invalid {+hide-referrer{invalid}} TAG:^hide-referrer\{invalid\}$ @@ -222,6 +259,16 @@ TAG:^hide-if-modified-since\{block\}$ # Expect Header = REMOVAL # Set Header = If-Modified-Since: Thu, 04 Oct 2007 09:56:35 GMT # Expect Header = SOME CHANGE +# Set Header = If-Modified-Since: Thu, 1 Jan 1970 00:00:00 GMT +# Expect Header = SOME CHANGE +# Level = 17 +# Set Header = If-Modified-Since: Thu, 1 Jan 123456789 00:00:00 GMT +# Expect Header = REMOVAL +# Set Header = If-Modified-Since: Mon, 1 Jan 2525 00:00:00 GMT +# Expect Header = SOME CHANGE +# Level = 17 +# Set Header = If-Modified-Since: Thu, 1 Jan 1970 02:00:00 GMT +# Expect Header = SOME CHANGE {+hide-if-modified-since{-60} -crunch-if-none-match} TAG:^hide-if-modified-since\{-60\}$ @@ -230,6 +277,8 @@ TAG:^hide-if-modified-since\{-60\}$ # Expect Header = REMOVAL # Set Header = If-Modified-Since: Thu, 04 Oct 2007 09:56:35 GMT # Expect Header = SOME CHANGE +# Set Header = If-Modified-Since: Wed, 31 Dec 1969 23:59:59 GMT +# Expect Header = SOME CHANGE {+hide-if-modified-since{+60} -crunch-if-none-match} TAG:^hide-if-modified-since\{\+60\}$ @@ -313,22 +362,29 @@ TAG:^crunch-outgoing-cookies$ TAG:^session-cookies-only$ ####################################################### -# Test hide-forwarded-for-headers +# Test change-x-forwarded-for ####################################################### +# Set Header = X-Forwarded-For: 10.0.0.1 +# Expect Header = NO CHANGE +{\ + -change-x-forwarded-for \ +} +TAG:^-change-x-forwarded-for$ + # Set Header = X-Forwarded-For: 10.0.0.1 # Expect Header = REMOVAL {\ - +hide-forwarded-for-headers \ + +change-x-forwarded-for{block} \ } -TAG:^hide-forwarded-for-headers$ +TAG:^change-x-forwarded-for\{block\}$ # Set Header = X-Forwarded-For: 10.0.0.1 -# Expect Header = NO CHANGE +# Expect Header = SOME CHANGE {\ - -hide-forwarded-for-headers \ + +change-x-forwarded-for{add} \ } -TAG:^-hide-forwarded-for-headers$ +TAG:^change-x-forwarded-for\{add\}$ ####################################################### # Test hide-from-header @@ -365,30 +421,6 @@ TAG:^hide-from-header\{siebenzwerge@example.org\}$ } TAG:^prevent-compression$ -####################################################### -# Test send-wafer. -####################################################### - -# Set Header = X-Does-Not-Matter: Foo bar -# Expect Header = Cookie: Tracking+me+is+easy+due+to+my+stupid+wafer+cookie -{\ - +send-wafer{Tracking me is easy due to my stupid wafer cookie}\ - -send-vanilla-wafer \ -} -TAG:^send-wafer\{Tracking me is easy due to my stupid wafer cookie\}$ - -####################################################### -# Test send-vanilla-wafer. -####################################################### - -# Set Header = X-Does-Not-Matter: Foo bar -# Expect Header = Cookie: NOTICE=TO_WHOM_IT_MAY_CONCERN_Do_not_send_me_any_copyrighted_information_other_than_the_document_that_I_am_requesting_or_any_of_its_necessary_components._In_particular_do_not_send_me_any_cookies_that_are_subject_to_a_claim_of_copyright_by_anybody._Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_(copyright_or_otherwise)_applying_to_any_cookie._ -{\ - +send-vanilla-wafer \ - -send-wafer \ -} -TAG:^send-vanilla-wafer$ - ####################################################### # Test content filters which could cause problems with # range requests. @@ -401,9 +433,9 @@ TAG:^send-vanilla-wafer$ # Set Header = Request-Range: bytes=1234-5678 # Expect Header = REMOVAL {\ + -client-header-tagger{range-requests} \ +deanimate-gifs{last} \ -filter \ - -inspect-jpegs \ } TAG:^deanimate-gifs\{last\}$ @@ -414,22 +446,9 @@ TAG:^deanimate-gifs\{last\}$ # Set Header = Request-Range: bytes=1234-5678 # Expect Header = REMOVAL {\ + -client-header-tagger{range-requests} \ -deanimate-gifs \ +filter{banners-by-size} \ - -inspect-jpegs \ -} -TAG:^filter\{banners-by-size\}$ - -# Set Header = Range: bytes=1234-5678 -# Expect Header = REMOVAL -# Set Header = If-Range: bytes=1234-5678 -# Expect Header = REMOVAL -# Set Header = Request-Range: bytes=1234-5678 -# Expect Header = REMOVAL -{\ - -deanimate-gifs \ - -filter \ - +inspect-jpegs \ } TAG:^filter\{banners-by-size\}$ @@ -440,20 +459,45 @@ TAG:^filter\{banners-by-size\}$ # Set Header = Request-Range: bytes=1234-5678 # Expect Header = NO CHANGE {\ + -client-header-tagger{range-requests} \ -deanimate-gifs \ -filter \ - -inspect-jpegs \ - -kill-popups \ } TAG:^no-content-filter$ +# Set Header = Connection: keep-alive +# Expect Header = NO CHANGE +# Level = 13 +# Set Header = Connection: +# Expect Header = REMOVAL +# Level = 13 +{} +TAG:^Connection: keep-alive$ + # Set Header = Connection: keep-alive # Expect Header = Connection: close +# Level = 14 # Set Header = Connection: # Expect Header = Connection: close +# Level = 14 {} TAG:^Connection: close$ +# Set Header = Connection: close +# Expect Header = NO CHANGE +# Level = 15 +{} +TAG:^connection-sharing disabled$ + +# Set Header = Connection: close +# Expect Header = REMOVAL +# Level = 16 +# Set Header = Connection: keep-alive +# Expect Header = NO CHANGE +# Level = 16 +{} +TAG:^connection-sharing enabled$ + # XXX: Removing a header by not specifying a value is # an inherited curl feature and could be viewed as a # bug as far as Privoxy-Regression-Test is concerned. @@ -468,9 +512,15 @@ TAG:^No Host header$ {} TAG:^Host header other than the target host$ -# XXX: check the RFC to use a real value -# Set Header = Keep-Alive: Yes +# Set Header = Keep-Alive: 20 +# Expect Header = NO CHANGE +# Level = 13 +{} +TAG:^Pass Keep-Alive header$ + +# Set Header = Keep-Alive: 20 # Expect Header = REMOVAL +# Level = 14 {} TAG:^Keep-Alive header removal$ @@ -513,16 +563,34 @@ TAG:^Max-Forwards header without TRACE method$ ################################################################ # Fetch Test = http://p.p/ -# Will fail if compiled with FEATURE_GRACEFUL_TERMINATION # Fetch Test = http://p.p/die # Expect Status Code = 404 +# Level = 18 +# Fetch Test = http://p.p/die +# Expect Status Code = 200 +# Level = 19 # Fetch Test = http://p.p/show-status +# Fetch Test = http://config.privoxy.org/show-status?file=actions&index=0 +# Fetch Test = http://config.privoxy.org/show-status?file=filter&index=0 +# XXX: for the invalid ones we probably shouldn't return status code 200. +# Fetch Test = http://config.privoxy.org/show-status?file=actions&index=100 +# Fetch Test = http://config.privoxy.org/show-status?file=actions&index=NaN +# Fetch Test = http://config.privoxy.org/show-status?file=actions +# Fetch Test = http://config.privoxy.org/show-status?file=filter&index=100 +# Fetch Test = http://config.privoxy.org/show-status?file=filter&index=NaN +# Fetch Test = http://config.privoxy.org/show-status?file=filter +# Fetch Test = http://config.privoxy.org/show-status?file=invalid +# Fetch Test = http://config.privoxy.org/show-status?file=trust # Fetch Test = http://p.p/show-version # Fetch Test = http://p.p/show-request # Fetch Test = http://p.p/show-url-info # Fetch Test = http://p.p/show-url-info?url=www.privoxy.org%2F # Fetch Test = http://p.p/show-url-info?url=http:%2F%2Fwww.privoxy.org%2F +# Fetch Test = http://p.p/show-url-info?url=HTTp:%2F%2Fwww.privoxy.org%2F # Fetch Test = http://p.p/show-url-info?url=https:%2F%2Fwww.privoxy.org%2F +# Fetch Test = http://p.p/show-url-info?url=HtTps:%2F%2Fwww.privoxy.org%2F +# Fetch Test = http://p.p/show-url-info?url=ftp:%2F%2Fwww.privoxy.org%2F +# Fetch Test = http://p.p/show-url-info?url=FTp:%2F%2Fwww.privoxy.org%2F # Fetch Test = http://p.p/show-url-info?url= # Fetch Test = http://p.p/show-url-info?url=%2F # Fetch Test = http://p.p/toggle @@ -554,6 +622,8 @@ TAG:^Max-Forwards header without TRACE method$ # Fetch Test = http://p.p/send-banner # Fetch Test = http://p.p/send-stylesheet # Fetch Test = http://p.p/t +# Fetch Test = http://p.p/url-info-osd.xml + # Trusted CGI Request = http://p.p/edit-actions # Expect Status Code = 302 # Level = 12 # Depends on the CGI editor being enabled @@ -625,8 +695,6 @@ TAG:^Max-Forwards header without TRACE method$ # Level = 9 # Fetch Test = http://p.p/user-manual/templates.html # Level = 9 -# Fetch Test = http://p.p/user-manual/upgradersnote.html -# Level = 9 # Fetch Test = http://p.p/user-manual/whatsnew.html # Level = 9 @@ -685,10 +753,20 @@ p.p:3,22,79-81/ {+forward-override{forward-socks5 127.0.0.1:12345 .}} oh-dear-this-hostname-is-so-very-long-that-it-can-not-possibly-be-forwarded-through-socks5-as-a-result-we-therefore-expect-privoxy-to-return-an-error-response-instead-of-forwarding-the-request-because-as-already-mentioned-this-host-is-really-very-long.example/ -# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks-server-listening.example +# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks5-server-listening.example # Expect Status Code = 503 {+forward-override{forward-socks5 127.0.0.1:12345 .}} -oh-dear-this-hostname-is-short-enough-but-there-is-no-socks-server-listening.example +oh-dear-this-hostname-is-short-enough-but-there-is-no-socks5-server-listening.example + +# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4-server-listening.example +# Expect Status Code = 503 +{+forward-override{forward-socks4 127.0.0.1:12345 .}} +oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4-server-listening.example + +# Fetch Test = http://oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4a-server-listening.example +# Expect Status Code = 503 +{+forward-override{forward-socks4a 127.0.0.1:12345 .}} +oh-dear-this-hostname-is-short-enough-but-there-is-no-socks4a-server-listening.example # This one currently triggers the same error condition as the # test above (socks5 server unreachable), but once Privoxy @@ -704,11 +782,11 @@ invalid-forward5-gateway-port.example {+forward-override{forward-socks5 :12345 127.0.0.1:12345}} forward5-null-gateway-host.example -# Fetch Test = http://www.forbidden-connect.example:444/forbidden-connect +# Fetch Test = http://www.forbidden-connect.example:444/ # Method = CONNECT # Expect Status Code = 403 {+limit-connect{443}} -www.forbidden-connect.example/forbidden-connect +www.forbidden-connect.example/ # Fetch Test = http://www.blocked-request.example/blocked-request # Expect Status Code = 403 @@ -719,3 +797,69 @@ www.blocked-request.example/blocked-request # Expect Status Code = 403 {+block} www.blocked-request.example/blocked-request-with-no-reason-specified + +# Some domain pattern tests +# +{+block{domain pattern test}} +# Blocked URL = http://domain-pattern-test.example/ +# Blocked URL = http://domain-pattern-test.example.org/ +domain-pattern-test.example. + +{+block{Hostname patterns without trailing dots cover hostnames with trailing dots as well.}} +# Blocked URL = http://trailing-dot.example.org./ +# Blocked URL = http://trailing-dot.example.org./foo +trailing-dot.example.org + +# Just in case there is no white-space fuzzer in the house ... +# +# Set Header = X-LWS-Test: no superfluous white space here +# Expect Header = NO CHANGE +# Set Header = X-LWS-Test: superfluous white space in the house +# Expect Header = X-LWS-Test: superfluous white space in the house +# Set Header = X-LWS-Test : superfluous white space in the house +# Expect Header = X-LWS-Test: superfluous white space in the house +# Set Header = X-LWS-Test: :superfluous white space in the house +# Expect Header = X-LWS-Test: :superfluous white space in the house +# Set Header = X-LWS-Test: :no superfluous white space here +# Expect Header = NO CHANGE +# Set Header = X-LWS-Test: superfluous white tabs in the house +# Expect Header = X-LWS-Test: superfluous white tabs in the house +# Set Header = X-LWS-Test : superfluous white tabs in the house +# Expect Header = X-LWS-Test: superfluous white tabs in the house +# Set Header = X-LWS-Test: "leave quoted lws alone" +# Expect Header = X-LWS-Test: "leave quoted lws alone" +# Set Header = X-LWS-Test: "leave quoted lws alone" thxbye +# Expect Header = X-LWS-Test: "leave quoted lws alone" thxbye +# Set Header = X-LWS-Test: " Do I Look like quoted text? Me thinks not. +# Expect Header = X-LWS-Test: " Do I Look like quoted text? Me thinks not. +# Set Header = X-LWS-Test: "This is quoted" this is not "but this is again" +# Expect Header = X-LWS-Test: "This is quoted" this is not "but this is again" +# Set Header = X-LWS-Test: "This is quoted" this is not "this is " but " this again is not +# Expect Header = X-LWS-Test: "This is quoted" this is not "this is " but " this again is not +{} +TAG:^LWS Tests$ + +{+fast-redirects{check-decoded-url}} +# Redirected URL = http://redirect.example.net/blafasel&url=http://redirected1.example.net/ +# Redirect Destination = http://redirected1.example.net/ +# Redirected URL = http://redirect.example.net/blafasel&url=http%3A%2F%2Fredirected2.example.net%2F¶meter=not-part-of-the-redirected-url +# Redirect Destination = http://redirected2.example.net/ +# Redirected URL = http://redirect.example.net/blafasel&url=http%3A%2F%2Fredirected3.example.net%2F¶meter=not-part-of-the-redirected-url +# Redirect Destination = http://redirected3.example.net/ +# Redirected URL = http://redirect.example.net/blafasel&url=http%3A%2F%2Fredirected4.example.net%2F%26parameter=part-of-the-redirected-url +# Redirect Destination = http://redirected4.example.net/¶meter=part-of-the-redirected-url +# Redirected URL = http://redirect.example.net/blafasel&url1=http%3A%2F%2Fredirected5.example.net%2F%26parameter1=part-of-the-redirected-url&url2=http%3A%2F%2Fredirected5.example.net%2F%26parameter2=part-of-the-redirected-url2 +# Redirect Destination = http://redirected5.example.net/¶meter2=part-of-the-redirected-url2 +# Redirected URL = http://redirect.example.net/blafasel&url1=http%3A%2F%2Fredirected6.example.net%2F%26parameter1=part-of-the-redirected-url&url2=http%3A%2F%2Fredirected6.example.net%2F%26parameter2=part-of-the-redirected-url2¶meter3=not-part-of-the-redirected-url2 +# Redirect Destination = http://redirected6.example.net/¶meter2=part-of-the-redirected-url2 +# Redirected URL = http://redirect.example.net/blafasel?x=http%3A%2F%2Fredirected7.example.net%2F%26parameter1=part-of-the-redirected-url1¶meter2=not-part-of-the-redirected-url1 +# Redirect Destination = http://redirected7.example.net/¶meter1=part-of-the-redirected-url1 +# Redirected URL = http://redirect.example.net/blafasel?x=http%3A%2F%2Fredirected8.example.net%2F%26parameter1=part-of-the-redirected-url1¶meter2=not-part-of-the-redirected-url1¶meter3=not-part-of-the-redirected-url1 +# Redirect Destination = http://redirected8.example.net/¶meter1=part-of-the-redirected-url1 +redirect.example.net/ + +{+fast-redirects{simple-check}} +# Redirected URL = http://redirect2.example.net/blafasel?x=http://redirected.example.net/¶meter1=part-of-the-redirected-url1¶meter2=part-of-the-redirected-url1 +# Redirect Destination = http://redirected.example.net/¶meter1=part-of-the-redirected-url1¶meter2=part-of-the-redirected-url1 +redirect2.example.net/ +