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

bugfix:TSG-10325:修复因dnspython升级导致case test_firewallDenyDrop_dns失败问题

Browse Source
This commit is contained in:
fumingwei
2022-04-19 16:56:04 +08:00
parent dfb9b03582
commit 8c7e9cc7d5
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,27 +331,27 @@ def get_logger(name,logPath,enableConsole=True):
return logger
class DNSCheckRequestBuild:
def dns_action_deny_subaction_drop(self):
def dns_action_deny_subaction_drop(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_DENY_DORY, 'A')
except dns.exception.DNSException as errorinfo:
if type(errorinfo) == dns.exception.Timeout:
if type(errorinfo) == dns.resolver.LifetimeTimeout:
raise Exception(DnsRequestFirewallDenyDrop)
else:
raise Exception("Error: The dns_action_deny_subaction_drop check failure, code: %s" % errorinfo)
else:
raise Exception("Error: The dns_action_deny_subaction_drop test deny drop failure" )
def dns_action_deny_subaction_redirect_a(self):
def dns_action_deny_subaction_redirect_a(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_DENY_REDIRECT_A, 'A')
@@ -371,11 +371,11 @@ class DNSCheckRequestBuild:
else:
raise Exception("Error: The dns request rdtype A drop redirect check failure: respond rdtype error")
def dns_action_deny_subaction_redirect_aaaa(self):
def dns_action_deny_subaction_redirect_aaaa(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_DENY_REDIRECT_AAAA, 'AAAA')
@@ -396,11 +396,11 @@ class DNSCheckRequestBuild:
else:
raise Exception("Error: The dns request rdtype AAAA drop redirect check failure: respond rdtype error")
def dns_action_deny_subaction_redirect_a_rang_ttl(self):
def dns_action_deny_subaction_redirect_a_rang_ttl(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_DENY_REDIRECT_A_RTTL, 'A')
@@ -421,11 +421,11 @@ class DNSCheckRequestBuild:
else:
raise Exception("Error: The dns request rdtype A drop redirect range ttl check failure: respond rdtype error")
def dns_action_deny_subaction_redirect_aaaa_rang_ttl(self):
def dns_action_deny_subaction_redirect_aaaa_rang_ttl(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_DENY_REDIRECT_AAAA_RTTL, 'AAAA')
@@ -448,11 +448,11 @@ class DNSCheckRequestBuild:
def dns_action_allow_rdtype_a(self):
def dns_action_allow_rdtype_a(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_ALLOW_A, 'A')
@@ -474,11 +474,11 @@ class DNSCheckRequestBuild:
else:
raise Exception("Error: The dns request rdtype A allow check failure: respond rdtype error")
def dns_action_allow_rdtype_aaaa(self):
def dns_action_allow_rdtype_aaaa(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_ALLOW_AAAA, 'AAAA')
@@ -499,11 +499,11 @@ class DNSCheckRequestBuild:
else:
raise Exception("Error: The dns request rdtype AAAA allow check failure: response rdtype error")
def dns_action_allow_rdtype_cname(self):
def dns_action_allow_rdtype_cname(self,test_suite_name):
dns_resolver=dns.resolver.Resolver()
dns_resolver.nameservers = DNS_SERVER_IP
dns_resolver.timeout = float(3)
dns_resolver.lifetime = float(3)
dns_resolver.timeout = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
dns_resolver.lifetime = float(suite_test_config_dict[test_suite_name]['conn_timeout'])
try:
dns_answer = dns_resolver.query(HOST_DNS_CNAME_QUERY, 'CNAME')
@@ -987,42 +987,42 @@ class TSGDiagnoseTest(unittest.TestCase):
def test_firewallDenyDrop_dns(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsRequestFirewallDenyDrop):
dnsHandler.dns_action_deny_subaction_drop()
dnsHandler.dns_action_deny_subaction_drop('test_firewallDenyDrop_dns')
def test_firewallDenyRedirectA_dns(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsARequestFireWallDenyRedirect):
dnsHandler.dns_action_deny_subaction_redirect_a()
dnsHandler.dns_action_deny_subaction_redirect_a('test_firewallDenyRedirectA_dns')
def test_firewallDenyRedirectAAAA_dns(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsAAAARequestFireWallDenyRedirect):
dnsHandler.dns_action_deny_subaction_redirect_aaaa()
dnsHandler.dns_action_deny_subaction_redirect_aaaa('test_firewallDenyRedirectARangeTTL_dns')
def test_firewallDenyRedirectARangeTTL_dns(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsARequestFireWallDenyRedirectRangTTL):
dnsHandler.dns_action_deny_subaction_redirect_a_rang_ttl()
dnsHandler.dns_action_deny_subaction_redirect_a_rang_ttl('test_firewallDenyRedirectARangeTTL_dns')
def test_firewallDenyRedirectAAAARangeTTL_dns(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsAAAARequestFireWallDenyRedirectRangTTL):
dnsHandler.dns_action_deny_subaction_redirect_aaaa_rang_ttl()
dnsHandler.dns_action_deny_subaction_redirect_aaaa_rang_ttl('test_firewallDenyRedirectAAAARangeTTL_dns')
def test_dnsRequest_allow_rdtype_a(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsARequestFirewallAllow):
dnsHandler.dns_action_allow_rdtype_a()
dnsHandler.dns_action_allow_rdtype_a('test_dnsRequest_allow_rdtype_a')
def test_dnsRequest_allow_rdtype_aaaa(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsAAAARequestFirewallAllow):
dnsHandler.dns_action_allow_rdtype_aaaa()
dnsHandler.dns_action_allow_rdtype_aaaa('test_dnsRequest_allow_rdtype_aaaa')
def test_dnsRequest_allow_rdtype_cname(self):
dnsHandler = DNSCheckRequestBuild()
with self.assertRaisesRegex(Exception, DnsCNAMERequestFirewallAllow):
dnsHandler.dns_action_allow_rdtype_cname()
dnsHandler.dns_action_allow_rdtype_cname('test_dnsRequest_allow_rdtype_cname')
def test_firewallBypass_ssl(self):
sslHandler = SSLCheckRequestBuild()