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

bugfix:修改dns pass相关策略失败的bug，删除多余的dnsmsaq.conf

Browse Source
This commit is contained in:
fumingwei
2021-09-07 16:53:38 +08:00
parent 9a5f0259da
commit 4f803e8740
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Package.cmake
View File

@@ -25,7 +25,7 @@ install(FILES compose/docker-compose.yml DESTINATION ./compose)
install(FILES images_build/client/dign_client/etc/client.conf DESTINATION ./etc) install(FILES images_build/client/dign_client/etc/client.conf DESTINATION ./etc)
install(FILES service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system) install(FILES service/tsg-diagnose.service DESTINATION /usr/lib/systemd/system)
install(FILES service/tsg-diagnose.conf DESTINATION /usr/lib/tmpfiles.d) install(FILES service/tsg-diagnose.conf DESTINATION /usr/lib/tmpfiles.d)
install(FILES images_build/server_dns/config/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/) install(FILES images_build/server_dns/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/)
install(DIRECTORY images/ DESTINATION ./images) install(DIRECTORY images/ DESTINATION ./images)
include(CPack) include(CPack)

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

@@ -1146,14 +1146,6 @@ class TsgDiagnose:
def _add_dign_case(self): def _add_dign_case(self):
self.suite = unittest.TestSuite() self.suite = unittest.TestSuite()
self.suite._cleanup = False self.suite._cleanup = False
self._add_suite('test_dnsRequest_deny_drop')
self._add_suite('test_dnsRequest_deny_redirect_a')
self._add_suite('test_dnsRequest_deny_redirect_aaaa')
self._add_suite('test_dnsRequest_deny_redirect_a_range_ttl')
self._add_suite('test_dnsRequest_deny_redirect_aaaa_range_ttl')
self._add_suite('test_dnsRequest_allow_rdtype_a')
self._add_suite('test_dnsRequest_allow_rdtype_aaaa')
self._add_suite('test_dnsRequest_allow_rdtype_cname')
self._add_suite('test_securityPolicy_bypass') self._add_suite('test_securityPolicy_bypass')
self._add_suite('test_securityPolicy_intercept') self._add_suite('test_securityPolicy_intercept')
self._add_suite('test_securityPolicy_intercept_certerrExpired') self._add_suite('test_securityPolicy_intercept_certerrExpired')
@@ -1185,6 +1177,14 @@ class TsgDiagnose:
self._add_suite('test_ssl_firewall_allow') self._add_suite('test_ssl_firewall_allow')
self._add_suite('test_ssl_firewall_deny_drop') self._add_suite('test_ssl_firewall_deny_drop')
self._add_suite('test_ssl_firewall_deny_rst') self._add_suite('test_ssl_firewall_deny_rst')
self._add_suite('test_dnsRequest_deny_drop')
self._add_suite('test_dnsRequest_deny_redirect_a')
self._add_suite('test_dnsRequest_deny_redirect_aaaa')
self._add_suite('test_dnsRequest_deny_redirect_a_range_ttl')
self._add_suite('test_dnsRequest_deny_redirect_aaaa_range_ttl')
self._add_suite('test_dnsRequest_allow_rdtype_a')
self._add_suite('test_dnsRequest_allow_rdtype_aaaa')
self._add_suite('test_dnsRequest_allow_rdtype_cname')
def _dign_running(self): def _dign_running(self):
print(format(("Test start time: " + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())),'#^120s')) print(format(("Test start time: " + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())),'#^120s'))

10
images_build/server_dns/config/dnsmasq.conf
View File

@@ -1,10 +0,0 @@
#dns解析日志
log-queries
#域名与IP映射
address=/www.1test-ipv4.com/10.1.2.3
address=/www.2test-ipv4.com/20.1.2.3
address=/www.3test-ipv4.com/30.1.2.3
address=/www.1test-ipv6.com/11aa:11:22::33
address=/www.2test-ipv6.com/22aa:11:22::33
address=/www.3test-ipv6.com/33aa:11:22::33
cname=www.1test-cname.com,www.1testanswer-cname.com