diff --git a/images_build/client/dign_client/bin/client.py b/images_build/client/dign_client/bin/client.py index 8642a60..3fde06f 100644 --- a/images_build/client/dign_client/bin/client.py +++ b/images_build/client/dign_client/bin/client.py @@ -99,41 +99,41 @@ ssl_firewall_deny_drop_re = "ssl firewall action deny subaction drop success" ssl_firewall_deny_rst_re = "ssl firewall action deny subaction rst success" -URLBypass = 'https://sha384.badssl.self-test.gdnt-cloud.website' -URLIntercept = 'https://sha256.badssl.self-test.gdnt-cloud.website' -URLSslExpired = 'https://expired.badssl.self-test.gdnt-cloud.website' -URLSslSelfsigned = 'https://self-signed.badssl.self-test.gdnt-cloud.website' -URLSslSuntrustedroot = 'https://untrusted-root.badssl.self-test.gdnt-cloud.website' +URLBypass = 'https://sha384.badssl.selftest.gdnt-cloud.website' +URLIntercept = 'https://sha256.badssl.selftest.gdnt-cloud.website' +URLSslExpired = 'https://expired.badssl.selftest.gdnt-cloud.website' +URLSslSelfsigned = 'https://self-signed.badssl.selftest.gdnt-cloud.website' +URLSslSuntrustedroot = 'https://untrusted-root.badssl.selftest.gdnt-cloud.website' -URLSslRedirect = 'https://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyRedirect.js' -URLSslReplace = 'https://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyReplace.js' -URLSslInsert = 'https://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyInsert' -URLSslHijack = 'https://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyHijack.js' -URLSslBlock = 'https://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyBlock.js' +URLSslRedirect = 'https://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyRedirect.js' +URLSslReplace = 'https://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyReplace.js' +URLSslInsert = 'https://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyInsert' +URLSslHijack = 'https://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyHijack.js' +URLSslBlock = 'https://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyBlock.js' -URLHttpRedirect = 'http://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyRedirect.js' -URLHttpReplace = 'http://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyReplace.js' -URLHttpInsert = 'http://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyInsert' -URLHttpHijack = 'http://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyHijack.js' -URLHttpBlock = 'http://web-replay.badssl.self-test.gdnt-cloud.website/resources/proxyBlock.js' +URLHttpRedirect = 'http://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyRedirect.js' +URLHttpReplace = 'http://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyReplace.js' +URLHttpInsert = 'http://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyInsert' +URLHttpHijack = 'http://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyHijack.js' +URLHttpBlock = 'http://web-replay.badssl.selftest.gdnt-cloud.website/resources/proxyBlock.js' -URLConTraffic_1k = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/1k" -URLConTraffic_4k = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/4k" -URLConTraffic_16k = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/16k" -URLConTraffic_64k = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/64k" -URLConTraffic_256k = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/256k" -URLConTraffic_1M = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/1M" -URLConTraffic_4M = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/4M" -URLConTraffic_16M = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/16M" -URLConTraffic_64M = "https://testing-download.badssl.self-test.gdnt-cloud.website/resources/64M" +URLConTraffic_1k = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/1k" +URLConTraffic_4k = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/4k" +URLConTraffic_16k = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/16k" +URLConTraffic_64k = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/64k" +URLConTraffic_256k = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/256k" +URLConTraffic_1M = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/1M" +URLConTraffic_4M = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/4M" +URLConTraffic_16M = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/16M" +URLConTraffic_64M = "https://testing-download.badssl.selftest.gdnt-cloud.website/resources/64M" -URLHttpFirewallAllow = "http://http.badssl.self-test.gdnt-cloud.website" -URLHttpFirewallDenyDrop = "http://http-credit-card.badssl.self-test.gdnt-cloud.website" -URLHttpFirewallDenyRst = "http://http-dynamic-login.badssl.self-test.gdnt-cloud.website" -URLHttpFirewallDenyBlock = "http://http-login.badssl.self-test.gdnt-cloud.website" -URLSslFirewallAllow = "https://sha512.badssl.self-test.gdnt-cloud.website" -URLSslFirewallDenyDrop = "https://rsa2048.badssl.self-test.gdnt-cloud.website" -URLSslFirewallDenyRst = "https://rsa4096.badssl.self-test.gdnt-cloud.website" +URLHttpFirewallAllow = "http://http.badssl.selftest.gdnt-cloud.website" +URLHttpFirewallDenyDrop = "http://http-credit-card.badssl.selftest.gdnt-cloud.website" +URLHttpFirewallDenyRst = "http://http-dynamic-login.badssl.selftest.gdnt-cloud.website" +URLHttpFirewallDenyBlock = "http://http-login.badssl.selftest.gdnt-cloud.website" +URLSslFirewallAllow = "https://sha512.badssl.selftest.gdnt-cloud.website" +URLSslFirewallDenyDrop = "https://rsa2048.badssl.selftest.gdnt-cloud.website" +URLSslFirewallDenyRst = "https://rsa4096.badssl.selftest.gdnt-cloud.website" DNS_SERVER_ALLOW_TTL = 60 DNS_SERVER_REDIRECT_TTL = 333 diff --git a/images_build/client/dign_client/etc/hosts b/images_build/client/dign_client/etc/hosts index 3355b56..cd92f1e 100644 --- a/images_build/client/dign_client/etc/hosts +++ b/images_build/client/dign_client/etc/hosts @@ -1,90 +1,90 @@ -#### start of badssl.self-test.gdnt-cloud.website hosts #### -192.0.2.130 10000-sans.badssl.self-test.gdnt-cloud.website -192.0.2.130 1000-sans.badssl.self-test.gdnt-cloud.website -192.0.2.130 3des.badssl.self-test.gdnt-cloud.website -192.0.2.130 badssl.self-test.gdnt-cloud.website -192.0.2.130 captive-portal.badssl.self-test.gdnt-cloud.website -192.0.2.130 cbc.badssl.self-test.gdnt-cloud.website -192.0.2.130 client.badssl.self-test.gdnt-cloud.website -192.0.2.130 client-cert-missing.badssl.self-test.gdnt-cloud.website -192.0.2.130 dh1024.badssl.self-test.gdnt-cloud.website -192.0.2.130 dh2048.badssl.self-test.gdnt-cloud.website -192.0.2.130 dh480.badssl.self-test.gdnt-cloud.website -192.0.2.130 dh512.badssl.self-test.gdnt-cloud.website -192.0.2.130 dh-composite.badssl.self-test.gdnt-cloud.website -192.0.2.130 dh-small-subgroup.badssl.self-test.gdnt-cloud.website -192.0.2.130 dsdtestprovider.badssl.self-test.gdnt-cloud.website -192.0.2.130 ecc256.badssl.self-test.gdnt-cloud.website -192.0.2.130 ecc384.badssl.self-test.gdnt-cloud.website -192.0.2.130 edellroot.badssl.self-test.gdnt-cloud.website -192.0.2.130 ev.badssl.self-test.gdnt-cloud.website -192.0.2.130 expired.badssl.self-test.gdnt-cloud.website -192.0.2.130 extended-validation.badssl.self-test.gdnt-cloud.website -192.0.2.130 hsts.badssl.self-test.gdnt-cloud.website -192.0.2.130 http.badssl.self-test.gdnt-cloud.website -192.0.2.130 http-credit-card.badssl.self-test.gdnt-cloud.website -192.0.2.130 http-dynamic-login.badssl.self-test.gdnt-cloud.website -192.0.2.130 http-login.badssl.self-test.gdnt-cloud.website -192.0.2.130 http-password.badssl.self-test.gdnt-cloud.website -192.0.2.130 https-everywhere.badssl.self-test.gdnt-cloud.website -192.0.2.130 http-textarea.badssl.self-test.gdnt-cloud.website -192.0.2.130 incomplete-chain.badssl.self-test.gdnt-cloud.website -192.0.2.130 invalid-expected-sct.badssl.self-test.gdnt-cloud.website -192.0.2.130 lock-title.badssl.self-test.gdnt-cloud.website -192.0.2.130 long-extended-subdomain-name-containing-many-letters-and-dashes.badssl.self-test.gdnt-cloud.website -192.0.2.130 longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.badssl.self-test.gdnt-cloud.website -192.0.2.130 md5.badssl.self-test.gdnt-cloud.website -192.0.2.130 mitm-software.badssl.self-test.gdnt-cloud.website -192.0.2.130 mixed.badssl.self-test.gdnt-cloud.website -192.0.2.130 mixed-favicon.badssl.self-test.gdnt-cloud.website -192.0.2.130 mixed-form.badssl.self-test.gdnt-cloud.website -192.0.2.130 mixed-script.badssl.self-test.gdnt-cloud.website -192.0.2.130 mozilla-intermediate.badssl.self-test.gdnt-cloud.website -192.0.2.130 mozilla-modern.badssl.self-test.gdnt-cloud.website -192.0.2.130 mozilla-old.badssl.self-test.gdnt-cloud.website -192.0.2.130 no-common-name.badssl.self-test.gdnt-cloud.website -192.0.2.130 no-san.badssl.self-test.gdnt-cloud.website -192.0.2.130 no-sct.badssl.self-test.gdnt-cloud.website -192.0.2.130 no-subject.badssl.self-test.gdnt-cloud.website -192.0.2.130 null.badssl.self-test.gdnt-cloud.website -192.0.2.130 pinning-test.badssl.self-test.gdnt-cloud.website -192.0.2.130 preact-cli.badssl.self-test.gdnt-cloud.website -192.0.2.130 preloaded-expect-ct.badssl.self-test.gdnt-cloud.website -192.0.2.130 preloaded-hsts.badssl.self-test.gdnt-cloud.website -192.0.2.130 rc4.badssl.self-test.gdnt-cloud.website -192.0.2.130 rc4-md5.badssl.self-test.gdnt-cloud.website -192.0.2.130 revoked.badssl.self-test.gdnt-cloud.website -192.0.2.130 rsa1024.badssl.self-test.gdnt-cloud.website -192.0.2.130 rsa2048.badssl.self-test.gdnt-cloud.website -192.0.2.130 rsa3072.badssl.self-test.gdnt-cloud.website -192.0.2.130 rsa4096.badssl.self-test.gdnt-cloud.website -192.0.2.130 rsa512.badssl.self-test.gdnt-cloud.website -192.0.2.130 rsa8192.badssl.self-test.gdnt-cloud.website -192.0.2.130 self-signed.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha1-2016.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha1-2017.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha1.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha1-intermediate.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha256.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha384.badssl.self-test.gdnt-cloud.website -192.0.2.130 sha512.badssl.self-test.gdnt-cloud.website -192.0.2.130 spoof.badssl.self-test.gdnt-cloud.website -192.0.2.130 spoofed-favicon.badssl.self-test.gdnt-cloud.website -192.0.2.130 ssl-v2.badssl.self-test.gdnt-cloud.website -192.0.2.130 ssl-v3.badssl.self-test.gdnt-cloud.website -192.0.2.130 static-rsa.badssl.self-test.gdnt-cloud.website -192.0.2.130 subdomain.preloaded-hsts.badssl.self-test.gdnt-cloud.website -192.0.2.130 superfish.badssl.self-test.gdnt-cloud.website -192.0.2.130 tls-v1-0.badssl.self-test.gdnt-cloud.website -192.0.2.130 tls-v1-1.badssl.self-test.gdnt-cloud.website -192.0.2.130 tls-v1-2.badssl.self-test.gdnt-cloud.website -192.0.2.130 untrusted-root.badssl.self-test.gdnt-cloud.website -192.0.2.130 upgrade.badssl.self-test.gdnt-cloud.website -192.0.2.130 very.badssl.self-test.gdnt-cloud.website -192.0.2.130 webpack-dev-server.badssl.self-test.gdnt-cloud.website -192.0.2.130 wrong.host.badssl.self-test.gdnt-cloud.website -192.0.2.130 www.badssl.self-test.gdnt-cloud.website -192.0.2.130 xn--n1aae7f7o.badssl.self-test.gdnt-cloud.website -#### end of badssl.self-test.gdnt-cloud.website hosts #### -192.0.2.130 web-replay.badssl.self-test.gdnt-cloud.website -192.0.2.130 testing-download.badssl.self-test.gdnt-cloud.website +#### start of badssl.selftest.gdnt-cloud.website hosts #### +192.0.2.130 10000-sans.badssl.selftest.gdnt-cloud.website +192.0.2.130 1000-sans.badssl.selftest.gdnt-cloud.website +192.0.2.130 3des.badssl.selftest.gdnt-cloud.website +192.0.2.130 badssl.selftest.gdnt-cloud.website +192.0.2.130 captive-portal.badssl.selftest.gdnt-cloud.website +192.0.2.130 cbc.badssl.selftest.gdnt-cloud.website +192.0.2.130 client.badssl.selftest.gdnt-cloud.website +192.0.2.130 client-cert-missing.badssl.selftest.gdnt-cloud.website +192.0.2.130 dh1024.badssl.selftest.gdnt-cloud.website +192.0.2.130 dh2048.badssl.selftest.gdnt-cloud.website +192.0.2.130 dh480.badssl.selftest.gdnt-cloud.website +192.0.2.130 dh512.badssl.selftest.gdnt-cloud.website +192.0.2.130 dh-composite.badssl.selftest.gdnt-cloud.website +192.0.2.130 dh-small-subgroup.badssl.selftest.gdnt-cloud.website +192.0.2.130 dsdtestprovider.badssl.selftest.gdnt-cloud.website +192.0.2.130 ecc256.badssl.selftest.gdnt-cloud.website +192.0.2.130 ecc384.badssl.selftest.gdnt-cloud.website +192.0.2.130 edellroot.badssl.selftest.gdnt-cloud.website +192.0.2.130 ev.badssl.selftest.gdnt-cloud.website +192.0.2.130 expired.badssl.selftest.gdnt-cloud.website +192.0.2.130 extended-validation.badssl.selftest.gdnt-cloud.website +192.0.2.130 hsts.badssl.selftest.gdnt-cloud.website +192.0.2.130 http.badssl.selftest.gdnt-cloud.website +192.0.2.130 http-credit-card.badssl.selftest.gdnt-cloud.website +192.0.2.130 http-dynamic-login.badssl.selftest.gdnt-cloud.website +192.0.2.130 http-login.badssl.selftest.gdnt-cloud.website +192.0.2.130 http-password.badssl.selftest.gdnt-cloud.website +192.0.2.130 https-everywhere.badssl.selftest.gdnt-cloud.website +192.0.2.130 http-textarea.badssl.selftest.gdnt-cloud.website +192.0.2.130 incomplete-chain.badssl.selftest.gdnt-cloud.website +192.0.2.130 invalid-expected-sct.badssl.selftest.gdnt-cloud.website +192.0.2.130 lock-title.badssl.selftest.gdnt-cloud.website +192.0.2.130 long-extended-subdomain-name-containing-many-letters-and-dashes.badssl.selftest.gdnt-cloud.website +192.0.2.130 longextendedsubdomainnamewithoutdashesinordertotestwordwrapping.badssl.selftest.gdnt-cloud.website +192.0.2.130 md5.badssl.selftest.gdnt-cloud.website +192.0.2.130 mitm-software.badssl.selftest.gdnt-cloud.website +192.0.2.130 mixed.badssl.selftest.gdnt-cloud.website +192.0.2.130 mixed-favicon.badssl.selftest.gdnt-cloud.website +192.0.2.130 mixed-form.badssl.selftest.gdnt-cloud.website +192.0.2.130 mixed-script.badssl.selftest.gdnt-cloud.website +192.0.2.130 mozilla-intermediate.badssl.selftest.gdnt-cloud.website +192.0.2.130 mozilla-modern.badssl.selftest.gdnt-cloud.website +192.0.2.130 mozilla-old.badssl.selftest.gdnt-cloud.website +192.0.2.130 no-common-name.badssl.selftest.gdnt-cloud.website +192.0.2.130 no-san.badssl.selftest.gdnt-cloud.website +192.0.2.130 no-sct.badssl.selftest.gdnt-cloud.website +192.0.2.130 no-subject.badssl.selftest.gdnt-cloud.website +192.0.2.130 null.badssl.selftest.gdnt-cloud.website +192.0.2.130 pinning-test.badssl.selftest.gdnt-cloud.website +192.0.2.130 preact-cli.badssl.selftest.gdnt-cloud.website +192.0.2.130 preloaded-expect-ct.badssl.selftest.gdnt-cloud.website +192.0.2.130 preloaded-hsts.badssl.selftest.gdnt-cloud.website +192.0.2.130 rc4.badssl.selftest.gdnt-cloud.website +192.0.2.130 rc4-md5.badssl.selftest.gdnt-cloud.website +192.0.2.130 revoked.badssl.selftest.gdnt-cloud.website +192.0.2.130 rsa1024.badssl.selftest.gdnt-cloud.website +192.0.2.130 rsa2048.badssl.selftest.gdnt-cloud.website +192.0.2.130 rsa3072.badssl.selftest.gdnt-cloud.website +192.0.2.130 rsa4096.badssl.selftest.gdnt-cloud.website +192.0.2.130 rsa512.badssl.selftest.gdnt-cloud.website +192.0.2.130 rsa8192.badssl.selftest.gdnt-cloud.website +192.0.2.130 self-signed.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha1-2016.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha1-2017.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha1.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha1-intermediate.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha256.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha384.badssl.selftest.gdnt-cloud.website +192.0.2.130 sha512.badssl.selftest.gdnt-cloud.website +192.0.2.130 spoof.badssl.selftest.gdnt-cloud.website +192.0.2.130 spoofed-favicon.badssl.selftest.gdnt-cloud.website +192.0.2.130 ssl-v2.badssl.selftest.gdnt-cloud.website +192.0.2.130 ssl-v3.badssl.selftest.gdnt-cloud.website +192.0.2.130 static-rsa.badssl.selftest.gdnt-cloud.website +192.0.2.130 subdomain.preloaded-hsts.badssl.selftest.gdnt-cloud.website +192.0.2.130 superfish.badssl.selftest.gdnt-cloud.website +192.0.2.130 tls-v1-0.badssl.selftest.gdnt-cloud.website +192.0.2.130 tls-v1-1.badssl.selftest.gdnt-cloud.website +192.0.2.130 tls-v1-2.badssl.selftest.gdnt-cloud.website +192.0.2.130 untrusted-root.badssl.selftest.gdnt-cloud.website +192.0.2.130 upgrade.badssl.selftest.gdnt-cloud.website +192.0.2.130 very.badssl.selftest.gdnt-cloud.website +192.0.2.130 webpack-dev-server.badssl.selftest.gdnt-cloud.website +192.0.2.130 wrong.host.badssl.selftest.gdnt-cloud.website +192.0.2.130 www.badssl.selftest.gdnt-cloud.website +192.0.2.130 xn--n1aae7f7o.badssl.selftest.gdnt-cloud.website +#### end of badssl.selftest.gdnt-cloud.website hosts #### +192.0.2.130 web-replay.badssl.selftest.gdnt-cloud.website +192.0.2.130 testing-download.badssl.selftest.gdnt-cloud.website diff --git a/images_build/server_web/Makefile b/images_build/server_web/Makefile index a86dc3a..c0090f2 100644 --- a/images_build/server_web/Makefile +++ b/images_build/server_web/Makefile @@ -1,7 +1,7 @@ ################ Definitions ################ export TEST_DOMAIN = badssl.test -export TEST_DOMAIN_SELF_TEST = badssl.self-test.gdnt-cloud.website +export TEST_DOMAIN_SELF_TEST = badssl.selftest.gdnt-cloud.website export PROD_DOMAIN = badssl.com ################ Main ################ @@ -33,7 +33,7 @@ jekyll-prod: .PHONY: certs-test certs-test: - cd certs && make test O=sets/test D=badssl.self-test.gdnt-cloud.website + cd certs && make test O=sets/test D=badssl.selftest.gdnt-cloud.website cd certs/sets && rm -rf current && cp -R test current rm -rf common/certs/*.crt @@ -96,7 +96,7 @@ inside-docker: jekyll-test install .PHONY: docker-build docker-build: - docker build -t badssl:ssl-self-test . + docker build -t badssl:ssl-selftest . .PHONY: docker-run docker-run: @@ -123,10 +123,10 @@ nginx: .PHONY: list-hosts list-hosts: - @echo "#### start of badssl.self-test.gdnt-cloud.website hosts ####" + @echo "#### start of badssl.selftest.gdnt-cloud.website hosts ####" @grep -r "server_name.*{{ site.domain }}" . \ - | sed "s/.*server_name \([^\{]*\).*/127.0.0.1 \1badssl.self-test.gdnt-cloud.website/g" \ + | sed "s/.*server_name \([^\{]*\).*/127.0.0.1 \1badssl.selftest.gdnt-cloud.website/g" \ | sort \ | uniq \ | grep -v "\*" - @echo "#### end of badssl.self-test.gdnt-cloud.website hosts ####" + @echo "#### end of badssl.selftest.gdnt-cloud.website hosts ####"