[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-wget] [PATCH 27/27] New: Metalink/XML v3 python class, update tests
|
From: |
Matthew White |
|
Subject: |
[Bug-wget] [PATCH 27/27] New: Metalink/XML v3 python class, update tests to use this class |
|
Date: |
Thu, 29 Sep 2016 06:03:07 +0200 |
* NEWS: Mention the Metalink/XML v3 python class
* testenv/misc/metalinkv3_xml.py: New Metalink/XML v3 python class
* testenv/Test-metalink-xml-abspath-trust.py: Update test to use the
new Metalink/XML v3 python class
* testenv/Test-metalink-xml-abspath.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-absprefix-trust.py: Update test to use the
new Metalink/XML v3 python class
* testenv/Test-metalink-xml-absprefix.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-continue.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-emptyprefix-trust.py: Update test to use
the new Metalink/XML v3 python class
* testenv/Test-metalink-xml-homepath-trust.py: Update test to use the
new Metalink/XML v3 python class
* testenv/Test-metalink-xml-homepath.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-homeprefix-trust.py: Update test to use
the new Metalink/XML v3 python class
* testenv/Test-metalink-xml-homeprefix.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-nohash.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-nourls.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-prefix-trust.py: Update test to use the
new Metalink/XML v3 python class
* testenv/Test-metalink-xml-prefix.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-relpath-trust.py: Update test to use the
new Metalink/XML v3 python class
* testenv/Test-metalink-xml-relpath.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-relprefix-trust.py: Update test to use the
new Metalink/XML v3 python class
* testenv/Test-metalink-xml-relprefix.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-size.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml-trust.py: Update test to use the new
Metalink/XML v3 python class
* testenv/Test-metalink-xml.py: Update test to use the new
Metalink/XML v3 python class
---
NEWS | 2 +
testenv/Test-metalink-xml-abspath-trust.py | 176 ++++++--------
testenv/Test-metalink-xml-abspath.py | 175 ++++++--------
testenv/Test-metalink-xml-absprefix-trust.py | 223 ++++++------------
testenv/Test-metalink-xml-absprefix.py | 222 ++++++------------
testenv/Test-metalink-xml-continue.py | 226 ++++++------------
testenv/Test-metalink-xml-emptyprefix-trust.py | 223 ++++++------------
testenv/Test-metalink-xml-homepath-trust.py | 222 ++++++------------
testenv/Test-metalink-xml-homepath.py | 221 ++++++------------
testenv/Test-metalink-xml-homeprefix-trust.py | 223 ++++++------------
testenv/Test-metalink-xml-homeprefix.py | 222 ++++++------------
testenv/Test-metalink-xml-nohash.py | 208 ++++++-----------
testenv/Test-metalink-xml-nourls.py | 223 ++++++------------
testenv/Test-metalink-xml-prefix-trust.py | 225 ++++++------------
testenv/Test-metalink-xml-prefix.py | 224 ++++++------------
testenv/Test-metalink-xml-relpath-trust.py | 221 ++++++------------
testenv/Test-metalink-xml-relpath.py | 220 ++++++------------
testenv/Test-metalink-xml-relprefix-trust.py | 223 ++++++------------
testenv/Test-metalink-xml-relprefix.py | 222 ++++++------------
testenv/Test-metalink-xml-size.py | 232 ++++++-------------
testenv/Test-metalink-xml-trust.py | 225 ++++++------------
testenv/Test-metalink-xml.py | 224 ++++++------------
testenv/misc/metalinkv3_xml.py | 305 +++++++++++++++++++++++++
23 files changed, 1696 insertions(+), 3191 deletions(-)
mode change 100755 => 100644 testenv/Test-metalink-xml.py
create mode 100644 testenv/misc/metalinkv3_xml.py
diff --git a/NEWS b/NEWS
index ca7eaba..6cb82a0 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Please send GNU Wget bug reports to <address@hidden>.
* Changes in Wget X.Y.Z
+* Implement a Metalink/XML v3 python class for Metalink tests.
+
* When processing a Metalink header, --metalink-index=<number> allows
to process the header's application/metalink4+xml files.
diff --git a/testenv/Test-metalink-xml-abspath-trust.py
b/testenv/Test-metalink-xml-abspath-trust.py
index 35354d0..5091cd0 100755
--- a/testenv/Test-metalink-xml-abspath-trust.py
+++ b/testenv/Test-metalink-xml-abspath-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML forbids absolute paths.
@@ -15,115 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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 ()
-
-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"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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">
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- </files>
-</metalink>
-"""
-wrong_file = WgetFile ("wrong_file", bad)
-
-# rejected by libmetalink
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-File2_orig = WgetFile ("File2", File2)
-File2_down = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File2_down,
- 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,
+File3 = "A little more, please"
+File3_lowPref = "That's just too much"
+
+File4 = "Maybe a biscuit?"
+File4_lowPref = "No, thanks"
+
+File5 = "More Tea...?"
+File5_lowPref = "I have to go..."
+
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["/File1", None, File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", "File2", File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", "File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-abspath.py
b/testenv/Test-metalink-xml-abspath.py
index 85d544b..e84fcf0 100755
--- a/testenv/Test-metalink-xml-abspath.py
+++ b/testenv/Test-metalink-xml-abspath.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML forbids absolute paths.
@@ -15,115 +14,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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 ()
-
-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"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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">
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- </files>
-</metalink>
-"""
-wrong_file = WgetFile ("wrong_file", bad)
-
-# rejected by libmetalink
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-File2_orig = WgetFile ("File2", File2)
-File2_down = WgetFile ("test.metalink.#1", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File2_down,
- 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,
+File3 = "A little more, please"
+File3_lowPref = "That's just too much"
+
+File4 = "Maybe a biscuit?"
+File4_lowPref = "No, thanks"
+
+File5 = "More Tea...?"
+File5_lowPref = "I have to go..."
+
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["/File1", None, File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", XmlName + ".#1", File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", XmlName + ".#2", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-absprefix-trust.py
b/testenv/Test-metalink-xml-absprefix-trust.py
index 1cb46ec..4cf065d 100755
--- a/testenv/Test-metalink-xml-absprefix-trust.py
+++ b/testenv/Test-metalink-xml-absprefix-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML absolute directory prefix support in Wget.
@@ -15,179 +14,89 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --directory-prefix /dir --input-metalink
test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", "File1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", "File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--directory-prefix /dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-absprefix.py
b/testenv/Test-metalink-xml-absprefix.py
index 39423d3..d19d178 100755
--- a/testenv/Test-metalink-xml-absprefix.py
+++ b/testenv/Test-metalink-xml-absprefix.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML absolute directory prefix support in Wget.
@@ -15,179 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#2", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--directory-prefix /dir --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", XmlName + ".#2", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--directory-prefix /dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-continue.py
b/testenv/Test-metalink-xml-continue.py
index 068eb37..782dbd5 100644
--- a/testenv/Test-metalink-xml-continue.py
+++ b/testenv/Test-metalink-xml-continue.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML --continue support in Wget.
@@ -15,179 +14,94 @@ import hashlib
Strip the directory from unsafe paths.
"""
-############# File Definitions ###############################################
-bad = "Ouch!"
-# partial File1 to continue
-File0 = "Would you like"
+############# File Definitions ###############################################
+wrong_file = "Ouch!"
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.metalink.#1", File0)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# no good resources on purpose, this file shall be kept
-File2_ouch = WgetFile ("test.metalink.#2", bad)
-
-File3_orig = WgetFile ("File3", File3)
-File3_down = WgetFile ("test.metalink.#3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# no good resources on purpose, this file shall be kept
-File4_ouch = WgetFile ("test.metalink.#4", bad)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--continue --input-metalink test.metalink"
-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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.add_LocalFiles (
+ [XmlName + ".#1", File1[0:14]], # File1 to continue from partial file
+ [XmlName + ".#2", File2], # File2 to keep, different from server
+ [XmlName + ".#3", File3], # File3 to keep, already fully retrieved
+ [XmlName + ".#4", File4], # File4 to keep, different from server
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.add_ExpectedFiles (
+ [XmlName + ".#2", File2], # File2 to keep, different from server
+ [XmlName + ".#3", File3], # File3 to keep, already fully retrieved
+ [XmlName + ".#4", File4], # File4 to keep, different from server
+)
+
+Meta.print_meta ()
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["File1", XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", XmlName + ".#2", wrong_file, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["File3", XmlName + ".#3", File3, None, True,
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["File4", XmlName + ".#4", File4_lowPref, None, True,
+ ["wrong_file", wrong_file, "http", None, 35]],
+ ["File5", XmlName + ".#5", File5, None, True,
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
+)
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
+Meta.print_meta ()
-err = http_test.begin ()
+err = Meta.http_test (
+ "--continue " + \
+ "--input-metalink " + XmlName, 1
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-emptyprefix-trust.py
b/testenv/Test-metalink-xml-emptyprefix-trust.py
index 4831752..9b4272d 100755
--- a/testenv/Test-metalink-xml-emptyprefix-trust.py
+++ b/testenv/Test-metalink-xml-emptyprefix-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML with an empty directory prefix.
@@ -15,179 +14,89 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("subdir/File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("subdir/File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --directory-prefix '' --input-metalink
test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", "subdir/File1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", "subdir/File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--directory-prefix '' " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-homepath-trust.py
b/testenv/Test-metalink-xml-homepath-trust.py
index e072c81..3831e80 100755
--- a/testenv/Test-metalink-xml-homepath-trust.py
+++ b/testenv/Test-metalink-xml-homepath-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML forbids the home path and names
@@ -16,179 +15,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="dir/~File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="dir/File4~">
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="dir/~/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-# rejected by libmetalink
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("dir/File4~", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("dir/~/File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File4_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["~File1", None, File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["~/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["dir/~File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["dir/File4~", "dir/File4~", File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["dir/~/File5", "dir/~/File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-homepath.py
b/testenv/Test-metalink-xml-homepath.py
index 6e2e9de..f38f2db 100755
--- a/testenv/Test-metalink-xml-homepath.py
+++ b/testenv/Test-metalink-xml-homepath.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML forbids the home path and names
@@ -16,179 +15,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="dir/~File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="dir/File4~">
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="dir/~/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-# rejected by libmetalink
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("test.metalink.#1", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#2", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File4_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["~File1", None, File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["~/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["dir/~File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["dir/File4~", XmlName + ".#1", File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["dir/~/File5", XmlName + ".#2", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-homeprefix-trust.py
b/testenv/Test-metalink-xml-homeprefix-trust.py
index a74243e..23c7191 100755
--- a/testenv/Test-metalink-xml-homeprefix-trust.py
+++ b/testenv/Test-metalink-xml-homeprefix-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML home directory prefix support in Wget.
@@ -15,179 +14,89 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --directory-prefix ~/dir --input-metalink
test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", "File1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", "File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--directory-prefix ~/dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-homeprefix.py
b/testenv/Test-metalink-xml-homeprefix.py
index dc1df32..03b17a8 100755
--- a/testenv/Test-metalink-xml-homeprefix.py
+++ b/testenv/Test-metalink-xml-homeprefix.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML home directory prefix support in Wget.
@@ -15,179 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#2", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--directory-prefix ~/dir --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", XmlName + ".#2", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--directory-prefix ~/dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-nohash.py
b/testenv/Test-metalink-xml-nohash.py
index 3985918..4c82cb0 100755
--- a/testenv/Test-metalink-xml-nohash.py
+++ b/testenv/Test-metalink-xml-nohash.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML with no hashes generates a SIGSEGV.
@@ -15,166 +14,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
File1 = "Would you like some Tea?"
File1_lowPref = "Do not take this"
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"
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..."
-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">
- <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>
- <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">
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="File3">
- <verification>
- </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>
- <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">
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <verification>
- <hash type="sha256"></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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-File2_orig = WgetFile ("File2", File2)
-File2_down = WgetFile ("test.metalink.#2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("test.metalink.#4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 1
-ExpectedDownloadedFiles = [
- File2_down,
- File4_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["File1", None, File1, None, False,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", XmlName + ".#2", File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["File3", None, File3, None, None,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["File4", XmlName + ".#4", File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", None, File5, None, "",
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
-
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
+Meta.print_meta ()
-err = http_test.begin ()
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 1
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-nourls.py
b/testenv/Test-metalink-xml-nourls.py
index 23f27db..9f3d93e 100755
--- a/testenv/Test-metalink-xml-nourls.py
+++ b/testenv/Test-metalink-xml-nourls.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML with unknown url types.
@@ -15,181 +14,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url>
- <url type="http"
preference="40">http://{{SRV_HOST}}:{{SRV_PORT}}/404</url>
- <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"> <!-- all unknown resources, test SIGSEGV -->
- <verification>
- <hash type="sha256">{{FILE2_HASH}}</hash>
- </verification>
- <resources>
- <url type="unknown"
preference="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url>
- <url type="unknown"
preference="40">http://{{SRV_HOST}}:{{SRV_PORT}}/404</url>
- <url type="unknown"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="unknown"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="File3">
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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"> <!-- only one good resource -->
- <verification>
- <hash type="sha256">{{FILE4_HASH}}</hash>
- </verification>
- <resources>
- <url type="unknown"
preference="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url>
- <url type="unknown"
preference="40">http://{{SRV_HOST}}:{{SRV_PORT}}/404</url>
- <url type="unknown"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# all unknown resources, test SIGSEGV
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-File3_orig = WgetFile ("File3", File3)
-File3_down = WgetFile ("test.metalink.#3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("test.metalink.#4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 1
-ExpectedDownloadedFiles = [
- File1_down,
- File3_down,
- File4_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["File1", XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "unknown", None, 35],
+ ["404", None, "unknown", None, 40],
+ ["File2_lowPref", File2_lowPref, "unknown", None, 25],
+ ["File2", File2, "unknown", None, 30]],
+ ["File3", XmlName + ".#3", File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["File4", XmlName + ".#4", File4, None, True,
+ ["wrong_file", wrong_file, "unknown", None, 35],
+ ["404", None, "unknown", None, 40],
+ ["File4_lowPref", File4_lowPref, "unknown", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", XmlName + ".#5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 1
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-prefix-trust.py
b/testenv/Test-metalink-xml-prefix-trust.py
index b971006..1fef7f9 100755
--- a/testenv/Test-metalink-xml-prefix-trust.py
+++ b/testenv/Test-metalink-xml-prefix-trust.py
@@ -1,11 +1,10 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
- This is to test Metalink/XML relative directory prefix support in Wget.
+ This is to test Metalink/XML directory prefix support in Wget.
With --trust-server-names, trust the metalink:file names.
@@ -15,179 +14,89 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("dir/subdir/File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("dir/subdir/File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --directory-prefix dir --input-metalink
test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", "dir/" + "subdir/File1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", "dir/" + "subdir/File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--directory-prefix dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-prefix.py
b/testenv/Test-metalink-xml-prefix.py
index c94e53a..4275a04 100755
--- a/testenv/Test-metalink-xml-prefix.py
+++ b/testenv/Test-metalink-xml-prefix.py
@@ -1,11 +1,10 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
- This is to test Metalink/XML relative directory prefix support in Wget.
+ This is to test Metalink/XML directory prefix support in Wget.
With --trust-server-names, trust the metalink:file names.
@@ -15,179 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("dir/test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("dir/test.metalink.#2", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--directory-prefix dir --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", "dir/" + XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", "dir/" + XmlName + ".#2", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--directory-prefix dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-relpath-trust.py
b/testenv/Test-metalink-xml-relpath-trust.py
index f5a3a3b..d2b4fc0 100755
--- a/testenv/Test-metalink-xml-relpath-trust.py
+++ b/testenv/Test-metalink-xml-relpath-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML forbids relative paths.
@@ -15,178 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="dir/./File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="dir/../File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-# rejected by libmetalink
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["./File1", None, File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["../File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["dir/./File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["dir/../File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", "File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-relpath.py
b/testenv/Test-metalink-xml-relpath.py
index 7d9307a..9405410 100755
--- a/testenv/Test-metalink-xml-relpath.py
+++ b/testenv/Test-metalink-xml-relpath.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test if Metalink/XML forbids relative paths.
@@ -15,178 +14,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="dir/./File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="dir/../File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-# rejected by libmetalink
-File1_orig = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#1", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["./File1", None, File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["../File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["dir/./File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["dir/../File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", XmlName + ".#1", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-relprefix-trust.py
b/testenv/Test-metalink-xml-relprefix-trust.py
index 2d6344d..e19a8dc 100755
--- a/testenv/Test-metalink-xml-relprefix-trust.py
+++ b/testenv/Test-metalink-xml-relprefix-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML relative directory prefix support in Wget.
@@ -15,179 +14,89 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --directory-prefix ../dir
--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", "File1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", "File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--directory-prefix ../dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-relprefix.py
b/testenv/Test-metalink-xml-relprefix.py
index 35883d8..98718c7 100755
--- a/testenv/Test-metalink-xml-relprefix.py
+++ b/testenv/Test-metalink-xml-relprefix.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML relative directory prefix support in Wget.
@@ -15,179 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="subdir/File1">
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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="/subdir/File2"> <!-- rejected by libmetalink -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="~/subdir/File3"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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="../subdir/File4"> <!-- rejected by libmetalink -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="subdir/File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# rejected by libmetalink
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-# rejected by libmetalink
-File3_orig = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-# rejected by libmetalink
-File4_orig = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#2", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--directory-prefix ../dir --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["subdir/File1", XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["/subdir/File2", None, File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["~/subdir/File3", None, File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["../subdir/File4", None, File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["subdir/File5", XmlName + ".#2", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--directory-prefix ../dir " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-size.py
b/testenv/Test-metalink-xml-size.py
index 4c7ccb7..3250967 100755
--- a/testenv/Test-metalink-xml-size.py
+++ b/testenv/Test-metalink-xml-size.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML file size check in Wget.
@@ -15,188 +14,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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 ()
-File5_size = str (len (File5))
-
-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">
- <size></size> <!-- left empty on purpose, same as 0, ignored -->
- <verification>
- <hash type="sha256">{{FILE1_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>
- <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">
- <size>2</size> <!-- wrong size -->
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="File3">
- <size>0</size> <!-- 0 is ignored -->
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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">
- <size>-240</size> <!-- negative values are parsed as 0 by libmetalink,
then ignored -->
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <size>{{FILE5_SIZE}}</size> <!-- right size -->
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-# wrong size
-File2_orig = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-File3_orig = WgetFile ("File3", File3)
-File3_down = WgetFile ("test.metalink.#3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("test.metalink.#4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 1
-ExpectedDownloadedFiles = [
- File1_down,
- File3_down,
- File4_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["File1", XmlName + ".#1", File1, "", True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", None, File2, 2, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["File3", XmlName + ".#3", File3, 0, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["File4", XmlName + ".#4", File4, -5, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", XmlName + ".#5", File5, True, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
-
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{FILE5_SIZE}}', File5_size)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+Meta.print_meta ()
+
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 1
+)
exit (err)
diff --git a/testenv/Test-metalink-xml-trust.py
b/testenv/Test-metalink-xml-trust.py
index c930c79..88049ca 100755
--- a/testenv/Test-metalink-xml-trust.py
+++ b/testenv/Test-metalink-xml-trust.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML file support in Wget.
@@ -15,182 +14,88 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url>
- <url type="http"
preference="40">http://{{SRV_HOST}}:{{SRV_PORT}}/404</url>
- <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">
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="File3">
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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">
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("File1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-File2_orig = WgetFile ("File2", File2)
-File2_down = WgetFile ("File2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-File3_orig = WgetFile ("File3", File3)
-File3_down = WgetFile ("File3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("File4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("File5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--trust-server-names --input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File2_down,
- File3_down,
- File4_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["File1", "File1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", "File2", File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["File3", "File3", File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["File4", "File4", File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", "File5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--trust-server-names " + \
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/Test-metalink-xml.py b/testenv/Test-metalink-xml.py
old mode 100755
new mode 100644
index 3f1eafd..788d375
--- a/testenv/Test-metalink-xml.py
+++ b/testenv/Test-metalink-xml.py
@@ -1,8 +1,7 @@
#!/usr/bin/env python3
+
from sys import exit
-from test.http_test import HTTPTest
-from misc.wget_file import WgetFile
-import hashlib
+from misc.metalinkv3_xml import Metalinkv3_XML
"""
This is to test Metalink/XML file support in Wget.
@@ -15,182 +14,87 @@ import hashlib
Strip the directory from unsafe paths.
"""
+
############# File Definitions ###############################################
-bad = "Ouch!"
+wrong_file = "Ouch!"
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="35">http://{{SRV_HOST}}:{{SRV_PORT}}/wrong_file</url>
- <url type="http"
preference="40">http://{{SRV_HOST}}:{{SRV_PORT}}/404</url>
- <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">
- <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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File2_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File2</url>
- </resources>
- </file>
- <file name="File3">
- <verification>
- <hash type="sha256">{{FILE3_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>
- <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">
- <verification>
- <hash type="sha256">{{FILE4_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>
- <url type="http"
preference="25">http://{{SRV_HOST}}:{{SRV_PORT}}/File4_lowPref</url>
- <url type="http"
preference="30">http://{{SRV_HOST}}:{{SRV_PORT}}/File4</url>
- </resources>
- </file>
- <file name="File5">
- <verification>
- <hash type="sha256">{{FILE5_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>
- <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)
-
-File1_orig = WgetFile ("File1", File1)
-File1_down = WgetFile ("test.metalink.#1", File1)
-File1_nono = WgetFile ("File1_lowPref", File1_lowPref)
-
-File2_orig = WgetFile ("File2", File2)
-File2_down = WgetFile ("test.metalink.#2", File2)
-File2_nono = WgetFile ("File2_lowPref", File2_lowPref)
-
-File3_orig = WgetFile ("File3", File3)
-File3_down = WgetFile ("test.metalink.#3", File3)
-File3_nono = WgetFile ("File3_lowPref", File3_lowPref)
-
-File4_orig = WgetFile ("File4", File4)
-File4_down = WgetFile ("test.metalink.#4", File4)
-File4_nono = WgetFile ("File4_lowPref", File4_lowPref)
-
-File5_orig = WgetFile ("File5", File5)
-File5_down = WgetFile ("test.metalink.#5", File5)
-File5_nono = WgetFile ("File5_lowPref", File5_lowPref)
-
-MetaFile = WgetFile ("test.metalink", MetaXml)
-
-WGET_OPTIONS = "--input-metalink test.metalink"
-WGET_URLS = [[]]
-
-Files = [[
- wrong_file,
- File1_orig, File1_nono,
- File2_orig, File2_nono,
- File3_orig, File3_nono,
- File4_orig, File4_nono,
- File5_orig, File5_nono
-]]
-Existing_Files = [MetaFile]
-
-ExpectedReturnCode = 0
-ExpectedDownloadedFiles = [
- File1_down,
- File2_down,
- File3_down,
- File4_down,
- File5_down,
- 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,
+############# Metalink/XML ###################################################
+Meta = Metalinkv3_XML()
+
+# file_name: metalink:file "name" field
+# save_name: metalink:file save name, if None the file is rejected
+# content : metalink:file content
+#
+# size:
+# True auto-compute size
+# None no <size></size>
+# any use this size
+#
+# hash_sha256:
+# False no <verification></verification>
+# True auto-compute sha256
+# None no <hash></hash>
+# any use this hash
+#
+# srv_file : metalink:url server file
+# srv_content: metalink:url server file content, if None the file doesn't exist
+# utype : metalink:url type (http, ftp, etc.)
+# location : metalink:url location (default 'no location field')
+# preference : metalink:url preference (default 999999)
+
+XmlName = "test.metalink"
+
+Meta.xml (
+ # Metalink/XML file name
+ XmlName,
+ # file_name, save_name, content, size, hash_sha256
+ ["File1", XmlName + ".#1", File1, None, True,
+ # srv_file, srv_content, utype, location, preference
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File1_lowPref", File1_lowPref, "http", None, 25],
+ ["File1", File1, "http", None, 30]],
+ ["File2", XmlName + ".#2", File2, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File2_lowPref", File2_lowPref, "http", None, 25],
+ ["File2", File2, "http", None, 30]],
+ ["File3", XmlName + ".#3", File3, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File3_lowPref", File3_lowPref, "http", None, 25],
+ ["File3", File3, "http", None, 30]],
+ ["File4", XmlName + ".#4", File4, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File4_lowPref", File4_lowPref, "http", None, 25],
+ ["File4", File4, "http", None, 30]],
+ ["File5", XmlName + ".#5", File5, None, True,
+ ["wrong_file", wrong_file, "http", None, 35],
+ ["404", None, "http", None, 40],
+ ["File5_lowPref", File5_lowPref, "http", None, 25],
+ ["File5", File5, "http", None, 30]],
)
-http_test.server_setup()
-### Get and use dynamic server sockname
-srv_host, srv_port = http_test.servers[0].server_inst.socket.getsockname ()
+Meta.print_meta ()
-MetaXml = MetaXml.replace('{{FILE1_HASH}}', File1_sha256)
-MetaXml = MetaXml.replace('{{FILE2_HASH}}', File2_sha256)
-MetaXml = MetaXml.replace('{{FILE3_HASH}}', File3_sha256)
-MetaXml = MetaXml.replace('{{FILE4_HASH}}', File4_sha256)
-MetaXml = MetaXml.replace('{{FILE5_HASH}}', File5_sha256)
-MetaXml = MetaXml.replace('{{SRV_HOST}}', srv_host)
-MetaXml = MetaXml.replace('{{SRV_PORT}}', str (srv_port))
-MetaFile.content = MetaXml
-
-err = http_test.begin ()
+err = Meta.http_test (
+ "--input-metalink " + XmlName, 0
+)
exit (err)
diff --git a/testenv/misc/metalinkv3_xml.py b/testenv/misc/metalinkv3_xml.py
new file mode 100644
index 0000000..794bf87
--- /dev/null
+++ b/testenv/misc/metalinkv3_xml.py
@@ -0,0 +1,305 @@
+from test.http_test import HTTPTest
+from misc.wget_file import WgetFile
+import hashlib
+
+class Metalinkv3_XML:
+
+ """ Metalink/XML v3 object """
+
+ # Initialize the Metalink object
+ def __init__ (self):
+ self.reset ()
+
+ # Reset the Metalink object
+ def reset (self):
+ self.LocalFiles = [] # list of WgetFile objects
+ self.ServerFiles = [[]] # list of WgetFile objects
+ self.ExpectedFiles = [] # list of WgetFile objects
+ self.LocalFiles_Set = [] # used as `list (set (var))`
+ self.ServerFiles_Set = [[]] # used as `list (set (var))`
+ self.ExpectedFiles_Set = [] # used as `list (set (var))`
+ self.Xml = '' # Metalink/XML content
+ self.XmlName = '' # Metalink/XML file name
+ self.XmlFile = None # Metalink/XML WgetFile object
+ self.Xml_Header = '<?xml version="1.0" encoding="utf-8"?>\n' + \
+ '<metalink version="3.0"
xmlns="http://www.metalinker.org/";>\n' + \
+ ' <publisher>\n' + \
+ ' <name>GNU Wget</name>\n' + \
+ ' </publisher>\n' + \
+ ' <license>\n' + \
+ ' <name>GNU GPL</name>\n' + \
+ '
<url>http://www.gnu.org/licenses/gpl.html</url>\n' + \
+ ' </license>\n' + \
+ ' <identity>Wget Test Files</identity>\n' + \
+ ' <version>1.2.3</version>\n' + \
+ ' <description>Wget Test Files
description</description>\n' + \
+ ' <files>\n'
+ self.Xml_Footer = ' </files>\n' + \
+ '</metalink>\n'
+
+ # Print the Metalink object.
+ def print_meta (self):
+
+ print (self.Xml)
+ print ("LocalFiles = " + str (self.LocalFiles_Set))
+ print ("ServerFiles = " + str (self.ServerFiles_Set))
+ print ("ExpectedFiles = " + str (self.ExpectedFiles_Set))
+
+ # Add LocalFiles as WgetFile objects
+ #
+ # ["file_name", "content"],
+ # ["file_name", "content"]
+ def add_LocalFiles (self, *local_files):
+
+ for (file_name, content) in local_files:
+ if not file_name in self.LocalFiles_Set:
+ self.LocalFiles_Set.append (file_name)
+ self.LocalFiles.append (WgetFile (file_name, content))
+
+ # Add ServerFiles as WgetFile objects
+ #
+ # ["file_name", "content"],
+ # ["file_name", "content"]
+ def add_ServerFiles (self, *server_files):
+
+ for (file_name, content) in server_files:
+ if not file_name in self.ServerFiles_Set[0]:
+ self.ServerFiles_Set[0].append (file_name)
+ self.ServerFiles[0].append (WgetFile (file_name, content))
+
+ # Add ExpectedFiles as WgetFile objects
+ #
+ # ["file_name", "content"],
+ # ["file_name", "content"]
+ def add_ExpectedFiles (self, *expected_files):
+
+ for (file_name, content) in expected_files:
+ if not file_name in self.ExpectedFiles_Set:
+ self.ExpectedFiles_Set.append (file_name)
+ self.ExpectedFiles.append (WgetFile (file_name, content))
+
+ # Run a Wget HTTP test for the Metalink object.
+ def http_test (self, command_line, expected_retcode):
+
+ pre_test = {
+ "ServerFiles" : self.ServerFiles, # list of WgetFile objects
as [[]]
+ "LocalFiles" : self.LocalFiles, # list of WgetFile objects
as []
+ }
+
+ test_options = {
+ "WgetCommands" : command_line, # Wget cli
+ "Urls" : [[]], # Wget urls
+ }
+
+ post_test = {
+ "ExpectedFiles" : self.ExpectedFiles, # list of WgetFile objects
as []
+ "ExpectedRetcode" : expected_retcode, # Wget return status code
+ }
+
+ 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 ()
+
+ self.set_srv (srv_host, srv_port)
+
+ err = http_test.begin ()
+
+ return err
+
+ # Set the Wget server host and port in the Metalink/XML content.
+ def set_srv (self, srv_host, srv_port):
+
+ self.Xml = self.Xml.replace('{{SRV_HOST}}', srv_host)
+ self.Xml = self.Xml.replace('{{SRV_PORT}}', str (srv_port))
+
+ if self.XmlFile is not None:
+ self.XmlFile.content = self.Xml
+
+ # Create the Metalink/XML file.
+ #
+ # Add the Metalink/XML file to the list of ExpectedFiles.
+ #
+ # size:
+ # True auto-compute size
+ # None no <size></size>
+ # any use this size
+ #
+ # hash_sha256:
+ # False no <verification></verification>
+ # True auto-compute sha256
+ # None no <hash></hash>
+ # any use this hash
+ #
+ # ARGUMENTS:
+ #
+ # "xml_name", #
Metalink/XML file name
+ # ["file_name", "save_name", "content", size, hash_sha256, #
metalink:file
+ # ["srv_file", "srv_content", utype, location, preference], # resource
+ # ["srv_file", "srv_content", utype, location, preference]], # resource
+ # ["file_name", "save_name", "content", size, hash_sha256,
+ # ["srv_file", "srv_content", utype, location, preference],
+ # ["srv_file", "srv_content", utype, location, preference]]
+ def xml (self, xml_name, *xml_data):
+
+ self.Xml = self.Xml_Header
+
+ for (file_name, save_name, content, size, hash_sha256, *resources) in
xml_data:
+ self.Xml += self.file_tag (file_name, save_name, content, size,
hash_sha256, resources) + '\n'
+
+ self.Xml += self.Xml_Footer
+
+ self.XmlName = xml_name
+ self.XmlFile = WgetFile (xml_name, self.Xml)
+
+ if not xml_name in self.LocalFiles_Set:
+ self.LocalFiles_Set.append (xml_name)
+ self.LocalFiles.append (self.XmlFile)
+
+ if not xml_name in self.ExpectedFiles_Set:
+ self.ExpectedFiles_Set.append (xml_name)
+ self.ExpectedFiles.append (self.XmlFile)
+
+ # Create the file tag.
+ #
+ # Add the file to be saved to the list of ExpectedFiles.
+ #
+ # size:
+ # True auto-compute size
+ # None no <size></size>
+ # any use this size
+ #
+ # hash_sha256:
+ # False no <verification></verification>
+ # True auto-compute sha256
+ # None no <hash></hash>
+ # any use this hash
+ #
+ # ARGUMENTS:
+ #
+ # ["file_name", "save_name", "content", size, hash_sha256, #
metalink:file
+ # ["srv_file", "srv_content", utype, location, preference], # resource
+ # ["srv_file", "srv_content", utype, location, preference]] # resource
+ def file_tag (self, file_name, save_name, content, size, hash_sha256,
resources):
+
+ Tag = ' <file name="' + file_name + '">\n'
+
+ if save_name is not None:
+ self.add_ExpectedFiles ([save_name, content])
+
+ size_Tag = self.size_tag (content, size)
+
+ if size_Tag is not None:
+ Tag += size_Tag + '\n'
+
+ verification_Tag = self.verification_tag (content, hash_sha256)
+
+ if verification_Tag is not None:
+ Tag += verification_Tag + '\n'
+
+ Tag += self.resources_tag (resources) + '\n'
+
+ Tag += ' </file>'
+
+ return Tag
+
+ # Create the size tag.
+ #
+ # size:
+ # True auto-compute size
+ # None no <size></size>
+ # any use this size
+ #
+ # ARGUMENTS:
+ #
+ # "content", size
+ def size_tag (self, content = None, size = None):
+
+ Tag = None
+
+ if content is not None and size is True:
+ size = len (content)
+
+ if size is not None:
+ Tag = ' <size>' + str (size) + '</size>'
+
+ return Tag
+
+ # Create the verification tag.
+ #
+ # hash_sha256:
+ # False no <verification></verification>
+ # True auto-compute sha256
+ # None no <hash></hash>
+ # any use this hash
+ #
+ # ARGUMENTS:
+ #
+ # "content", hash_sha256
+ def verification_tag (self, content = None, hash_sha256 = None):
+
+ Tag = None
+
+ if hash_sha256 is not False:
+
+ if content is not None and hash_sha256 is True:
+ hash_sha256 = hashlib.sha256 (content.encode
('UTF-8')).hexdigest ()
+
+ if hash_sha256 is None:
+ Tag = ' <verification>\n' + \
+ ' </verification>'
+ else:
+ Tag = ' <verification>\n' + \
+ ' <hash type="sha256">' + str (hash_sha256) +
'</hash>\n' + \
+ ' </verification>'
+
+ return Tag
+
+ # Create the resources tag.
+ #
+ # ARGUMENTS:
+ #
+ # ["srv_file", "srv_content", utype, location, preference], # resource
+ # ["srv_file", "srv_content", utype, location, preference] # resource
+ def resources_tag (self, resources):
+
+ Tag = ' <resources>\n'
+
+ for (srv_file, srv_content, utype, location, preference) in resources:
+ Tag += self.url_tag (srv_file, srv_content, utype, location,
preference) + '\n'
+
+ Tag += ' </resources>'
+
+ return Tag
+
+ # Create the url tag.
+ #
+ # Add the file to the list of Files when there is a content.
+ #
+ # ARGUMENTS:
+ #
+ # "srv_file", "srv_content", utype, location, preference # resource
+ def url_tag (self, srv_file, srv_content = None, utype = "http", location
= None, preference = 999999):
+
+ Loc = ''
+
+ if location is not None:
+ Loc = 'location="' + location + '" '
+
+ Tag = ' ' + \
+ '<url ' + \
+ 'type="' + utype + '" ' + \
+ Loc + \
+ 'preference="' + str (preference) + '">' + \
+ 'http://{{SRV_HOST}}:{{SRV_PORT}}/' + srv_file + \
+ '</url>'
+
+ if srv_content is not None:
+ self.add_ServerFiles ([srv_file, srv_content])
+
+ return Tag
--
2.7.3
- [Bug-wget] [PATCH 13/27] New: Metalink/XML and Metalink/HTTP file naming safety rules, (continued)
- [Bug-wget] [PATCH 13/27] New: Metalink/XML and Metalink/HTTP file naming safety rules, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 23/27] Bugfix: Detect when a metalink:file doesn't have any hash, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 22/27] Bugfix: Detect malformed base64 Metalink/HTTP Digest header, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 21/27] New option --metalink-index to process Metalink application/metalink4+xml, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 25/27] Bugfix: Set NULL variable due to --content-disposition to Metalink origin, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 24/27] New: --trust-server-names saves Metalink/HTTP xml files using the "name" field, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 26/27] New: --metalink-over-http Content-Type/Disposition Metalink/XML processing, Matthew White, 2016/09/29
- [Bug-wget] [PATCH 27/27] New: Metalink/XML v3 python class, update tests to use this class,
Matthew White <=
- Re: [Bug-wget] [PATCH v2 01/27] new Metalink functionalities, Giuseppe Scrivano, 2016/09/29