diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 37997d9..6dc345d 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -9,17 +9,17 @@ services: privileged: true networks: vlan_ssl_net: - ipv4_address: 192.168.253.130 + ipv4_address: 192.0.2.130 ipv6_address: fd00:a1bf:2c3d:ef5a:1e2f:3d4c:56ab:1010 bridge_net: - ipv4_address: 172.31.254.2 + ipv4_address: 192.51.100.2 volumes: - /root/.badssl_self_test_cert_dict:/badssl.com/unittest_certs - /etc/localtime:/etc/localtime:ro command: > bash -c "ifconfig eth0 hw ether 02:42:c0:a8:fd:82 - arp -i eth0 -s 192.168.253.3 02:42:C0:A8:FD:03 - make clean-certs + && arp -i eth0 -s 192.0.2.3 02:42:C0:A8:FD:03 + && make clean-certs && make certs-test && make inside-docker && cp -r /badssl.com/certs /badssl.com/unittest_certs @@ -33,10 +33,10 @@ services: privileged: true networks: vlan_ssl_net: - ipv4_address: 192.168.253.131 + ipv4_address: 192.0.2.131 ipv6_address: fd00:a1bf:2c3d:ef5a:1e2f:3d4c:56ab:1011 bridge_net: - ipv4_address: 172.31.254.3 + ipv4_address: 192.51.100.3 volumes: - /root/.go_wpr_test:/root/go_wpr_test - /etc/localtime:/etc/localtime:ro @@ -45,7 +45,7 @@ services: - -c - | ifconfig eth0 hw ether 02:42:C0:A8:FD:83 - arp -i eth0 -s 192.168.253.3 02:42:C0:A8:FD:03 + arp -i eth0 -s 192.0.2.3 02:42:C0:A8:FD:03 /root/wpr/wpr replay --http_port=80 --https_port=443 --host=0.0.0.0 --quiet_mode /root/wpr/archive.wprgo & tail -f /dev/null @@ -59,10 +59,10 @@ services: privileged: true networks: vlan_unittest_net: - ipv4_address: 192.168.253.3 + ipv4_address: 192.0.2.3 ipv6_address: fd00:a1bf:2c3d:ef5b:6e7f:8d9c:abfe:1012 bridge_net: - ipv4_address: 172.31.254.4 + ipv4_address: 192.51.100.4 volumes: - /root/.badssl_self_test_cert_dict:/root/cafile_dict - /root/.result_self_test:/root/result_self_test @@ -71,11 +71,11 @@ services: - /bin/sh - -c - | - /root/unittest/wait-for 172.31.254.2:443 -t 60 -- echo "badssl is up" - /root/unittest/wait-for 172.31.254.3:443 -t 60 -- echo "wpr is up" + /root/unittest/wait-for 192.51.100.2:443 -t 60 -- echo "badssl is up" + /root/unittest/wait-for 192.51.100.3:443 -t 60 -- echo "wpr is up" ifconfig eth0 hw ether 02:42:C0:A8:FD:03 - arp -i eth0 -s 192.168.253.130 02:42:c0:a8:fd:82 - arp -i eth0 -s 192.168.253.131 02:42:C0:A8:FD:83 + arp -i eth0 -s 192.0.2.130 02:42:c0:a8:fd:82 + arp -i eth0 -s 192.0.2.131 02:42:C0:A8:FD:83 cp -rf /root/cafile_dict/certs/sets/current/gen/crt/ca-root.crt /usr/local/share/ca-certificates update-ca-certificates cat /root/unittest/badssl.test.hosts >> /etc/hosts @@ -90,8 +90,8 @@ networks: driver: bridge ipam: config: - - subnet: 172.31.254.0/24 - gateway: 172.31.254.1 + - subnet: 192.51.100.0/24 + gateway: 192.51.100.1 vlan_ssl_net: @@ -102,9 +102,9 @@ networks: parent: enp1s1 ipam: config: - - subnet: 192.168.253.0/24 - ip_range: 192.168.253.128/25 - gateway: 192.168.253.129 + - subnet: 192.0.2.0/24 + ip_range: 192.0.2.128/25 + gateway: 192.0.2.129 - subnet: fd00:a1bf:2c3d:ef5a::/63 ip_range: fd00:a1bf:2c3d:ef5a::/64 gateway: fd00:a1bf:2c3d:ef5a::1010 @@ -117,9 +117,9 @@ networks: parent: ens1f1 ipam: config: - - subnet: 192.168.253.0/24 - ip_range: 192.168.253.0/25 - gateway: 192.168.253.1 + - subnet: 192.0.2.0/24 + ip_range: 192.0.2.0/25 + gateway: 192.0.2.1 - subnet: fd00:a1bf:2c3d:ef5a::/63 ip_range: fd00:a1bf:2c3d:ef5b::/64 gateway: fd00:a1bf:2c3d:ef5a::1011 diff --git a/unittest_python/unittest/badssl.test.hosts b/unittest_python/unittest/badssl.test.hosts index cc05001..faa1f5a 100644 --- a/unittest_python/unittest/badssl.test.hosts +++ b/unittest_python/unittest/badssl.test.hosts @@ -1,89 +1,89 @@ #### start of badssl.self-test.geedge.net hosts #### -192.168.253.130 10000-sans.badssl.self-test.geedge.net -192.168.253.130 1000-sans.badssl.self-test.geedge.net -192.168.253.130 3des.badssl.self-test.geedge.net -192.168.253.130 badssl.self-test.geedge.net -192.168.253.130 captive-portal.badssl.self-test.geedge.net -192.168.253.130 cbc.badssl.self-test.geedge.net -192.168.253.130 client.badssl.self-test.geedge.net -192.168.253.130 client-cert-missing.badssl.self-test.geedge.net -192.168.253.130 dh1024.badssl.self-test.geedge.net -192.168.253.130 dh2048.badssl.self-test.geedge.net -192.168.253.130 dh480.badssl.self-test.geedge.net -192.168.253.130 dh512.badssl.self-test.geedge.net -192.168.253.130 dh-composite.badssl.self-test.geedge.net -192.168.253.130 dh-small-subgroup.badssl.self-test.geedge.net -192.168.253.130 dsdtestprovider.badssl.self-test.geedge.net -192.168.253.130 ecc256.badssl.self-test.geedge.net -192.168.253.130 ecc384.badssl.self-test.geedge.net -192.168.253.130 edellroot.badssl.self-test.geedge.net -192.168.253.130 ev.badssl.self-test.geedge.net -192.168.253.130 expired.badssl.self-test.geedge.net -192.168.253.130 extended-validation.badssl.self-test.geedge.net -192.168.253.130 hsts.badssl.self-test.geedge.net -192.168.253.130 http.badssl.self-test.geedge.net -192.168.253.130 http-credit-card.badssl.self-test.geedge.net -192.168.253.130 http-dynamic-login.badssl.self-test.geedge.net -192.168.253.130 http-login.badssl.self-test.geedge.net -192.168.253.130 http-password.badssl.self-test.geedge.net -192.168.253.130 https-everywhere.badssl.self-test.geedge.net -192.168.253.130 http-textarea.badssl.self-test.geedge.net -192.168.253.130 incomplete-chain.badssl.self-test.geedge.net -192.168.253.130 invalid-expected-sct.badssl.self-test.geedge.net -192.168.253.130 lock-title.badssl.self-test.geedge.net -192.168.253.130 long-extended-subdomain-name-containing-many-letters-and-dashes.badssl.self-test.geedge.net -192.168.253.130 longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.badssl.self-test.geedge.net -192.168.253.130 md5.badssl.self-test.geedge.net -192.168.253.130 mitm-software.badssl.self-test.geedge.net -192.168.253.130 mixed.badssl.self-test.geedge.net -192.168.253.130 mixed-favicon.badssl.self-test.geedge.net -192.168.253.130 mixed-form.badssl.self-test.geedge.net -192.168.253.130 mixed-script.badssl.self-test.geedge.net -192.168.253.130 mozilla-intermediate.badssl.self-test.geedge.net -192.168.253.130 mozilla-modern.badssl.self-test.geedge.net -192.168.253.130 mozilla-old.badssl.self-test.geedge.net -192.168.253.130 no-common-name.badssl.self-test.geedge.net -192.168.253.130 no-san.badssl.self-test.geedge.net -192.168.253.130 no-sct.badssl.self-test.geedge.net -192.168.253.130 no-subject.badssl.self-test.geedge.net -192.168.253.130 null.badssl.self-test.geedge.net -192.168.253.130 pinning-test.badssl.self-test.geedge.net -192.168.253.130 preact-cli.badssl.self-test.geedge.net -192.168.253.130 preloaded-expect-ct.badssl.self-test.geedge.net -192.168.253.130 preloaded-hsts.badssl.self-test.geedge.net -192.168.253.130 rc4.badssl.self-test.geedge.net -192.168.253.130 rc4-md5.badssl.self-test.geedge.net -192.168.253.130 revoked.badssl.self-test.geedge.net -192.168.253.130 rsa1024.badssl.self-test.geedge.net -192.168.253.130 rsa2048.badssl.self-test.geedge.net -192.168.253.130 rsa3072.badssl.self-test.geedge.net -192.168.253.130 rsa4096.badssl.self-test.geedge.net -192.168.253.130 rsa512.badssl.self-test.geedge.net -192.168.253.130 rsa8192.badssl.self-test.geedge.net -192.168.253.130 self-signed.badssl.self-test.geedge.net -192.168.253.130 sha1-2016.badssl.self-test.geedge.net -192.168.253.130 sha1-2017.badssl.self-test.geedge.net -192.168.253.130 sha1.badssl.self-test.geedge.net -192.168.253.130 sha1-intermediate.badssl.self-test.geedge.net -192.168.253.130 sha256.badssl.self-test.geedge.net -192.168.253.130 sha384.badssl.self-test.geedge.net -192.168.253.130 sha512.badssl.self-test.geedge.net -192.168.253.130 spoof.badssl.self-test.geedge.net -192.168.253.130 spoofed-favicon.badssl.self-test.geedge.net -192.168.253.130 ssl-v2.badssl.self-test.geedge.net -192.168.253.130 ssl-v3.badssl.self-test.geedge.net -192.168.253.130 static-rsa.badssl.self-test.geedge.net -192.168.253.130 subdomain.preloaded-hsts.badssl.self-test.geedge.net -192.168.253.130 superfish.badssl.self-test.geedge.net -192.168.253.130 tls-v1-0.badssl.self-test.geedge.net -192.168.253.130 tls-v1-1.badssl.self-test.geedge.net -192.168.253.130 tls-v1-2.badssl.self-test.geedge.net -192.168.253.130 untrusted-root.badssl.self-test.geedge.net -192.168.253.130 upgrade.badssl.self-test.geedge.net -192.168.253.130 very.badssl.self-test.geedge.net -192.168.253.130 webpack-dev-server.badssl.self-test.geedge.net -192.168.253.130 wrong.host.badssl.self-test.geedge.net -192.168.253.130 www.badssl.self-test.geedge.net -192.168.253.130 xn--n1aae7f7o.badssl.self-test.geedge.net +192.0.2.130 10000-sans.badssl.self-test.geedge.net +192.0.2.130 1000-sans.badssl.self-test.geedge.net +192.0.2.130 3des.badssl.self-test.geedge.net +192.0.2.130 badssl.self-test.geedge.net +192.0.2.130 captive-portal.badssl.self-test.geedge.net +192.0.2.130 cbc.badssl.self-test.geedge.net +192.0.2.130 client.badssl.self-test.geedge.net +192.0.2.130 client-cert-missing.badssl.self-test.geedge.net +192.0.2.130 dh1024.badssl.self-test.geedge.net +192.0.2.130 dh2048.badssl.self-test.geedge.net +192.0.2.130 dh480.badssl.self-test.geedge.net +192.0.2.130 dh512.badssl.self-test.geedge.net +192.0.2.130 dh-composite.badssl.self-test.geedge.net +192.0.2.130 dh-small-subgroup.badssl.self-test.geedge.net +192.0.2.130 dsdtestprovider.badssl.self-test.geedge.net +192.0.2.130 ecc256.badssl.self-test.geedge.net +192.0.2.130 ecc384.badssl.self-test.geedge.net +192.0.2.130 edellroot.badssl.self-test.geedge.net +192.0.2.130 ev.badssl.self-test.geedge.net +192.0.2.130 expired.badssl.self-test.geedge.net +192.0.2.130 extended-validation.badssl.self-test.geedge.net +192.0.2.130 hsts.badssl.self-test.geedge.net +192.0.2.130 http.badssl.self-test.geedge.net +192.0.2.130 http-credit-card.badssl.self-test.geedge.net +192.0.2.130 http-dynamic-login.badssl.self-test.geedge.net +192.0.2.130 http-login.badssl.self-test.geedge.net +192.0.2.130 http-password.badssl.self-test.geedge.net +192.0.2.130 https-everywhere.badssl.self-test.geedge.net +192.0.2.130 http-textarea.badssl.self-test.geedge.net +192.0.2.130 incomplete-chain.badssl.self-test.geedge.net +192.0.2.130 invalid-expected-sct.badssl.self-test.geedge.net +192.0.2.130 lock-title.badssl.self-test.geedge.net +192.0.2.130 long-extended-subdomain-name-containing-many-letters-and-dashes.badssl.self-test.geedge.net +192.0.2.130 longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.badssl.self-test.geedge.net +192.0.2.130 md5.badssl.self-test.geedge.net +192.0.2.130 mitm-software.badssl.self-test.geedge.net +192.0.2.130 mixed.badssl.self-test.geedge.net +192.0.2.130 mixed-favicon.badssl.self-test.geedge.net +192.0.2.130 mixed-form.badssl.self-test.geedge.net +192.0.2.130 mixed-script.badssl.self-test.geedge.net +192.0.2.130 mozilla-intermediate.badssl.self-test.geedge.net +192.0.2.130 mozilla-modern.badssl.self-test.geedge.net +192.0.2.130 mozilla-old.badssl.self-test.geedge.net +192.0.2.130 no-common-name.badssl.self-test.geedge.net +192.0.2.130 no-san.badssl.self-test.geedge.net +192.0.2.130 no-sct.badssl.self-test.geedge.net +192.0.2.130 no-subject.badssl.self-test.geedge.net +192.0.2.130 null.badssl.self-test.geedge.net +192.0.2.130 pinning-test.badssl.self-test.geedge.net +192.0.2.130 preact-cli.badssl.self-test.geedge.net +192.0.2.130 preloaded-expect-ct.badssl.self-test.geedge.net +192.0.2.130 preloaded-hsts.badssl.self-test.geedge.net +192.0.2.130 rc4.badssl.self-test.geedge.net +192.0.2.130 rc4-md5.badssl.self-test.geedge.net +192.0.2.130 revoked.badssl.self-test.geedge.net +192.0.2.130 rsa1024.badssl.self-test.geedge.net +192.0.2.130 rsa2048.badssl.self-test.geedge.net +192.0.2.130 rsa3072.badssl.self-test.geedge.net +192.0.2.130 rsa4096.badssl.self-test.geedge.net +192.0.2.130 rsa512.badssl.self-test.geedge.net +192.0.2.130 rsa8192.badssl.self-test.geedge.net +192.0.2.130 self-signed.badssl.self-test.geedge.net +192.0.2.130 sha1-2016.badssl.self-test.geedge.net +192.0.2.130 sha1-2017.badssl.self-test.geedge.net +192.0.2.130 sha1.badssl.self-test.geedge.net +192.0.2.130 sha1-intermediate.badssl.self-test.geedge.net +192.0.2.130 sha256.badssl.self-test.geedge.net +192.0.2.130 sha384.badssl.self-test.geedge.net +192.0.2.130 sha512.badssl.self-test.geedge.net +192.0.2.130 spoof.badssl.self-test.geedge.net +192.0.2.130 spoofed-favicon.badssl.self-test.geedge.net +192.0.2.130 ssl-v2.badssl.self-test.geedge.net +192.0.2.130 ssl-v3.badssl.self-test.geedge.net +192.0.2.130 static-rsa.badssl.self-test.geedge.net +192.0.2.130 subdomain.preloaded-hsts.badssl.self-test.geedge.net +192.0.2.130 superfish.badssl.self-test.geedge.net +192.0.2.130 tls-v1-0.badssl.self-test.geedge.net +192.0.2.130 tls-v1-1.badssl.self-test.geedge.net +192.0.2.130 tls-v1-2.badssl.self-test.geedge.net +192.0.2.130 untrusted-root.badssl.self-test.geedge.net +192.0.2.130 upgrade.badssl.self-test.geedge.net +192.0.2.130 very.badssl.self-test.geedge.net +192.0.2.130 webpack-dev-server.badssl.self-test.geedge.net +192.0.2.130 wrong.host.badssl.self-test.geedge.net +192.0.2.130 www.badssl.self-test.geedge.net +192.0.2.130 xn--n1aae7f7o.badssl.self-test.geedge.net #### end of badssl.self-test.geedge.net hosts #### -192.168.253.131 https://downloadfile.self-test.geedge.net +192.0.2.131 https://downloadfile.self-test.geedge.net