X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=regression-tests.action;h=1d8c262e16a5f71eb9b03f61628e13522741a86e;hp=2ce5e156ff001c2a2ffbcc2654b60ddaff6e9805;hb=11a699c9045dd87513ffc486ac0e5f004fdda3bf;hpb=75faf0e6f18db9754ccc6a43815f6f48f2e0a5b1 diff --git a/regression-tests.action b/regression-tests.action index 2ce5e156..1d8c262e 100644 --- a/regression-tests.action +++ b/regression-tests.action @@ -1,15 +1,16 @@ ############################################################################# -# $Id: regression-tests.action,v 1.54 2008/02/11 20:57:49 fk Exp $ +# $Id: regression-tests.action,v 1.31 2009/07/11 16:30:39 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-2009 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 @@ -26,7 +27,19 @@ ############################################################################# {{settings}} -for-privoxy-version=3.0.9 +for-privoxy-version=3.0.14 + +# Some dependencies Privoxy-Regression-Test should know about: +# +# 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 ####################################################### # Enable taggers to activate the tests on demand @@ -40,8 +53,9 @@ for-privoxy-version=3.0.9 } config.privoxy.org/ p.p/ +127.0.0.1/ -{-hide-user-agent +limit-connect{80,443}} +{-hide-user-agent} TAG:^User-Agent: Privoxy-Regression-Test ####################################################### @@ -51,7 +65,7 @@ TAG:^User-Agent: Privoxy-Regression-Test # Set Header = Accept-Language: de-de # Expect Header = Accept-Language: en-gb {+hide-accept-language{en-gb}} -TAG:^hideaccept-language\{en-gb\}$ +TAG:^hide-accept-language\{en-gb\}$ # Set Header = Accept-Language: de-de # Expect Header = REMOVAL @@ -74,6 +88,18 @@ TAG:^hide-accept-language\{block\}$ # # 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\}$ @@ -82,6 +108,18 @@ TAG:^hide-referrer\{conditional-block\}$ # # 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\}$ @@ -217,6 +255,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\}$ @@ -225,6 +273,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\}$ @@ -308,22 +358,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 @@ -360,30 +417,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. @@ -398,8 +431,6 @@ TAG:^send-vanilla-wafer$ {\ +deanimate-gifs{last} \ -filter \ - -inspect-jpegs \ - -kill-popups \ } TAG:^deanimate-gifs\{last\}$ @@ -412,39 +443,9 @@ TAG:^deanimate-gifs\{last\}$ {\ -deanimate-gifs \ +filter{banners-by-size} \ - -inspect-jpegs \ - -kill-popups \ -} -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 \ - -kill-popups \ } 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 \ - +kill-popups \ -} -TAG:^kill-popups$ - # Set Header = Range: bytes=1234-5678 # Expect Header = NO CHANGE # Set Header = If-Range: bytes=1234-5678 @@ -454,18 +455,42 @@ TAG:^kill-popups$ {\ -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. @@ -480,9 +505,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$ @@ -492,7 +523,7 @@ TAG:^Keep-Alive header removal$ {} TAG:^Proxy-Connection removal$ -# Set Header = proxy-connection: keep-alive +# Set Header = Proxy-Connection: keep-alive # Expect Header = REMOVAL {} TAG:^Proxy-Connection removal$ @@ -529,12 +560,27 @@ TAG:^Max-Forwards header without TRACE method$ # Fetch Test = http://p.p/die # Expect Status Code = 404 # 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 @@ -566,6 +612,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 @@ -645,6 +693,8 @@ TAG:^Max-Forwards header without TRACE method$ # Method Test = OPTIONS # Method Test = GET +# Method Test = get +# Method Test = gEt # Method Test = HEAD # Method Test = POST # Method Test = PUT @@ -682,7 +732,7 @@ TAG:^Max-Forwards header without TRACE method$ # Method Test = PRIVOXY-REGRESSION-TEST-IN-THE-HOUSE # Expect Status Code = 400 -{+block} +{+block{Forbidden Port. You are not supposed to see this.}} config.privoxy.org:1-/ p.p:1-/ @@ -713,3 +763,60 @@ invalid-forward5-gateway-port.example # Expect Status Code = 503 {+forward-override{forward-socks5 :12345 127.0.0.1:12345}} forward5-null-gateway-host.example + +# Fetch Test = http://www.forbidden-connect.example:444/ +# Method = CONNECT +# Expect Status Code = 403 +{+limit-connect{443}} +www.forbidden-connect.example/ + +# Fetch Test = http://www.blocked-request.example/blocked-request +# Expect Status Code = 403 +{+block{This request failed to make it to the target destination which means the test succeeded.}} +www.blocked-request.example/blocked-request + +# Fetch Test = http://www.blocked-request.example/blocked-request-with-no-reason-specified +# 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$