diff options
author | Daniel Stenberg <daniel@haxx.se> | 2021-06-01 16:24:00 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-06-07 08:14:25 +0200 |
commit | 265b14d6b37c4298bd5556fabcbc37d36f911693 (patch) | |
tree | 3c7ca96bc1ce2e859bfaa71a0d6afcad56c9f9f7 /tests | |
parent | 9cf516adc67b67388e22bb8c33cb3fabd68f2ac6 (diff) | |
download | curl-265b14d6b37c4298bd5556fabcbc37d36f911693.tar.gz |
metalink: remove
Warning: this will make existing curl command lines that use metalink to
stop working.
Reasons for removal:
1. We've found several security problems and issues involving the
metalink support in curl. The issues are not detailed here. When
working on those, it become apparent to the team that several of the
problems are due to the system design, metalink library API and what
the metalink RFC says. They are very hard to fix on the curl side
only.
2. The metalink usage with curl was only very briefly documented and was
not following the "normal" curl usage pattern in several ways, making
it surprising and non-intuitive which could lead to further security
issues.
3. The metalink library was last updated 6 years ago and wasn't so
active the years before that either. An unmaintained library means
there's a security problem waiting to happen. This is probably reason
enough.
4. Metalink requires an XML parsing library, which is complex code (even
the smaller alternatives) and to this day often gets security
updates.
5. Metalink is not a widely used curl feature. In the 2020 curl user
survey, only 1.4% of the responders said that they'd are using it. In
2021 that number was 1.2%. Searching the web also show very few
traces of it being used, even with other tools.
6. The torrent format and associated technology clearly won for
downloading large files from multiple sources in parallel.
Cloes #7176
Diffstat (limited to 'tests')
-rw-r--r-- | tests/FILEFORMAT.md | 1 | ||||
-rw-r--r-- | tests/data/Makefile.inc | 6 | ||||
-rw-r--r-- | tests/data/test2005 | 91 | ||||
-rw-r--r-- | tests/data/test2006 | 122 | ||||
-rw-r--r-- | tests/data/test2007 | 122 | ||||
-rw-r--r-- | tests/data/test2008 | 114 | ||||
-rw-r--r-- | tests/data/test2009 | 115 | ||||
-rw-r--r-- | tests/data/test2010 | 114 | ||||
-rw-r--r-- | tests/data/test2011 | 91 | ||||
-rw-r--r-- | tests/data/test2012 | 90 | ||||
-rw-r--r-- | tests/data/test2013 | 78 | ||||
-rw-r--r-- | tests/data/test2014 | 78 | ||||
-rw-r--r-- | tests/data/test2015 | 78 | ||||
-rw-r--r-- | tests/data/test2016 | 78 | ||||
-rw-r--r-- | tests/data/test2017 | 78 | ||||
-rw-r--r-- | tests/data/test2018 | 78 | ||||
-rw-r--r-- | tests/data/test2019 | 78 | ||||
-rw-r--r-- | tests/data/test2020 | 78 | ||||
-rw-r--r-- | tests/data/test2021 | 78 | ||||
-rw-r--r-- | tests/data/test2022 | 78 | ||||
-rwxr-xr-x | tests/libtest/test1013.pl | 2 | ||||
-rwxr-xr-x | tests/runtests.pl | 6 | ||||
-rw-r--r-- | tests/unit/Makefile.inc | 8 |
23 files changed, 8 insertions, 1654 deletions
diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index b99fd26a9..7a9c48204 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -388,7 +388,6 @@ Features testable here are: - `ld_preload` - `libz` - `manual` -- `Metalink` - `Mime` - `netrc` - `NSS` diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index a371031a2..6acd90c6b 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -215,9 +215,9 @@ test1916 test1917 test1918 \ \ test1933 test1934 test1935 test1936 \ \ -test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \ -test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \ -test2016 test2017 test2018 test2019 test2020 test2021 test2022 test2023 \ +test2000 test2001 test2002 test2003 test2004 \ +\ + test2023 \ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ test2032 test2034 test2035 test2036 test2037 test2038 test2039 \ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ diff --git a/tests/data/test2005 b/tests/data/test2005 deleted file mode 100644 index bbc321b52..000000000 --- a/tests/data/test2005 +++ /dev/null @@ -1,91 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 37 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, HTTP resource - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="sha256">a430d26389c69b7a245a9ad692cf20b4dc026fb7c2ff8a2c164c49a77130d6d9</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Data delivered from an HTTP resource -</file1> -<file2 name="log/stdout%TESTNUMBER"> -</file2> -<file3 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] OK -</file3> -<stripfile3> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile3> -</verify> -</testcase> diff --git a/tests/data/test2006 b/tests/data/test2006 deleted file mode 100644 index d4091b48b..000000000 --- a/tests/data/test2006 +++ /dev/null @@ -1,122 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -FILE -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 14:49:01 GMT -Server: test-server/fake -Content-Length: 42 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Some data delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -# This relies on the debug feature to allow us to set directory to store the -# -O output in, using the CURL_TESTDIR variable. This test might use it upon -# failure only, successful execution won't actually use it. -<features> -debug -file -Metalink -</features> -<server> -http -</server> - <name> -Metalink local XML file, HTTP resource, using -O -D file - </name> -<setenv> -CURL_TESTDIR=%PWD/log -</setenv> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -O -D log/heads%TESTNUMBER -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="md5">we-only-check-the-strongest-hash-provided</hash> - <hash type="sha256">319cb6be756734b7ff689628ca3265580cdae6a0e38f42d4ac612ff4fba143b0</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Some data delivered from an HTTP resource -</file1> - -# The Content-Length replace here is to handle with 4/5 digit port number in -# the content -<stripfile2> -s/Last-Modified:.*// -s/Content-Length: 49[67]/Content-Length: yeps/ -</stripfile2> -<file2 name="log/heads%TESTNUMBER"> -Content-Length: yeps
-Accept-ranges: bytes
- -
-HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 14:49:01 GMT -Server: test-server/fake -Content-Length: 42 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -</file2> -<file3 name="log/stdout%TESTNUMBER"> -</file3> -<file4 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] OK -</file4> -<stripfile4> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile4> -</verify> -</testcase> diff --git a/tests/data/test2007 b/tests/data/test2007 deleted file mode 100644 index 679de26e1..000000000 --- a/tests/data/test2007 +++ /dev/null @@ -1,122 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET --J -FILE -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 14:50:02 GMT -Server: test-server/fake -Content-Length: 42 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Something delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -# This relies on the debug feature to allow us to set directory to store the -# -O and -J output in, using the CURL_TESTDIR variable. This test might use -# it upon failure only, successful execution won't actually use it. -<features> -debug -file -Metalink -</features> -<server> -http -</server> - <name> -Metalink local XML file, HTTP resource, using -O -J -D file - </name> -<setenv> -CURL_TESTDIR=%PWD/log -</setenv> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -J -O -D log/heads%TESTNUMBER -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="md5">we-only-check-the-strongest-hash-provided</hash> - <hash type="sha256">52899e30f80e3490632d505653204e1fb5b02bda141048704ce9a0ed00b8a3f5</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Something delivered from an HTTP resource -</file1> -# The Content-Length replace here is to handle with 4/5 digit port number in -# the content -<stripfile2> -s/Last-Modified:.*// -s/Content-Length: 49[67]/Content-Length: yeps/ -</stripfile2> -<file2 name="log/heads%TESTNUMBER"> -Content-Length: yeps
-Accept-ranges: bytes
- -
-HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 14:50:02 GMT -Server: test-server/fake -Content-Length: 42 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -</file2> -<file3 name="log/stdout%TESTNUMBER"> -</file3> -<file4 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] OK -</file4> -<stripfile4> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile4> -</verify> -</testcase> diff --git a/tests/data/test2008 b/tests/data/test2008 deleted file mode 100644 index 75ed402c7..000000000 --- a/tests/data/test2008 +++ /dev/null @@ -1,114 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -FILE -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 15:23:48 GMT -Server: test-server/fake -Content-Length: 43 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Some stuff delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<features> -file -Metalink -</features> -<server> -http -</server> - <name> -Metalink local XML file, HTTP resource, using -o fname -D file - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="md5">we-only-check-the-strongest-hash-provided</hash> - <hash type="sha256">711b1b566b536c5baae9b36f2f5c1830a7c8ff126d1afa2febc5b59f8d0aab54</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Some stuff delivered from an HTTP resource -</file1> -# The Content-Length replace here is to handle with 4/5 digit port number in -# the content -<stripfile2> -s/Last-Modified:.*// -s/Content-Length: 49[67]/Content-Length: yeps/ -</stripfile2> -<file2 name="log/heads%TESTNUMBER"> -Content-Length: yeps
-Accept-ranges: bytes
- -
-HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 15:23:48 GMT -Server: test-server/fake -Content-Length: 43 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -</file2> -<file3 name="log/stdout%TESTNUMBER"> -</file3> -<file4 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] OK -</file4> -<stripfile4> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile4> -</verify> -</testcase> diff --git a/tests/data/test2009 b/tests/data/test2009 deleted file mode 100644 index 443559a97..000000000 --- a/tests/data/test2009 +++ /dev/null @@ -1,115 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET --J -FILE -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 16:27:17 GMT -Server: test-server/fake -Content-Length: 46 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Some contents delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<features> -file -Metalink -</features> -<server> -http -</server> - <name> -Metalink local XML file, HTTP resource, using -o fname -J -D file - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="md5">we-only-check-the-strongest-hash-provided</hash> - <hash type="sha256">e4c5b83384ba7d5f8e201d61747a14f29baacd7dfadce0fbd56661db4bba72b2</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Some contents delivered from an HTTP resource -</file1> -# The Content-Length replace here is to handle with 4/5 digit port number in -# the content -<stripfile2> -s/Last-Modified:.*// -s/Content-Length: 49[67]/Content-Length: yeps/ -</stripfile2> -<file2 name="log/heads%TESTNUMBER"> -Content-Length: yeps
-Accept-ranges: bytes
- -
-HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 16:27:17 GMT -Server: test-server/fake -Content-Length: 46 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -</file2> -<file3 name="log/stdout%TESTNUMBER"> -</file3> -<file4 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] OK -</file4> -<stripfile4> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile4> -</verify> -</testcase> diff --git a/tests/data/test2010 b/tests/data/test2010 deleted file mode 100644 index 11affe9a1..000000000 --- a/tests/data/test2010 +++ /dev/null @@ -1,114 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -FILE -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 17:37:27 GMT -Server: test-server/fake -Content-Length: 41 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Contents delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<features> -file -Metalink -</features> -<server> -http -</server> - <name> -Metalink local XML file, HTTP resource, using -o fname -D file - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="md5">we-only-check-the-strongest-hash-provided</hash> - <hash type="sha256">19dcb4e2a99b9cd02c30b1ed6c55869b7ef8cda9f985648909c48a6dbb54356c</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/outfile%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Contents delivered from an HTTP resource -</file1> -# The Content-Length replace here is to handle with 4/5 digit port number in -# the content -<stripfile2> -s/Last-Modified:.*// -s/Content-Length: 49[67]/Content-Length: yeps/ -</stripfile2> -<file2 name="log/heads%TESTNUMBER"> -Content-Length: yeps
-Accept-ranges: bytes
- -
-HTTP/1.1 200 OK -Date: Thu, 21 Jun 2012 17:37:27 GMT -Server: test-server/fake -Content-Length: 41 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -</file2> -<file3 name="log/stdout%TESTNUMBER"> -</file3> -<file4 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] OK -</file4> -<stripfile4> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile4> -</verify> -</testcase> diff --git a/tests/data/test2011 b/tests/data/test2011 deleted file mode 100644 index 781697811..000000000 --- a/tests/data/test2011 +++ /dev/null @@ -1,91 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 37 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, HTTP resource, hash mismatch - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - <hash type="sha256">badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Data delivered from an HTTP resource -</file1> -<file2 name="log/stdout%TESTNUMBER"> -</file2> -<file3 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) OK -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) [sha-256] FAILED (digest mismatch) -</file3> -<stripfile3> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile3> -</verify> -</testcase> diff --git a/tests/data/test2012 b/tests/data/test2012 deleted file mode 100644 index b3cfd6146..000000000 --- a/tests/data/test2012 +++ /dev/null @@ -1,90 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun %TESTNUMBER 14:49:00 GMT -Server: test-server/fake -Content-Length: 46 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Some contents delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, HTTP resource, without hash - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER"> - <verification> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<protocol> -GET /%TESTNUMBER HTTP/1.1
-Host: %HOSTIP:%HTTPPORT
-User-Agent: curl/%VERSION
-Accept: */*
-
-</protocol> -<file1 name="log/download%TESTNUMBER"> -Some contents delivered from an HTTP resource -</file1> -<file2 name="log/stdout%TESTNUMBER"> -</file2> -<file3 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (digest missing) -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER)... -Metalink: fetching (log/download%TESTNUMBER) from (http://%HOSTIP:%HTTPPORT/%TESTNUMBER) OK -Metalink: validating (log/download%TESTNUMBER)... -Metalink: validating (log/download%TESTNUMBER) FAILED (digest missing) -</file3> -<stripfile3> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile3> -</verify> -</testcase> diff --git a/tests/data/test2013 b/tests/data/test2013 deleted file mode 100644 index 016a9a4b2..000000000 --- a/tests/data/test2013 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix absolute path - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="/tmp/download%TESTNUMBER"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER /tmp/download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2014 b/tests/data/test2014 deleted file mode 100644 index 895c9c9c8..000000000 --- a/tests/data/test2014 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix path relative to current - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="./log/download%TESTNUMBER"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2015 b/tests/data/test2015 deleted file mode 100644 index a35564703..000000000 --- a/tests/data/test2015 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix path relative to upper - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="../tests/log/download%TESTNUMBER"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2016 b/tests/data/test2016 deleted file mode 100644 index 51b687f9a..000000000 --- a/tests/data/test2016 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix path traversal - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/../log/download%TESTNUMBER"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2017 b/tests/data/test2017 deleted file mode 100644 index 4937c2802..000000000 --- a/tests/data/test2017 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix home path traversal - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="~/download%TESTNUMBER"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2018 b/tests/data/test2018 deleted file mode 100644 index f43f8c4b5..000000000 --- a/tests/data/test2018 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix questionable file name I - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/.download%TESTNUMBER"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/.download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2019 b/tests/data/test2019 deleted file mode 100644 index 7123ab376..000000000 --- a/tests/data/test2019 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix questionable file name II - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="."> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2020 b/tests/data/test2020 deleted file mode 100644 index 8fd95543e..000000000 --- a/tests/data/test2020 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix questionable file name III - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name=".."> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2021 b/tests/data/test2021 deleted file mode 100644 index 4919cab59..000000000 --- a/tests/data/test2021 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix questionable file name IV - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER >/dev/null"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/data/test2022 b/tests/data/test2022 deleted file mode 100644 index 84735c93c..000000000 --- a/tests/data/test2022 +++ /dev/null @@ -1,78 +0,0 @@ -<testcase> -<info> -<keywords> -Metalink -HTTP -HTTP GET -</keywords> -</info> - -# -# Server-side -<reply> -<data nocheck="yes"> -HTTP/1.1 200 OK -Date: Wed, 20 Jun 2012 14:49:00 GMT -Server: test-server/fake -Content-Length: 56 -Connection: close -Content-Type: text/html -Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -Funny-head: yesyes - -Data that should not be delivered from an HTTP resource -</data> -</reply> - -# -# Client-side -<client> -<server> -http -</server> -<features> -file -Metalink -</features> - <name> -Metalink local XML file, attempt Unix questionable file name V - </name> -<command option="no-output,no-include"> ---metalink file://%PWD/log/test%TESTNUMBER.metalink -</command> -# local metalink file written before test command runs -<file name="log/test%TESTNUMBER.metalink"> -<?xml version="1.0" encoding="utf-8"?> -<metalink version="3.0" xmlns="http://www.metalinker.org/"> - <files> - <file name="log/download%TESTNUMBER |/dev/null"> - <verification> - <hash type="sha256">c7d03debe90ca29492203ea921d76941fa98640cf3b744f2a16c9b58465eab82</hash> - </verification> - <resources maxconnections="1"> - <url type="http" preference="90">http://%HOSTIP:%HTTPPORT/%TESTNUMBER</url> - </resources> - </file> - </files> -</metalink> -</file> -<postcheck> -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER log/download%TESTNUMBER -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<file1 name="log/stdout%TESTNUMBER"> -</file1> -<file2 name="log/stderr%TESTNUMBER" mode="text"> -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) metalink/XML... -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) WARNING (missing or invalid file name) -Metalink: parsing (file://%PWD/log/test%TESTNUMBER.metalink) FAILED -</file2> -<stripfile2> -$_ = '' if (($_ !~ /^Metalink: /) && ($_ !~ /error/i) && ($_ !~ /warn/i)) -</stripfile2> -</verify> -</testcase> diff --git a/tests/libtest/test1013.pl b/tests/libtest/test1013.pl index 4160ff923..58f7c9623 100755 --- a/tests/libtest/test1013.pl +++ b/tests/libtest/test1013.pl @@ -44,7 +44,7 @@ $curl_protocols =~ /\w+: (.*)$/; @curl = split / /,$1; # These features are not supported by curl-config -@curl = grep(!/^(Debug|TrackMemory|Metalink|CharConv)$/i, @curl); +@curl = grep(!/^(Debug|TrackMemory|CharConv)$/i, @curl); @curl = sort @curl; # Read the output of curl-config diff --git a/tests/runtests.pl b/tests/runtests.pl index 2a2b4ee1a..ab77c0ab7 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -253,7 +253,6 @@ my $has_kerberos; # set if libcurl is built with Kerberos support my $has_spnego; # set if libcurl is built with SPNEGO support my $has_charconv; # set if libcurl is built with CharConv support my $has_tls_srp; # set if libcurl is built with TLS-SRP support -my $has_metalink; # set if curl is built with Metalink support my $has_http2; # set if libcurl is built with HTTP2 support my $has_httpsproxy; # set if libcurl is built with HTTPS-proxy support my $has_crypto; # set if libcurl is built with cryptographic support @@ -2852,7 +2851,6 @@ sub setupfeatures { $feature{"ld_preload"} = ($has_ldpreload && !$debug_build); $feature{"libz"} = $has_libz; $feature{"manual"} = $has_manual; - $feature{"Metalink"} = $has_metalink; $feature{"MinGW"} = $has_mingw; $feature{"MultiSSL"} = $has_multissl; $feature{"NSS"} = $has_nss; @@ -3103,10 +3101,6 @@ sub checksystem { # TLS-SRP enabled $has_tls_srp=1; } - if($feat =~ /Metalink/i) { - # Metalink enabled - $has_metalink=1; - } if($feat =~ /PSL/i) { # PSL enabled $has_psl=1; diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index 854e3af38..3354f454d 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -71,9 +71,9 @@ unit1330_SOURCES = unit1330.c $(UNITFILES) unit1330_CPPFLAGS = $(AM_CPPFLAGS) unit1394_SOURCES = unit1394.c $(UNITFILES) -unit1394_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) -unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ -unit1394_LDFLAGS = @LIBMETALINK_LDFLAGS@ $(top_builddir)/src/libcurltool.la +unit1394_CPPFLAGS = $(AM_CPPFLAGS) +unit1394_LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ +unit1394_LDFLAGS = $(top_builddir)/src/libcurltool.la unit1394_LIBS = unit1395_SOURCES = unit1395.c $(UNITFILES) @@ -104,7 +104,7 @@ unit1603_SOURCES = unit1603.c $(UNITFILES) unit1603_CPPFLAGS = $(AM_CPPFLAGS) unit1604_SOURCES = unit1604.c $(UNITFILES) -unit1604_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) +unit1604_CPPFLAGS = $(AM_CPPFLAGS) unit1605_SOURCES = unit1605.c $(UNITFILES) unit1605_CPPFLAGS = $(AM_CPPFLAGS) |