diff options
| author | aapostoliuk <a.apostoliuk@vyos.io> | 2022-12-22 11:01:40 +0200 |
|---|---|---|
| committer | aapostoliuk <a.apostoliuk@vyos.io> | 2022-12-22 12:13:16 +0200 |
| commit | ba9850c74b3d79d7b75093c3ef88fa97fa244b9f (patch) | |
| tree | be9f783eb2f37528789d33bc2def487691201df3 /smoketest | |
| parent | 89100cee64d41591b602d6f61980f21c278e6851 (diff) | |
| download | vyos-1x-ba9850c74b3d79d7b75093c3ef88fa97fa244b9f.tar.gz vyos-1x-ba9850c74b3d79d7b75093c3ef88fa97fa244b9f.zip | |
T3810: Fixed all issues in T3810
1. Added in script update webproxy blacklists generation of all DBs
2. Fixed: if the blacklist category does not have generated db,
the template generates an empty dest category
in squidGuard.conf and a Warning message.
3. Added template generation for local's categories
in the rule section.
4. Changed syntax in the generation dest section for blacklist's
categories
5. Fixed generation dest local sections in squidGuard.conf
6. Fixed bug in syntax. The word 'allow' changed to the word 'any'
in acl squidGuard.conf
7. Backported all changes from 1.4 to 1.3 which were made in T3810
8. Fixed webproxy smoketest
Diffstat (limited to 'smoketest')
| -rwxr-xr-x | smoketest/scripts/cli/test_service_webproxy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/smoketest/scripts/cli/test_service_webproxy.py b/smoketest/scripts/cli/test_service_webproxy.py index dfccced0a..75486337a 100755 --- a/smoketest/scripts/cli/test_service_webproxy.py +++ b/smoketest/scripts/cli/test_service_webproxy.py @@ -241,8 +241,8 @@ class TestServiceWebProxy(VyOSUnitTestSHIM.TestCase): config = read_file(PROXY_CONF) self.assertIn(f'http_port {listen_ip}:3128 intercept', config) - self.assertIn(f'redirect_program /usr/bin/squidGuard -c /etc/squidguard/squidGuard.conf', config) - self.assertIn(f'redirect_children 8', config) + self.assertIn(f'url_rewrite_program /usr/bin/squidGuard -c /etc/squidguard/squidGuard.conf', config) + self.assertIn(f'url_rewrite_children 8', config) # Check SquidGuard config sg_config = read_file('/etc/squidguard/squidGuard.conf') |