thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 11:56:31 +00:00
Code Issues Releases Wiki Activity

Merge pull request #970 from kamermans/bugfix/failing_ssl_tests

Browse Source 
Fixed failing SSL tests
This commit is contained in:
Jason Wilder 2017-11-09 10:04:20 -07:00 committed by GitHub
commit a6e8fae7f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_ssl/test_dhparam.py
View File

@ -89,5 +89,5 @@ def test_web5_dhparam_is_used(docker_compose):
host = "%s:443" % sut_container.attrs["NetworkSettings"]["IPAddress"] host = "%s:443" % sut_container.attrs["NetworkSettings"]["IPAddress"]
r = subprocess.check_output( r = subprocess.check_output(
"echo '' | openssl s_client -verify 0 -connect %s -cipher 'EDH' | grep 'Server Temp Key'" % host, shell=True) "echo '' | openssl s_client -connect %s -cipher 'EDH' | grep 'Server Temp Key'" % host, shell=True)
assert "Server Temp Key: DH, 2048 bits\n" == r assert "Server Temp Key: DH, 2048 bits\n" == r

3
test/test_ssl/wildcard_cert_and_nohttps/test_wildcard_cert_nohttps.py
View File

@ -1,5 +1,6 @@
import pytest import pytest
from backports.ssl_match_hostname import CertificateError from backports.ssl_match_hostname import CertificateError
from requests.exceptions import SSLError
@pytest.mark.parametrize("subdomain,should_redirect_to_https", [ @pytest.mark.parametrize("subdomain,should_redirect_to_https", [
@ -23,7 +24,7 @@ def test_https_get_served(docker_compose, nginxproxy, subdomain):
def test_web3_https_is_500_and_SSL_validation_fails(docker_compose, nginxproxy): def test_web3_https_is_500_and_SSL_validation_fails(docker_compose, nginxproxy):
with pytest.raises(CertificateError) as excinfo: with pytest.raises( (CertificateError, SSLError) ) as excinfo:
nginxproxy.get("https://3.web.nginx-proxy.tld/port") nginxproxy.get("https://3.web.nginx-proxy.tld/port")
assert """hostname '3.web.nginx-proxy.tld' doesn't match 'nginx-proxy.tld'""" in str(excinfo.value) assert """hostname '3.web.nginx-proxy.tld' doesn't match 'nginx-proxy.tld'""" in str(excinfo.value)