From a6b374637a3a188a824768d93d2750a9359826d2 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 26 May 2020 19:56:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9unittest=20download?= =?UTF-8?q?file.self-test.geedge.net=20host=E6=96=87=E4=BB=B6=E7=BC=96?= =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=202=E3=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=A7=E8=A1=8Cunitest.py=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BC=91=E7=9C=A0=E6=97=B6=E9=97=B4=E4=B8=BA1s?= =?UTF-8?q?=EF=BC=8C3=E3=80=81=E4=BF=AE=E6=94=B9=E6=8C=81=E7=BB=AD?= =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=B3=A8=E5=85=A5=E7=A8=8B=E5=BA=8F=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E8=AF=81=E4=B9=A6=E6=98=AF=E5=90=A6=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unittest_python/unittest/badssl.test.hosts | 2 +- unittest_python/unittest/con_traffic_inject.py | 6 ++++++ unittest_python/unittest/unittest_self.py | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/unittest_python/unittest/badssl.test.hosts b/unittest_python/unittest/badssl.test.hosts index faa1f5a..ee227b6 100644 --- a/unittest_python/unittest/badssl.test.hosts +++ b/unittest_python/unittest/badssl.test.hosts @@ -86,4 +86,4 @@ 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.0.2.131 https://downloadfile.self-test.geedge.net +192.0.2.131 downloadfile.self-test.geedge.net diff --git a/unittest_python/unittest/con_traffic_inject.py b/unittest_python/unittest/con_traffic_inject.py index 2774cec..9a85669 100644 --- a/unittest_python/unittest/con_traffic_inject.py +++ b/unittest_python/unittest/con_traffic_inject.py @@ -76,6 +76,12 @@ class SSLBuild: errdict["url"] = url errdict["time"] = time.asctime( time.localtime(time.time())) self.resultlist.append(errdict) + elif not re.search(r'CN = Tango[\s\S]*UNTRUST',issuer[1],0): + errdict["status"] = "error" + errdict["errinfo"] = "Intercept fail: no Tango cert" + errdict["url"] = url + errdict["time"] = time.asctime( time.localtime(time.time())) + self.resultlist.append(errdict) else: self.intecept_succ_get_value(urlkey,url,conn) conn.close() diff --git a/unittest_python/unittest/unittest_self.py b/unittest_python/unittest/unittest_self.py index 2e66562..8f79ab3 100644 --- a/unittest_python/unittest/unittest_self.py +++ b/unittest_python/unittest/unittest_self.py @@ -392,3 +392,4 @@ if __name__ == '__main__': f.write(time.asctime(time.localtime(time.time()))) f.write("\n") runner.run(suite) + time.sleep(1)