gfwleak/tsg-tsg-diagnose
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:TSG-7663,修改自检使用host name的后缀由geedge.net改为gdnt-cloud.website

Browse Source
This commit is contained in:
fumingwei
2021-09-07 11:33:48 +08:00
parent c07659be19
commit 7d0634c046
4 changed files with 126 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
images_build/client/dign_client/bin/client.py
View File

@@ -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.geedge.net'
URLIntercept = 'https://sha256.badssl.self-test.geedge.net'
URLSslExpired = 'https://expired.badssl.self-test.geedge.net'
URLSslSelfsigned = 'https://self-signed.badssl.self-test.geedge.net'
URLSslSuntrustedroot = 'https://untrusted-root.badssl.self-test.geedge.net'
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'
URLSslRedirect = 'https://cn.bing.com/rs/2V/pE/cj,nj/b1392357/d94c45f4.js'
URLSslReplace = 'https://cn.bing.com/rs/5j/1pF/cj,nj/2213d9b6/b50738ca.js'
URLSslInsert = 'https://cn.bing.com/?FORM=BEHPTB'
URLSslHijack = 'https://cn.bing.com/rs/31/2n/cj,nj/4c7364c5/40e1b425.js'
URLSslBlock = 'https://cn.bing.com/rs/31/22/cj,nj/3f1e2270/f8c6dd44.js'
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'
URLHttpRedirect = 'http://cn.bing.com/rs/2V/pE/cj,nj/b1392357/d94c45f4.js'
URLHttpReplace = 'http://cn.bing.com/rs/5j/1pF/cj,nj/2213d9b6/b50738ca.js'
URLHttpInsert = 'http://cn.bing.com/?FORM=BEHPTB'
URLHttpHijack = 'http://cn.bing.com/rs/31/2n/cj,nj/4c7364c5/40e1b425.js'
URLHttpBlock = 'http://cn.bing.com/rs/31/22/cj,nj/3f1e2270/f8c6dd44.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'
URLConTraffic_1k = "https://downloadfile.self-test.geedge.net/1k"
URLConTraffic_4k = "https://downloadfile.self-test.geedge.net/4k"
URLConTraffic_16k = "https://downloadfile.self-test.geedge.net/16k"
URLConTraffic_64k = "https://downloadfile.self-test.geedge.net/64k"
URLConTraffic_256k = "https://downloadfile.self-test.geedge.net/256k"
URLConTraffic_1M = "https://downloadfile.self-test.geedge.net/1M"
URLConTraffic_4M = "https://downloadfile.self-test.geedge.net/4M"
URLConTraffic_16M = "https://downloadfile.self-test.geedge.net/16M"
URLConTraffic_64M = "https://downloadfile.self-test.geedge.net/64M"
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"
URLHttpFirewallAllow = "http://http.badssl.self-test.geedge.net"
URLHttpFirewallDenyDrop = "http://http-credit-card.badssl.self-test.geedge.net"
URLHttpFirewallDenyRst = "http://http-dynamic-login.badssl.self-test.geedge.net"
URLHttpFirewallDenyBlock = "http://http-login.badssl.self-test.geedge.net"
URLSslFirewallAllow = "https://sha512.badssl.self-test.geedge.net"
URLSslFirewallDenyDrop = "https://rsa2048.badssl.self-test.geedge.net"
URLSslFirewallDenyRst = "https://rsa4096.badssl.self-test.geedge.net"
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"
DNS_SERVER_ALLOW_TTL = 60
DNS_SERVER_REDIRECT_TTL = 333
@@ -284,9 +284,6 @@ class DignTextTestResult(unittest.result.TestResult):
self.stream.writeln("%s" % err)
self.dignStream.writeln("%s" % err)
def get_logger(logPath,enableConsole=True):
logger = logging.getLogger()
fileHandler = logging.FileHandler(logPath)