diff --git a/unittest_python/unittest/tsg_diagnose.py b/unittest_python/unittest/tsg_diagnose.py index efd8df8..6a89889 100644 --- a/unittest_python/unittest/tsg_diagnose.py +++ b/unittest_python/unittest/tsg_diagnose.py @@ -169,7 +169,11 @@ class SslInterceptRequestBuild: else: raise Exception("Error: Ssl connection is intercept, cert maybe trust, cert info: %s" % issuer[1]) else: - raise Exception("Error: Got other error certificate information, cert info: %s" % issuer[1]) + if re.search(r'\bCN[\s]*=[\s]*BadSSL\b',issuer[1],0): + raise Exception("Error: Ssl connection intercept failed, cert info: %s" % issuer[1]) + else: + raise Exception(sec_info_re) + def ssl_intercept_certerrExpired(self,test_suite_name): self._set_conn_opt(test_suite_name,URLSslExpired) @@ -201,9 +205,9 @@ class ProxyRequestBuild: raise Exception("Error: Get certificate info error, certificate's length is %s" % len(issuer)) if re.search(r'\bCN[\s]*=[\s]*Tango\b',issuer[1],0): if re.search(r'\bCN = Tango[\s\S]*UNTRUST\b',issuer[1],0): - return + raise Exception("Error: Ssl connection is intercept, cert maybe untrust, cert info: %s" % issuer[1]) else: - raise Exception("Error: Ssl connection is intercept, cert maybe trust, cert info: %s" % issuer[1]) + return else: raise Exception("Error: Got other error certificate information, cert info: %s" % issuer[1]) @@ -387,9 +391,13 @@ class SSLFileDownloadBuild: break if len(issuer) <= 0: raise Exception("Error: Get certificate info error, certificate's length is %s" % len(issuer)) - if not re.search(r'\bCN = Tango[\s\S]*UNTRUST\b',issuer[1],0): + + if re.search(r'\bCN[\s]*=[\s]*Tango\b',issuer[1],0): + if re.search(r'\bCN = Tango[\s\S]*UNTRUST\b',issuer[1],0): + raise Exception("Error: Ssl connection is intercept, cert maybe untrust, cert info: %s" % issuer[1]) + else: raise Exception("Error: Intercept fail: no Tango cert,cert info:%s" % issuer[1]) - + if int(conninfo["size_download"]) == size: self._write_in_nezha(sizeStr,conninfo) self._write_in_logfile(sizeStr,conninfo) diff --git a/wpr_golang/wpr/archive.wprgo b/wpr_golang/wpr/archive.wprgo index 462c570..5f5593a 100644 Binary files a/wpr_golang/wpr/archive.wprgo and b/wpr_golang/wpr/archive.wprgo differ diff --git a/wpr_golang/wpr/wpr_cert.pem b/wpr_golang/wpr/wpr_cert.pem index b12facd..51065c9 100644 --- a/wpr_golang/wpr/wpr_cert.pem +++ b/wpr_golang/wpr/wpr_cert.pem @@ -1,13 +1,13 @@ -----BEGIN CERTIFICATE----- -MIICATCCAWoCCQCDQuSFACCgVTANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJB -VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0 -cyBQdHkgTHRkMB4XDTE3MDgwODIxNDMzN1oXDTIwMDUwNDIxNDMzN1owRTELMAkG -A1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0 -IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAss6h -jUQ03vx0y87fe1ISV11po8VXiihckpsKpawS6uQomO2gfGeuLniuA04tJTg7xpDK -1YT3OroSL9yort2XpSpmJm3CTgdWsEvvzpxUqWCk+SFycb4Qx0PHL8/IwPfyM21M -0wkuLBvGJmoyje+Nn/j7Vct02KwBZMMtpZ5fGZsCAwEAATANBgkqhkiG9w0BAQsF -AAOBgQARSrF+8W9pHbAnTlz6uQZZIQ57jmeKe8E9jobBG8Ud7kFATE9en0bImY6h -dpf26y5/TU8IpjH4HdEN8KBe5byPi6J2+jLThvZda/hUJftSYr3fJlo3VQ2CZpjL -AsL6O4dgBfJzTggc6zcgRLjpX/IpILJ9l0XbAj9kl/zTj0CTXg== +MIIB8jCCAVugAwIBAgIJAP3GpXchIMWHMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV +BAsMBkdFRURHRTAgFw0yMDAzMDkxNjEyNTlaGA8yMDUwMDMwMjE2MTI1OVowETEP +MA0GA1UECwwGR0VFREdFMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCraZpH +Fca2Iu+9E9HzKbEi2Akdk4RrUJxkQjB2Tr7fGxwPDXqdGvSoXDdgnSA0I0bbNqMs +drgiCWimjnGiWfY0sssKg7plNTQ4i7Zz7P9Isyf6TuxvB09CzdhH2FQ3lLRTb8pv +BA0E28CCYiZhtX1/3RlDSvxaRKOM3yEt0q+FRQIDAQABo1AwTjAdBgNVHQ4EFgQU +NqrpSlpCuMBJlCLZEE/D5ZpBy8swHwYDVR0jBBgwFoAUNqrpSlpCuMBJlCLZEE/D +5ZpBy8swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQBsybFxUAjzhJ5H +VbSLhyillxtAJ3vEKtLrMVnAgRUEwamyu1JQGndF9kh8RapSmHhmuZM9iTc+NsNb +DKGKmEOY0vQMw83xE7EGYj4Nhww9UMyGglmTLbd3yB+uJA97beNVduU2mifDHGmN +4buMiPl3AozGRl9p5UCzZM5XxMMw1A== -----END CERTIFICATE----- diff --git a/wpr_golang/wpr/wpr_key.pem b/wpr_golang/wpr/wpr_key.pem index b5e983e..dbf56e6 100644 --- a/wpr_golang/wpr/wpr_key.pem +++ b/wpr_golang/wpr/wpr_key.pem @@ -1,16 +1,15 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALLOoY1ENN78dMvO -33tSElddaaPFV4ooXJKbCqWsEurkKJjtoHxnri54rgNOLSU4O8aQytWE9zq6Ei/c -qK7dl6UqZiZtwk4HVrBL786cVKlgpPkhcnG+EMdDxy/PyMD38jNtTNMJLiwbxiZq -Mo3vjZ/4+1XLdNisAWTDLaWeXxmbAgMBAAECgYAadwLqScIZjvwqfkANnKQiUi0k -lDzUsgyhllkJFGLoaUSo/eLXBvF851e6HYQJEj2msh+TYs7E3m16sAo3d4zOIdnz -VwOF0SVuUveqJz6K1/k6nPxck+dPj8Mi+gBm3Fd0+0wcozjWaxhx3f462HCUb6b+ -ZpJRBsbyvzu6rn7iQQJBAOlWhtfL8r9+Kl0vxRD1XukaJwlxPv24JhfKOU4z8WlJ -WX7Wr8ws+xKS+CtfFnjkf/iFJPpTb8jxpQyWMJzYZIkCQQDELE5hGnBFVQArMAOp -VbwYordTrVY3AagO4tDJ6T3a7GEXE28ol16/i02+4FLd65vubL21IuX0exH/eRvZ -Q4wDAkEAub/qyiEOFkjOWq5rd0uNiY0LJGYlWf7dPDT8l3ecJ09/0gv/mE76c9fR -fV1N22EzSlhbjncbVuCenj11Z3aP2QJAILtfzJXzu63GHG6jfcKfYuDrg9u9Mepl -1y4DNl1jg77DKG2Gs5gmKAGfVETrrrmcR/j+4lVTVyqdwym6+tJpbwJBAN3vixxc -5N9pUMDfFnHrx/x9QPd0JgSAT21KSIB+PndlbD7QO6nwFhQNNcTYt2D4VWPVo1vg -lOraHyFakb7NqEA= ------END PRIVATE KEY----- +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQCraZpHFca2Iu+9E9HzKbEi2Akdk4RrUJxkQjB2Tr7fGxwPDXqd +GvSoXDdgnSA0I0bbNqMsdrgiCWimjnGiWfY0sssKg7plNTQ4i7Zz7P9Isyf6Tuxv +B09CzdhH2FQ3lLRTb8pvBA0E28CCYiZhtX1/3RlDSvxaRKOM3yEt0q+FRQIDAQAB +AoGAJWgwUN8BtHG/W8XdhXFNxMrcgmXU+g5ncsG3Dbp1kP67itVoMqzVQ4CMXTss +8fPY3LH5vhRSbqsa+W4QglubjNzPNY9xYSrfNjdlUDaxfmYdjyeIBc08ce6jSqEm +PUOs1IQ/jVOeQO/pxoSh8atHyApKpa6Opy2FIH/mIYtJB4ECQQDj080ms7vl+0bj +S4EIVj3y9oFOcBCZ9rBqLZzA5tKYiNO/iXgtQRQ00I/jap95AVBnQZUOF/B5Z3W2 +vrWRwqBRAkEAwJvoy0VMjJx7Zvw6mU7qd4WKz3Sl7m72Ehgem4vsfItLQllZ39yB +UEpeR3OCtOM6RTcDq0FRIAmc/hgyRtJstQJAbvQejEOqNbXrbxS9cX72ypXMoZOo +MiNXBU7TcYq4c3rnjPd5JKj2G0abXMj3g2nla3QgEG4OOkHtrSMxsBwWEQJATGRJ +4307zDUwOHtnnnCPTBJaKMfiG/xEeo64bQcFJ6xzkAAyRjiFzVuBoyMsPyQ0c0lL +mjvQuj012A2uuyowVQJBAK8m+XfI6COkSsSUh+cLeCwiIuLxaDgYJbh3F8Ind2Gt +3wOYDVDWH0ebwMFUfH7mmYO75AHbfC2uTPQpHV/IglU= +-----END RSA PRIVATE KEY----- diff --git a/wpr_golang/wpr_only_proxy_policy/archive.wprgo b/wpr_golang/wpr_only_proxy_policy/archive.wprgo deleted file mode 100644 index 072d5bf..0000000 Binary files a/wpr_golang/wpr_only_proxy_policy/archive.wprgo and /dev/null differ diff --git a/wpr_golang/wpr_only_proxy_policy/wpr_cert.pem b/wpr_golang/wpr_only_proxy_policy/wpr_cert.pem deleted file mode 100644 index 32e96be..0000000 --- a/wpr_golang/wpr_only_proxy_policy/wpr_cert.pem +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDGDCCAgACCQDNaaFbZzEpQDANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJD -TjELMAkGA1UECAwCQkoxCzAJBgNVBAcMAkJKMQ8wDQYDVQQKDAZHRUVER0UxEzAR -BgNVBAsMCkdFRURHRSBEUEkwIBcNMjAwODI4MTYwNDAxWhgPMjA1MDA4MjExNjA0 -MDFaME0xCzAJBgNVBAYTAkNOMQswCQYDVQQIDAJCSjELMAkGA1UEBwwCQkoxDzAN -BgNVBAoMBkdFRURHRTETMBEGA1UECwwKR0VFREdFIERQSTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAMxN+JgSWLceiza42Haq9KTe4N6nMMjHQmUgw5Gm -8FtJSLiFEYP999sqeO6LvMZCb3ZhffPJgpI83Z0yXcQdoa3jSTsw3nD4E1YMLuet -RQFFy4KGUHDdFEelKD0ULAs05ATe2WDybi1Y2J/KiGf1ormeiqZROQfTw80reaoK -EN8Lx9DSiMklsQ8uynsjaai+b14tn5Lf74owqA8sYDLKeYKl0jciOwQMkYB7H4B9 -LUApTmwtAVc4lMxS8G2GXc6DqnmDtm84iKigi5PRrCCEHkeF+PGfWAMlc2cuyfhP -NR8QltS3e9mfFIat1W6gfrhLnywDsisBwUpYKyB5C4MiPC0CAwEAATANBgkqhkiG -9w0BAQsFAAOCAQEAGTW81c1ZgLGwsaQn6V4pI0Aa6c3fKG81UgEoPg8ZkkoV3wlb -PXkKxCXyEfMjPyFPFAvmlpUXmQ8uYRUSyV9ghIIDwGTnDgUukfXL6kJxJ3oPn+pC -reA+AUocOk7s62330iyQYHeQ8HhsNxcSj+FGGIPnxhWwOc44JmwFiHJOV0HXpHfq -1OxWXGpIfZ3LU/ZsX9prbC8U2w0VqsFOPeY7d/23L/WrS+Buaa7diw5Rt9Uiy3ZM -NSfTEdAFIOVOPxY4HzHGvzFpf0TaTFcIuEnHDch6TAKNdh45r0pdnjkicFYRmT9+ -/4qaViSyI7pr1dyjC7luzeQQpp4koklUTbzjNA== ------END CERTIFICATE----- diff --git a/wpr_golang/wpr_only_proxy_policy/wpr_key.pem b/wpr_golang/wpr_only_proxy_policy/wpr_key.pem deleted file mode 100644 index 5a8a0ca..0000000 --- a/wpr_golang/wpr_only_proxy_policy/wpr_key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEAzE34mBJYtx6LNrjYdqr0pN7g3qcwyMdCZSDDkabwW0lIuIUR -g/332yp47ou8xkJvdmF988mCkjzdnTJdxB2hreNJOzDecPgTVgwu561FAUXLgoZQ -cN0UR6UoPRQsCzTkBN7ZYPJuLVjYn8qIZ/WiuZ6KplE5B9PDzSt5qgoQ3wvH0NKI -ySWxDy7KeyNpqL5vXi2fkt/vijCoDyxgMsp5gqXSNyI7BAyRgHsfgH0tQClObC0B -VziUzFLwbYZdzoOqeYO2bziIqKCLk9GsIIQeR4X48Z9YAyVzZy7J+E81HxCW1Ld7 -2Z8Uhq3VbqB+uEufLAOyKwHBSlgrIHkLgyI8LQIDAQABAoIBABJbu0fm9iPWUcok -CAd5yyv5fxliyqZwCU5PCGPRLW32gttZ0b4blycRhPZihh8Gnz9y+T9rzxjW8U8L -1JMn2nxmnRD9ji92iz5DL//PeRDpNaVP7nCF3Smm9JuwcVi8cvThFYV5o17dyfFp -4KH+15V4YpsZV1eVttV7353g860nF7ycLZmCBIBHQpPtancj0i9q1H2A6ldc1Jx3 -VDhskYN2Vqtm+krkcKNUsfGUdF2N4Sw7QrKKVe80/ARyWTpEZIWzFXRpVspFKj++ -z5Em40NBoCCBPSCgMmK9SVHszpuHNScy3Y49YL8BSLDsj/Cen67jWo3Rx8ioINuK -SUtYzKECgYEA6TpITk6pvLbzGt5bytPbOaF4Atxlh6ilK0ZPPJJ7Vgjz2OulAjOU -gNPtuD0TiJBSbPfCWx5s/4MdKzJJkoube8IbyP8fTOiPrQjB7mT2c2pwU9DoV4Wz -qtFn6+s+/KODLS4/PXZTgQBu4+pTGEUsvW4ZF68rdcOtsq1FWilLOKUCgYEA4EC7 -bahGkmRUFFOIF6gOfiY2a56jcvQ62aAiW8ICHGNmrTBKrbaSbcxyDFqQudtX08Gw -YTLhu49rRfkwdmEivzWpmvO8wxeTIQOah7Mv7RtiF/jhL0VEGFtdwJGOnF03vtXl -R4MeaR+nPkb/VRjOnxQpOcwGvSPRIyGOrzyflukCgYAykNlWaQWyDbRdkfIy4oX4 -U8LSU/iLVgwhesf5KQUmnSBJWqXW+VnsKIa02EEg7bGBQKJZ4RneuA2d7PQ4mp4m -Uep2RKIDqbRk3q41QpyQX3ZlJbkKKMnQckBmzQVF/ymUpR8+8yWdpXtlXMuRSoYt -t+4mzWrNyJQjVh/gMW3GpQKBgFu13XEBKqtf4IrXhoa2MgchNYxZulqeyxqJRMPl -2dsmQ618XG4ihkvlGpc2yo1XyNlPEwUNPAfqpWJegJVJMF6mYZB/MalPkNolkSMC -Aw2i70EChYVBfJHBe9vvKzWDYfLnovbWBq/TRCBSBMYWeRnRsvJyICdl6HfHl4TO -9C1RAoGACsdR8SLBNuJm7BBp73AWvaKHIr0uU0Ama8aRigXGSTGfSAtvDaFGGKS+ -33BUpF0Yx74x4KWHux+BRKEL6BRK85Hhj4HTfX7LjnsTf+4uZ5NGMgDJkqrT0n4D -i8//hxFYfay4mmwV3zEqFg3ws1BEBJP+RADEE4Yjd0XDwDsCGvM= ------END RSA PRIVATE KEY-----