[Coverity Scan is ok, make syntax-check is ok, make check-valgrind is ok, contrib/check-hard is ok]
This introduces a new Metalink test to verify that when --continue is used, after a HTTP 416 answer a file that fails a sanity test isn't renamed/removed. The following description is verbatim from the patch: ----- Ensure that --continue doesn't rename/remove existing and/or fully retrieved files which fail the sanity tests. ----- Regards, Matthew -- Matthew White <[email protected]>
>From 9b178b179ba570a201e1df444ee7f310eea00bfd Mon Sep 17 00:00:00 2001 From: Matthew White <[email protected]> Date: Mon, 22 Aug 2016 04:38:43 +0200 Subject: [PATCH 12/25] New test: --continue shall keep fully retrieved Metalink files (HTTP 416) * testenv/Makefile.am: Add new file * testenv/Test-metalink-xml-continue.py: New file. Metalink/XML continue/keep existing files with --continue tests Ensure that --continue doesn't rename/remove existing and/or fully retrieved files which fail the sanity tests. --- testenv/Makefile.am | 3 +- testenv/Test-metalink-xml-continue.py | 194 ++++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+), 1 deletion(-) create mode 100755 testenv/Test-metalink-xml-continue.py diff --git a/testenv/Makefile.am b/testenv/Makefile.am index 92a3934..d117e50 100644 --- a/testenv/Makefile.am +++ b/testenv/Makefile.am @@ -43,7 +43,8 @@ if METALINK_IS_ENABLED Test-metalink-xml-prefix-trust.py \ Test-metalink-xml-relprefix-trust.py \ Test-metalink-xml-absprefix-trust.py \ - Test-metalink-xml-homeprefix-trust.py + Test-metalink-xml-homeprefix-trust.py \ + Test-metalink-xml-continue.py else METALINK_TESTS = endif diff --git a/testenv/Test-metalink-xml-continue.py b/testenv/Test-metalink-xml-continue.py new file mode 100755 index 0000000..db15fcb --- /dev/null +++ b/testenv/Test-metalink-xml-continue.py @@ -0,0 +1,194 @@ +#!/usr/bin/env python3 +from sys import exit +from test.http_test import HTTPTest +from misc.wget_file import WgetFile +import re +import hashlib + +""" + This is to test Metalink/XML --continue support in Wget. + + With --trust-server-names, trust the metalink:file names. + + Without --trust-server-names, don't trust the metalink:file names: + use the basename of --input-metalink, and add a sequential number + (e.g. .#1, .#2, etc.). + + Strip the directory from unsafe paths. +""" +############# File Definitions ############################################### +bad = "Ouch!" + +# partial File1 to continue +File0 = "Would you like" + +File1 = "Would you like some Tea?" +File1_lowPref = "Do not take this" +File1_sha256 = hashlib.sha256 (File1.encode ('UTF-8')).hexdigest () + +File2 = "This is gonna be good" +File2_lowPref = "Not this one too" +File2_sha256 = hashlib.sha256 (File2.encode ('UTF-8')).hexdigest () + +File3 = "A little more, please" +File3_lowPref = "That's just too much" +File3_sha256 = hashlib.sha256 (File3.encode ('UTF-8')).hexdigest () + +File4 = "Maybe a biscuit?" +File4_lowPref = "No, thanks" +File4_sha256 = hashlib.sha256 (File4.encode ('UTF-8')).hexdigest () + +File5 = "More Tea...?" +File5_lowPref = "I have to go..." +File5_sha256 = hashlib.sha256 (File5.encode ('UTF-8')).hexdigest () + +MetaXml = \ +"""<?xml version="1.0" encoding="utf-8"?> +<metalink version="3.0" xmlns="http://www.metalinker.org/";> + <publisher> + <name>GNU Wget</name> + </publisher> + <license> + <name>GNU GPL</name> + <url>http://www.gnu.org/licenses/gpl.html</url> + </license> + <identity>Wget Test Files</identity> + <version>1.2.3</version> + <description>Wget Test Files description</description> + <files> + <file name="File1"> + <verification> + <hash type="sha256">{{FILE1_HASH}}</hash> + </verification> + <resources> + <url type="http" preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File1_lowPref</url> + <url type="http" preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File1</url> + </resources> + </file> + <file name="File2"> <!-- no good resources on purpose, this file shall be kept --> + <verification> + <hash type="sha256">{{FILE2_HASH}}</hash> + </verification> + <resources> + <url type="http" preference="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url> + <url type="http" preference="40">http://{{SRV_HOST}}:{{SRV_PORT}}/404</url> + </resources> + </file> + <file name="File3"> + <verification> + <hash type="sha256">{{FILE3_HASH}}</hash> + </verification> + <resources> + <url type="http" preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File3_lowPref</url> + <url type="http" preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File3</url> + </resources> + </file> + <file name="File4"> <!-- no good resources on purpose, this file shall be kept --> + <verification> + <hash type="sha256">{{FILE4_HASH}}</hash> + </verification> + <resources> + <url type="http" preference="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url> + </resources> + </file> + <file name="File5"> + <verification> + <hash type="sha256">{{FILE5_HASH}}</hash> + </verification> + <resources> + <url type="http" preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File5_lowPref</url> + <url type="http" preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File5</url> + </resources> + </file> + </files> +</metalink> +""" + +wrong_file = WgetFile ("wrong_file", bad) + +# partial File1_down to continue +File0_part = WgetFile ("test.meta4.#1", File0) + +File1_orig = WgetFile ("File1", File1) +File1_down = WgetFile ("test.meta4.#1", File1) +File1_nono = WgetFile ("File1_lowPref", File1_lowPref) + +# no good resources on purpose, this file shall be kept +File2_ouch = WgetFile ("test.meta4.#2", bad) + +File3_orig = WgetFile ("File3", File3) +File3_down = WgetFile ("test.meta4.#3", File3) +File3_nono = WgetFile ("File3_lowPref", File3_lowPref) + +# no good resources on purpose, this file shall be kept +File4_ouch = WgetFile ("test.meta4.#4", bad) + +File5_orig = WgetFile ("File5", File5) +File5_down = WgetFile ("test.meta4.#5", File5) +File5_nono = WgetFile ("File5_lowPref", File5_lowPref) + +MetaFile = WgetFile ("test.meta4", MetaXml) + +WGET_OPTIONS = "--continue --input-metalink test.meta4" +WGET_URLS = [[]] + +Files = [[ + wrong_file, + File1_orig, File1_nono, + File3_orig, File3_nono, + File5_orig, File5_nono +]] +Existing_Files = [ + File0_part, # partial File1_down to continue + File2_ouch, # wrong but fully downloaded file + File3_down, # right and fully downloaded file + File4_ouch, # wrong but fully downloaded file + MetaFile +] + +ExpectedReturnCode = 1 +ExpectedDownloadedFiles = [ + File1_down, # continued file from File0_part + File2_ouch, # wrong but fully downloaded file + File3_down, # right and fully downloaded file + File4_ouch, # wrong but fully downloaded file + File5_down, # newly fully donwloaded file + MetaFile +] + +################ Pre and Post Test Hooks ##################################### +pre_test = { + "ServerFiles" : Files, + "LocalFiles" : Existing_Files +} +test_options = { + "WgetCommands" : WGET_OPTIONS, + "Urls" : WGET_URLS +} +post_test = { + "ExpectedFiles" : ExpectedDownloadedFiles, + "ExpectedRetcode" : ExpectedReturnCode +} + +http_test = HTTPTest ( + pre_hook=pre_test, + test_params=test_options, + post_hook=post_test, +) + +http_test.server_setup() +### Get and use dynamic server sockname +srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname () + +MetaXml = re.sub (r'{{FILE1_HASH}}', File1_sha256, MetaXml) +MetaXml = re.sub (r'{{FILE2_HASH}}', File2_sha256, MetaXml) +MetaXml = re.sub (r'{{FILE3_HASH}}', File3_sha256, MetaXml) +MetaXml = re.sub (r'{{FILE4_HASH}}', File4_sha256, MetaXml) +MetaXml = re.sub (r'{{FILE5_HASH}}', File5_sha256, MetaXml) +MetaXml = re.sub (r'{{SRV_HOST}}', srv_host, MetaXml) +MetaXml = re.sub (r'{{SRV_PORT}}', str (srv_port), MetaXml) +MetaFile.content = MetaXml + +err = http_test.begin () + +exit (err) -- 2.7.3
pgpMeReyYMx5J.pgp
Description: PGP signature
