diff options
| author | Gianfranco Costamagna <locutusofborg@debian.org> | 2018-02-10 15:26:31 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2018-02-10 22:37:28 +0000 |
| commit | b00a096b5a1b205dc7074c23ba55472dcc35eece (patch) | |
| tree | 2250ea159bf1e127f7b390c7e7e3746f51722b4e | |
| parent | 8b7cd3a38ba3b63e54c20b20b49872048085df4d (diff) | |
| parent | cb5833ac693c9f1d66671e4cb5209138fa974f47 (diff) | |
0.4.4-1 (patches applied)applied/0.4.4-1applied/ubuntu/bionic-proposedapplied/ubuntu/bionic-develapplied/ubuntu/bionic
Imported using git-ubuntu import.
| -rw-r--r-- | PKG-INFO | 44 | ||||
| -rw-r--r-- | README.md | 122 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | ndg/httpsclient/test/pki/ca/08bd99c7.0 | 20 | ||||
| -rw-r--r-- | ndg/httpsclient/test/pki/ca/7e15277f.0 | 20 | ||||
| -rw-r--r-- | ndg/httpsclient/test/pki/ca/ade0138a.0 | 20 | ||||
| -rw-r--r-- | ndg/httpsclient/test/pki/localhost.crt | 97 | ||||
| -rw-r--r-- | ndg/httpsclient/test/pki/localhost.key | 50 | ||||
| -rw-r--r-- | ndg_httpsclient.egg-info/PKG-INFO | 44 | ||||
| -rw-r--r-- | ndg_httpsclient.egg-info/SOURCES.txt | 4 | ||||
| -rw-r--r-- | setup.py | 48 |
13 files changed, 270 insertions, 211 deletions
@@ -1,37 +1,41 @@ Metadata-Version: 1.1 Name: ndg_httpsclient -Version: 0.4.3 +Version: 0.4.4 Summary: Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL Home-page: https://github.com/cedadev/ndg_httpsclient/ Author: Richard Wilkinson and Philip Kershaw Author-email: Philip.Kershaw@stfc.ac.uk License: BSD - See ndg/httpsclient/LICENCE file for details Description: - A HTTPS client implementation for - * ``httplib`` (Python 2), ``http.client`` (Python 3) and + A HTTPS client implementation for + * ``httplib`` (Python 2), ``http.client`` (Python 3) and * ``urllib2`` (Python 2) and ``urllib`` (Python 3) - ... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation - over the default provided with Python and importantly enables full verification + ... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation + over the default provided with Python and importantly enables full verification of the SSL peer using ``pyasn1``. Releases ======== + 0.4.4 + ----- + * Update test certificate files. + 0.4.3 ----- - * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). + * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). ``__init__.py`` file now included in ``ndg`` directory so that there are no longer warnings with imports when using Python 2.x. Thanks to Max Mauntner for fix. * Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and https://github.com/cedadev/ndg_httpsclient/pull/10. ``pyasn1`` also becomes mandatory rather - than optional package for install. - It required by ``cryptography`` anyway which is a + than optional package for install. - It required by ``cryptography`` anyway which is a dependency for ``pyOpenSSL`` from version 0.14. 0.4.2 ----- - * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. - Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` + * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. + Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` interfaces that this package provides. 0.4.1 @@ -42,7 +46,7 @@ Description: 0.4.0 ----- * Made dual compatible with Python 2 / 3. - + 0.3.3 ----- * Fix to add in AnotherName for ``subjectAltNames`` field - added for support for CACert issued @@ -52,12 +56,12 @@ Description: 0.3.2 ----- - * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is + * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is installed. - * Fix to open_url: HTTP Request object was being created inside if headers is + * Fix to open_url: HTTP Request object was being created inside if headers is None block - now corrected to create regardless. * Added http basic auth support to script. (Thanks to Willem van Engen) - + 0.3.1 ----- * extended utils functions to support keyword for passing additional ``urllib2`` @@ -80,9 +84,9 @@ Description: Prerequisites ============= - This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 - and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and - 3.4. Note that proxy support is only available from Python 2.6.2 onwards. + This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 + and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and + 3.4. Note that proxy support is only available from Python 2.6.2 onwards. ``pyasn1`` is required for correct SSL verification with ``subjectAltNames``. Installation @@ -113,15 +117,15 @@ Description: Trusted CA certificate file directory. ``-d, --debug`` - Print debug information - this may be useful in solving problems with HTTP or + Print debug information - this may be useful in solving problems with HTTP or HTTPS access to a server. - + ``-p FILE, --post-data-file=FILE`` POST data file - + ``-f FILE, --fetch=FILE`` Output file - + ``-n, --no-verify-peer`` Skip verification of peer certificate. diff --git a/README.md b/README.md new file mode 100644 index 0000000..f7e7093 --- /dev/null +++ b/README.md @@ -0,0 +1,122 @@ +A HTTPS client implementation for + * ``httplib`` (Python 2), ``http.client`` (Python 3) and + * ``urllib2`` (Python 2) and ``urllib`` (Python 3) + +... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation +over the default provided with Python and importantly enables full verification +of the SSL peer using ``pyasn1``. + +Releases +======== +0.4.4 +----- + * Updated test certificates + +0.4.3 +----- + * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). + ``__init__.py`` file now included in ``ndg`` directory so that there are no longer warnings with imports + when using Python 2.x. Thanks to Max Mauntner for fix. + * Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu + install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and + https://github.com/cedadev/ndg_httpsclient/pull/10. ``pyasn1`` also becomes mandatory rather + than optional package for install. - It required by ``cryptography`` anyway which is a + dependency for ``pyOpenSSL`` from version 0.14. + +0.4.2 +----- + * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. + Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` + interfaces that this package provides. + +0.4.1 +----- + * Added explicit ref to Python 3 in classifier text for Python 3 checking tools. + * Moved LICENSE file into package + +0.4.0 +----- + * Made dual compatible with Python 2 / 3. + +0.3.3 +----- + * Fix to add in AnotherName for ``subjectAltNames`` field - added for support for CACert issued + certs (thanks to Gu1). + * Fix to HTTP Basic Auth option for ``ndg.httpsclient.utils.main`` + * Fix to ``ServerSSLCertVerification`` so that it can pass a function-based callback instead of using ``__call__``. In newer versions of OpenSSL (>= 0.14) the latter failed because of a request for ``__name__`` attribute. + +0.3.2 +----- + * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is + installed. + * Fix to open_url: HTTP Request object was being created inside if headers is + None block - now corrected to create regardless. + * Added http basic auth support to script. (Thanks to Willem van Engen) + +0.3.1 +----- + * extended utils functions to support keyword for passing additional ``urllib2`` + handlers. + +0.3.0 +----- + * Added ``ndg.httpsclient.utils.fetch_stream_from_url`` function and added + parameter for data to post in ``open_url`` and ``fetch_*`` methods. + * fix to ndg.httpsclient.utils module _should_use_proxy and open_url functions + +0.2.0 +----- + * added support for SSL verification with subjectAltNames using pyasn1 + * fixed minor bug - SSL cert DN prefix matching + +0.1.0 +----- +Initial release + +Prerequisites +============= +This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 +and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and +3.4. Note that proxy support is only available from Python 2.6.2 onwards. +``pyasn1`` is required for correct SSL verification with ``subjectAltNames``. + +Installation +============ +Installation can be performed using easy_install or pip. + +Running ndg_httpclient +====================== +A simple script for fetching data using HTTP or HTTPS GET from a specified URL. + +Parameter: + +``url`` + The URL of the resource to be fetched + +Options: + +``-h, --help`` + Show help message and exit. + +``-c FILE, --certificate=FILE`` + Certificate file - defaults to ``$HOME/credentials.pem`` + +``-k FILE, --private-key=FILE`` + Private key file - defaults to the certificate file + +``-t DIR, --ca-certificate-dir=DIR`` + Trusted CA certificate file directory. + +``-d, --debug`` + Print debug information - this may be useful in solving problems with HTTP or + HTTPS access to a server. + +``-p FILE, --post-data-file=FILE`` + POST data file + +``-f FILE, --fetch=FILE`` + Output file + +``-n, --no-verify-peer`` + Skip verification of peer certificate. + diff --git a/debian/changelog b/debian/changelog index 9ae7552..25499ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ndg-httpsclient (0.4.4-1) unstable; urgency=medium + + * New upstream version 0.4.4 + * Bump std-version to 4.1.2 + * Bump copyright year + + -- Gianfranco Costamagna <locutusofborg@debian.org> Sat, 10 Feb 2018 15:26:31 +0100 + ndg-httpsclient (0.4.3-1) unstable; urgency=medium * New upstream version 0.4.3 diff --git a/debian/control b/debian/control index e7d9123..cbf7cec 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10), python3-openssl, python3-pyasn1, python3-setuptools -Standards-Version: 4.1.0 +Standards-Version: 4.1.3 Homepage: https://pypi.python.org/pypi/ndg-httpsclient Vcs-Git: https://anonscm.debian.org/git/collab-maint/ndg-httpsclient.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ndg-httpsclient.git diff --git a/debian/copyright b/debian/copyright index 9e48850..db3b9fe 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ License: BSD-3-clause Files: debian/* Copyright: 2014 Julien Cristau <jcristau@debian.org> - 2015-2017 Gianfranco Costamagna <locutusofborg@debian.org> + 2015-2018 Gianfranco Costamagna <locutusofborg@debian.org> License: BSD-3-clause License: BSD-3-clause diff --git a/ndg/httpsclient/test/pki/ca/08bd99c7.0 b/ndg/httpsclient/test/pki/ca/08bd99c7.0 deleted file mode 100644 index 63ef7c3..0000000 --- a/ndg/httpsclient/test/pki/ca/08bd99c7.0 +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQUFADA3MREwDwYDVQQLDAhTZWN1 -cml0eTEUMBIGA1UEAwwLTkRHIFRlc3QgQ0ExDDAKBgNVBAoMA05ERzAeFw0xNTAx -MjExNDMzMThaFw0yMDAxMjAxNDMzMThaMDcxETAPBgNVBAsMCFNlY3VyaXR5MRQw -EgYDVQQDDAtOREcgVGVzdCBDQTEMMAoGA1UECgwDTkRHMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEArq4QKUTRq45nCDR/p+OlHIIN8+ugUbiCfteazbTG -rX8vIQ9HxSuz/xvxTw+E0KgA4YSK2SJJP4QiCjlMKYS3Rt8o361GNtnRmeo5qyBu -GMSv73XL1uuqumggUZyrhhksckR7gyNFnKVXzZjAQPepsT0xBjs5uEAEqXJzAf+r -24AnT3MZRh7gsyEe3sZjd75kZVwcrWhrocyKlMCR77yEr+uP4pg+dEMhDMKKxlaF -C5RPMotOpWm/7AToHrGia34WSmcxvuOwxOkI4xEW6mxWMaVTBCXUh6Wb/0m/x8Nv -9VvS2UBC4sCp4MqlDpySxQpT1RgrhMTEmtUOh50l4eEhdwIDAQABo0UwQzASBgNV -HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkEvQjGOP -Oj5DZEvsm96AdiiFXWgwDQYJKoZIhvcNAQEFBQADggEBAGD0kQASmNzvtYL+JUGf -gTPyJhADl9Ai9GvZJsY/wX0IRTxRl5y08Dqlg3qyGG3GzL918cr1sVCYnLepNQES -T0MIz50DCKGryNSc74JHPDxpYaSV6whmNH5iwh8fy6tmJwF3FWbGXD2ddc+ofJqP -WPPJtzqxuuJ6iXQIFqD9mEn3iXVcvFuSzpdpH9paORTKB0j4gya9zctB8LP0ZXIE -//wREc+4msnmoTn+qkFAOPBg9WnvoipfyCXPgbTagxlofVjZ7gAgYIefqhXBTQdd -5tnYdyQQBRcUXQS2bBX03q8ftcxOjc3SvXI4MvrqofuFPwu4GnrspnC0KQYlXwEI -7ds= ------END CERTIFICATE----- diff --git a/ndg/httpsclient/test/pki/ca/7e15277f.0 b/ndg/httpsclient/test/pki/ca/7e15277f.0 new file mode 100644 index 0000000..b9b6ac9 --- /dev/null +++ b/ndg/httpsclient/test/pki/ca/7e15277f.0 @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQDDAtOREcg +VGVzdCBDQTEMMAoGA1UECgwDTkRHMREwDwYDVQQLDAhTZWN1cml0eTAeFw0xNjEy +MTUyMTMyNDNaFw0yMTEyMTQyMTMyNDNaMDcxFDASBgNVBAMMC05ERyBUZXN0IENB +MQwwCgYDVQQKDANOREcxETAPBgNVBAsMCFNlY3VyaXR5MIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEAv8L7md7A3NvKIYndyjHV7f1xVH6gJ8JPrecxAiVs +nidsYUm8saBV/dFf1jPMQ6hdjIuxLXlopLxThkHlCes/OTxLzBFLvFQQaxLExTsX +OmgeM4q20a2JLTqkmItPIYDVTYgi0EaF+I9Z1BwWGEfYr3uTizpr48rnzpXgRwrZ +rjRc53zLKpeqyBs7Qmg5Jlzmk/A+UWJ2ryCWLY9KFE3uPstybYpwq7YayD6upVwc +vedhh+zpXU3E9r/cnlZ4sKSP2M1QSOTb2l5XnlOU/MLODYW70uItNqs1j1XPuHYh +/ikO+jmjPUtL0IE47+LcaMU6BpaOCLzcjsSn/DDMYcDB7wIDAQABo0UwQzASBgNV +HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU9S+bGqsW +uQzR/yHDdHoU6afNTE0wDQYJKoZIhvcNAQELBQADggEBAF2scAHd7xjgnJqAUX0b +7f7QKjpuYHrt48tH+pFOh5j3IgdOqTgRLc/N8lEqoH4M0lKZKbBerM9FiQ4eXCwy +3Rswn3wXPvi3HJGgvZYUt8J6KY5+syHU4iuzuSHOjznC0lLZkRz6kfZHX+paqro4 +1CsHhCt3ew17QMWEP6UtfZfBCg+kiEfBtSsTUIth0HgdH033PWh5v+nOzGN+3o2t +ORlzpttV+0RLlsw54l51I6rCEnfKOKtEy491JUs2whUwzp9v8tG4jev3PDVWhSSS +6jaSNvW4v7SDH0pnw52ZWzaRtA/pV/dCQOlqJ87wDNPdoVGpwqtYF/7Zdw2ty4gU +oSM= +-----END CERTIFICATE----- diff --git a/ndg/httpsclient/test/pki/ca/ade0138a.0 b/ndg/httpsclient/test/pki/ca/ade0138a.0 deleted file mode 100644 index 63ef7c3..0000000 --- a/ndg/httpsclient/test/pki/ca/ade0138a.0 +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDLjCCAhagAwIBAgIBATANBgkqhkiG9w0BAQUFADA3MREwDwYDVQQLDAhTZWN1 -cml0eTEUMBIGA1UEAwwLTkRHIFRlc3QgQ0ExDDAKBgNVBAoMA05ERzAeFw0xNTAx -MjExNDMzMThaFw0yMDAxMjAxNDMzMThaMDcxETAPBgNVBAsMCFNlY3VyaXR5MRQw -EgYDVQQDDAtOREcgVGVzdCBDQTEMMAoGA1UECgwDTkRHMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEArq4QKUTRq45nCDR/p+OlHIIN8+ugUbiCfteazbTG -rX8vIQ9HxSuz/xvxTw+E0KgA4YSK2SJJP4QiCjlMKYS3Rt8o361GNtnRmeo5qyBu -GMSv73XL1uuqumggUZyrhhksckR7gyNFnKVXzZjAQPepsT0xBjs5uEAEqXJzAf+r -24AnT3MZRh7gsyEe3sZjd75kZVwcrWhrocyKlMCR77yEr+uP4pg+dEMhDMKKxlaF -C5RPMotOpWm/7AToHrGia34WSmcxvuOwxOkI4xEW6mxWMaVTBCXUh6Wb/0m/x8Nv -9VvS2UBC4sCp4MqlDpySxQpT1RgrhMTEmtUOh50l4eEhdwIDAQABo0UwQzASBgNV -HRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUkEvQjGOP -Oj5DZEvsm96AdiiFXWgwDQYJKoZIhvcNAQEFBQADggEBAGD0kQASmNzvtYL+JUGf -gTPyJhADl9Ai9GvZJsY/wX0IRTxRl5y08Dqlg3qyGG3GzL918cr1sVCYnLepNQES -T0MIz50DCKGryNSc74JHPDxpYaSV6whmNH5iwh8fy6tmJwF3FWbGXD2ddc+ofJqP -WPPJtzqxuuJ6iXQIFqD9mEn3iXVcvFuSzpdpH9paORTKB0j4gya9zctB8LP0ZXIE -//wREc+4msnmoTn+qkFAOPBg9WnvoipfyCXPgbTagxlofVjZ7gAgYIefqhXBTQdd -5tnYdyQQBRcUXQS2bBX03q8ftcxOjc3SvXI4MvrqofuFPwu4GnrspnC0KQYlXwEI -7ds= ------END CERTIFICATE----- diff --git a/ndg/httpsclient/test/pki/localhost.crt b/ndg/httpsclient/test/pki/localhost.crt index 953c7ef..99711dc 100644 --- a/ndg/httpsclient/test/pki/localhost.crt +++ b/ndg/httpsclient/test/pki/localhost.crt @@ -1,82 +1,19 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Issuer: OU=Security, CN=NDG Test CA, O=NDG - Validity - Not Before: Jan 21 14:45:01 2015 GMT - Not After : Jan 20 14:45:01 2018 GMT - Subject: O=NDG, OU=Security, CN=localhost - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (2048 bit) - Modulus (2048 bit): - 00:e3:29:45:fc:56:2d:a2:21:b6:49:c6:6a:ef:b3: - ed:d3:32:47:77:d9:85:ef:e5:6a:db:70:8b:5d:41: - 4d:b5:76:f5:96:42:5a:f7:82:a5:bb:b3:e1:f9:ac: - c6:b7:71:61:f4:4d:dd:28:f6:b1:ef:65:dc:5a:8c: - 47:b1:17:38:e1:8a:5f:40:b0:bb:a0:87:61:a7:72: - f8:c1:a1:5f:3b:f7:94:b5:cb:c3:50:84:ef:a8:13: - d4:92:ff:af:3a:d1:31:42:90:4b:58:4c:84:47:a6: - 3a:a3:3d:c1:9a:43:3c:10:f6:8a:b5:97:11:b7:74: - ab:32:92:be:9a:fc:ef:5e:45:78:30:61:67:10:63: - 09:ef:61:b7:1c:47:cc:69:c9:e7:27:8f:4d:97:33: - 59:33:b8:47:89:86:4c:cd:a4:38:7c:d0:60:ee:52: - c8:e1:2a:f1:3b:9b:e9:7c:d5:af:88:33:91:9c:10: - 63:89:01:03:fb:26:5e:3f:61:c3:b4:f0:fb:1f:ad: - e8:d2:49:8e:2f:16:81:bb:9c:d6:a5:48:91:58:7d: - ac:ac:2c:02:8a:f2:f4:22:80:1f:8c:32:5b:b5:77: - d0:36:e9:27:9a:9f:31:67:d5:4e:32:8d:cf:ce:73: - ef:88:86:e9:3c:53:e6:09:55:02:2b:86:7d:91:8d: - fb:53 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE - Netscape Comment: - OpenSSL Generated Certificate - X509v3 Subject Key Identifier: - A3:77:23:B5:1C:98:85:C8:6D:31:40:1C:2F:20:57:CD:C9:36:74:1B - X509v3 Authority Key Identifier: - keyid:90:4B:D0:8C:63:8F:3A:3E:43:64:4B:EC:9B:DE:80:76:28:85:5D:68 - - X509v3 Subject Alternative Name: - DNS:localhost - Signature Algorithm: sha1WithRSAEncryption - 33:b4:87:0e:2c:71:88:6d:ab:cc:14:c8:3f:1e:8d:e5:ed:26: - 6b:b8:76:93:29:b1:0b:c5:e7:41:6f:14:62:8f:e1:81:bb:02: - 13:5c:b2:34:b7:94:f2:7d:1e:fe:e7:89:0b:2e:56:30:58:eb: - 90:d4:05:5b:18:d9:c5:68:61:c0:f6:f7:1a:0f:14:d8:89:8e: - ee:ec:59:b8:48:96:58:33:2e:98:95:56:c3:02:e9:93:cd:3f: - 4c:0d:b5:b5:b6:6e:6f:95:5f:65:eb:1a:ce:56:20:e2:72:d4: - f7:58:5f:c0:7b:49:5f:ac:6b:01:7b:c8:f0:13:19:03:dd:4e: - 05:55:f9:31:52:ea:45:eb:54:b9:4b:a2:3f:22:c7:11:47:8a: - 94:b4:e9:9e:c0:09:96:72:66:ba:01:d3:f3:00:6e:24:ca:a9: - 6d:8e:7f:0b:a0:fd:f9:c9:4f:3a:36:07:c7:4a:c7:c7:1f:c7: - e0:2d:c3:21:d0:44:68:81:38:af:ce:cb:38:be:db:02:3d:ba: - 62:00:43:94:22:c8:d7:43:cd:db:73:23:9d:28:aa:d6:4c:08: - 45:8f:b5:1d:04:c7:2b:8e:22:12:e6:af:cd:9c:13:db:c9:76: - f4:0c:10:25:fa:5c:46:77:7d:e5:ee:16:b4:f1:24:94:22:06: - 85:40:0c:5f -----BEGIN CERTIFICATE----- -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 +vAMwOmVKhtgKvbaGcYa6efM= -----END CERTIFICATE----- diff --git a/ndg/httpsclient/test/pki/localhost.key b/ndg/httpsclient/test/pki/localhost.key index 6a11b49..98a3db4 100644 --- a/ndg/httpsclient/test/pki/localhost.key +++ b/ndg/httpsclient/test/pki/localhost.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA4ylF/FYtoiG2ScZq77Pt0zJHd9mF7+Vq23CLXUFNtXb1lkJa -94Klu7Ph+azGt3Fh9E3dKPax72XcWoxHsRc44YpfQLC7oIdhp3L4waFfO/eUtcvD -UITvqBPUkv+vOtExQpBLWEyER6Y6oz3BmkM8EPaKtZcRt3SrMpK+mvzvXkV4MGFn -EGMJ72G3HEfMacnnJ49NlzNZM7hHiYZMzaQ4fNBg7lLI4SrxO5vpfNWviDORnBBj -iQED+yZeP2HDtPD7H63o0kmOLxaBu5zWpUiRWH2srCwCivL0IoAfjDJbtXfQNukn -mp8xZ9VOMo3PznPviIbpPFPmCVUCK4Z9kY37UwIDAQABAoIBAF29Fmg+l64kAzkG -a/JmaWmRgfRvCton7aSIGLpuzEZpxIYw86DXhNSkMkf5iDcCzs0lpHHW+y4y9m9X -G+50CsDnfM8RHxvrQdz7kLM2iDoSvIcYgoyjjtHo/Pt8Dy9SS+WP7ceOK7f1XJUo -Us/5lrvZQPwWTvVJa6v+6jDC13Qqp34qNXCBZvU2WJpjM8Yau3C6ixP2ifJMmoOV -5BT7bUPwn9QT49PFDLSbKKUnvr8ClhXF2hF2B4ztm3SIjhMe7kwuU+i8yWlFiGT+ -RzSvKGGA7QtDeww5vrMEpaudQaU0MvcKbsolk/MDh0Kcy3fKKz1OSZEvvZ1hCzlr -4flLOOECgYEA+YG32ohJ5QZnaQ+DXOl/QSzAlL5ZZeSSny25tkJetLKthTcSfHNH -+gWRFujONATuA7EmgkzNC+d+3JjYJIcVODb/22yoAVQFVXvz+Ihe5UyM14r/ZV/b -4w/dLvLpWnw17BaqDwl216xnNXa/Y4IzTXwgw2G8noTKlby6You0NMcCgYEA6RKu -95+y1xMIVdfMEExRcwUDFxFA9f1WFArq2D/GYiJhOQtjXJm5nQpsiczcF0xHvXjA -6YiwFBF8L6d77ZlYb1AoKeE2me/wtRqaZtAGqnzqS7fx06hgFD8FAGxtHYXW2Ozj -rKYEb3Xqkpko+XzuLIXaXSP/TcE2PuWMRa9IIRUCgYBNYx2KS3FX9seGP4iH/eg5 -Z88Hk46Y2u9bLcyHKkjDlRPa2L0EGqF9e9KHn4etfMXyITUHfxiuE4w2kbWghsFf -ITf0b9wgJVZOMFb4hBui1T5t8C/M2pGR+K6qzC7yoMn8wv7WESJqPI/6di1giNau -tsxWrW7aX+eRz+qjfB9VqwKBgQCOfEaMyYuqok8JM7jkCdQNTfYapwigmbSC4j25 -4BsmqT/ogMbIuI3ZrKK4B45Ri+ebtHOzEUYbrqjN9UT09zcyLb2wBKe9qgrsnIvh -6LD6jw0pJxXmwFukZPZo0OBQGR9EVGXHiWLSxTKXVpzPEQoGG/pn0HbmkQTZpLmB -bGvbFQKBgQDKNboMRllLx6adl5vI8aEvX5M4BI/6RIFuMI+6glO8mf2MrC46w0a7 -jo/Z5G2GLfAZ2GXUW3PoWxWYGjxyX12LvOg+R137uzD/itqij9IRgv91X+Go27Co -ch20cYyr3Sblp2hMH9gDL+4fvtKGZKc1Bm+uI3wO61RRBl0JEYT3Ww== +MIIEpAIBAAKCAQEAw66KF02yhaBWD4OxEFziRyRDmiIJWzH02JGRSgITea51Bvqk +JGGgPe+Mwy3XwCOv3E0y2pO0/eWpDiIh3ht3dZo1zYvhr3r3xA6elj5nvRPSkVyQ +29VwL7mRcc8IWyb+MhWyMkN09BYzR8Wo8ZlPBDyyxLk/2N0HYkdyEcU4JZ0hhg7S +NjUEQnUBd4rhfN9TT/TSzQueV4utsSk0H1yRBpJstTsj2jt8Ov/n5ZtXy0gLk4b9 +llbuOVzi3hMunORRq0EZbdzY8ok+C1YEBu1JzFu0cHiZdXqLCaneGUtPq3G8oP5v +xMWnEY92g58gdfr+GMwlr6SvhngwMd418e7p5QIDAQABAoIBAGgyO2PXQpU24DyY +oiMVYoQBQmIDd7nwqvDa6mNfIaGsjLIvqlGZDmuMcAbKFVVBa3ZCQS70ce60aMWW +1TPgqkab28RclMsNDnt+UWGtTy32LSyr/pKgX4F6LYFNfaST6c0fkmiDVPZYD+xK +ywAC43ldHM/12JKQd0sUwh/GRXR4/Y9anWR4uLcfWCRU/7JVefdUe1VWeeelCMB4 +wCcv9aQeFKnKeRopg5sryMo0thXSJCrO7UTSBmyasgNlMjUFpIIlPZQrWKXBtN48 +NT7yGZ4j4RpSS8jhIxZASmyj1eyn2bZEk5SFcFM0wN78lOIOyGBB50QJBSEuKvHT +suFBzI0CgYEA53PCyAxHcA4wfuZJgF24VTVUpyZEjjTBRtLrZxUrIagVph5iS9f8 +X8henBabaNBB/xsb17qPesCpqGJJEj2XpSKjTQdzmjCUZV8oZSLW87esXwm0Jfb6 +dmDqShwlph5l31ZG27I2uTMV8HE8PAOta5rBEFsEwEZDmwtsIvwu6NsCgYEA2G+Q +ZbFelFC6+aGKPTPrPVzX45IMPRE23f3euTJdEA+T06BD60LC0jQlxmQghlDUZkxs +s9ihPnj2nHuaxJyR4G+/56oba5Jds2ZAiU7FNGZpBHh5J6tUligRJ8cjdRiKJheb +H6imcRiD++6P2PnQUPuSnfnxo+yxDotUxtfflD8CgYA3brIn10kEvWFAA0d3Rvru +7Wbo4XFp3ZisrbdTaO57kRYeQwinwYLgLcz69S8jWz1zK7rvX+8dJyd6/I8jnzzC +gBk8SZyWQSxJWxEBp+ZzWHogCOLsdMpnr65tMXCS6JTdeHxgAb65fFK002nptbfD +Hb0/fY0Vv75RU9sCRgO2IQKBgQC+MALuKZdXsz0qIRZtw5LCQDSBiBPzEY5qMiym +BqiadWXMP/eO4wJ5XlOXauLdxGdwYVXgD8tZL0hdp4wPmxng47H5q5QeyeZGv+KU +BcDq09cSk567CiXxMNIqZyY0PlUfNf0dK8DeftFz72U+H/87OmXTJhB9oH7RrgPY +G1gfVwKBgQDiCfLBoEfwOpif1XAglNdIv6J1M3rwS85txHlY8H91iiBaoKosLzdj +ZTeqOn6ofsWj1NaR8OudZApZZT1gHjmDUnpzrQZvHn1gelsVwoZfXs1ZWX+J4giD +Rt3aZFRc4uPVgVNLHf4kADWao5bwvbxWfx74J2LQ4QJ4rxFumeg8HA== -----END RSA PRIVATE KEY----- diff --git a/ndg_httpsclient.egg-info/PKG-INFO b/ndg_httpsclient.egg-info/PKG-INFO index 268a12c..c00fbd0 100644 --- a/ndg_httpsclient.egg-info/PKG-INFO +++ b/ndg_httpsclient.egg-info/PKG-INFO @@ -1,37 +1,41 @@ Metadata-Version: 1.1 Name: ndg-httpsclient -Version: 0.4.3 +Version: 0.4.4 Summary: Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL Home-page: https://github.com/cedadev/ndg_httpsclient/ Author: Richard Wilkinson and Philip Kershaw Author-email: Philip.Kershaw@stfc.ac.uk License: BSD - See ndg/httpsclient/LICENCE file for details Description: - A HTTPS client implementation for - * ``httplib`` (Python 2), ``http.client`` (Python 3) and + A HTTPS client implementation for + * ``httplib`` (Python 2), ``http.client`` (Python 3) and * ``urllib2`` (Python 2) and ``urllib`` (Python 3) - ... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation - over the default provided with Python and importantly enables full verification + ... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation + over the default provided with Python and importantly enables full verification of the SSL peer using ``pyasn1``. Releases ======== + 0.4.4 + ----- + * Update test certificate files. + 0.4.3 ----- - * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). + * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). ``__init__.py`` file now included in ``ndg`` directory so that there are no longer warnings with imports when using Python 2.x. Thanks to Max Mauntner for fix. * Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and https://github.com/cedadev/ndg_httpsclient/pull/10. ``pyasn1`` also becomes mandatory rather - than optional package for install. - It required by ``cryptography`` anyway which is a + than optional package for install. - It required by ``cryptography`` anyway which is a dependency for ``pyOpenSSL`` from version 0.14. 0.4.2 ----- - * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. - Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` + * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. + Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` interfaces that this package provides. 0.4.1 @@ -42,7 +46,7 @@ Description: 0.4.0 ----- * Made dual compatible with Python 2 / 3. - + 0.3.3 ----- * Fix to add in AnotherName for ``subjectAltNames`` field - added for support for CACert issued @@ -52,12 +56,12 @@ Description: 0.3.2 ----- - * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is + * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is installed. - * Fix to open_url: HTTP Request object was being created inside if headers is + * Fix to open_url: HTTP Request object was being created inside if headers is None block - now corrected to create regardless. * Added http basic auth support to script. (Thanks to Willem van Engen) - + 0.3.1 ----- * extended utils functions to support keyword for passing additional ``urllib2`` @@ -80,9 +84,9 @@ Description: Prerequisites ============= - This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 - and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and - 3.4. Note that proxy support is only available from Python 2.6.2 onwards. + This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 + and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and + 3.4. Note that proxy support is only available from Python 2.6.2 onwards. ``pyasn1`` is required for correct SSL verification with ``subjectAltNames``. Installation @@ -113,15 +117,15 @@ Description: Trusted CA certificate file directory. ``-d, --debug`` - Print debug information - this may be useful in solving problems with HTTP or + Print debug information - this may be useful in solving problems with HTTP or HTTPS access to a server. - + ``-p FILE, --post-data-file=FILE`` POST data file - + ``-f FILE, --fetch=FILE`` Output file - + ``-n, --no-verify-peer`` Skip verification of peer certificate. diff --git a/ndg_httpsclient.egg-info/SOURCES.txt b/ndg_httpsclient.egg-info/SOURCES.txt index fd6164b..3638772 100644 --- a/ndg_httpsclient.egg-info/SOURCES.txt +++ b/ndg_httpsclient.egg-info/SOURCES.txt @@ -1,4 +1,5 @@ MANIFEST.in +README.md setup.py documentation/Makefile ndg/__init__.py @@ -18,8 +19,7 @@ ndg/httpsclient/test/test_urllib2.py ndg/httpsclient/test/test_utils.py ndg/httpsclient/test/pki/localhost.crt ndg/httpsclient/test/pki/localhost.key -ndg/httpsclient/test/pki/ca/08bd99c7.0 -ndg/httpsclient/test/pki/ca/ade0138a.0 +ndg/httpsclient/test/pki/ca/7e15277f.0 ndg/httpsclient/test/scripts/openssl_https_server.sh ndg_httpsclient.egg-info/PKG-INFO ndg_httpsclient.egg-info/SOURCES.txt @@ -8,31 +8,35 @@ except ImportError: NAMESPACE_PKGS = ['ndg'] _long_description = ''' -A HTTPS client implementation for - * ``httplib`` (Python 2), ``http.client`` (Python 3) and +A HTTPS client implementation for + * ``httplib`` (Python 2), ``http.client`` (Python 3) and * ``urllib2`` (Python 2) and ``urllib`` (Python 3) -... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation -over the default provided with Python and importantly enables full verification +... based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation +over the default provided with Python and importantly enables full verification of the SSL peer using ``pyasn1``. Releases ======== +0.4.4 +----- + * Update test certificate files. + 0.4.3 ----- - * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). + * Fix to ``ndg`` namespace package warning issue (https://github.com/cedadev/ndg_httpsclient/issues/3). ``__init__.py`` file now included in ``ndg`` directory so that there are no longer warnings with imports when using Python 2.x. Thanks to Max Mauntner for fix. * Minor fix for installation: set minimum release for ``pyasn1`` to avoid conflicts with Ubuntu install - see https://github.com/cedadev/ndg_httpsclient/issues/5 and https://github.com/cedadev/ndg_httpsclient/pull/10. ``pyasn1`` also becomes mandatory rather - than optional package for install. - It required by ``cryptography`` anyway which is a + than optional package for install. - It required by ``cryptography`` anyway which is a dependency for ``pyOpenSSL`` from version 0.14. 0.4.2 ----- - * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. - Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` + * Fix to bug in ``ndg.httpsclient.utils.open_url`` - duplicate open call. + Nb. This bug and the fix DO NOT affect the ``httplib``and ``urllib2`` interfaces that this package provides. 0.4.1 @@ -43,7 +47,7 @@ Releases 0.4.0 ----- * Made dual compatible with Python 2 / 3. - + 0.3.3 ----- * Fix to add in AnotherName for ``subjectAltNames`` field - added for support for CACert issued @@ -53,12 +57,12 @@ Releases 0.3.2 ----- - * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is + * Fix to SubjectAltNames support check - should only be enabled if pyasn1 is installed. - * Fix to open_url: HTTP Request object was being created inside if headers is + * Fix to open_url: HTTP Request object was being created inside if headers is None block - now corrected to create regardless. * Added http basic auth support to script. (Thanks to Willem van Engen) - + 0.3.1 ----- * extended utils functions to support keyword for passing additional ``urllib2`` @@ -81,9 +85,9 @@ Initial release Prerequisites ============= -This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 -and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and -3.4. Note that proxy support is only available from Python 2.6.2 onwards. +This has been developed and tested for Python 2.6 and 2.7 with pyOpenSSL 0.13 +and 0.14. Version 0.4.0 tested with ``pyOpenSSL`` 0.15.1 and Python 2.7 and +3.4. Note that proxy support is only available from Python 2.6.2 onwards. ``pyasn1`` is required for correct SSL verification with ``subjectAltNames``. Installation @@ -114,22 +118,22 @@ Options: Trusted CA certificate file directory. ``-d, --debug`` - Print debug information - this may be useful in solving problems with HTTP or + Print debug information - this may be useful in solving problems with HTTP or HTTPS access to a server. - + ``-p FILE, --post-data-file=FILE`` POST data file - + ``-f FILE, --fetch=FILE`` Output file - + ``-n, --no-verify-peer`` Skip verification of peer certificate. ''' - + setup( name='ndg_httpsclient', - version="0.4.3", + version="0.4.4", description='Provides enhanced HTTPS support for httplib and urllib2 using ' 'PyOpenSSL', author='Richard Wilkinson and Philip Kershaw', @@ -141,7 +145,7 @@ setup( package_data={ 'ndg.httpsclient': [ 'LICENSE', - 'test/README', + 'test/README', 'test/scripts/*.sh', 'test/pki/localhost.*', 'test/pki/ca/*.0' |
