squid: squidguard: T3810: Fix template for sourcre-group and rule

Modify template for squid
Replace old directives to actual

2 files changed, 42 insertions, 9 deletions

diff --git a/data/templates/squid/squid.conf.tmpl b/data/templates/squid/squid.conf.tmpl
index 8458e9589..80826fc75 100644
--- a/data/templates/squid/squid.conf.tmpl
+++ b/data/templates/squid/squid.conf.tmpl
@@ -99,9 +99,9 @@ forwarded_for off
 {# SquidGuard #}
 {% if url_filtering is defined and url_filtering.disable is not defined %}
 {%   if url_filtering.squidguard is defined and url_filtering.squidguard is not none %}
-redirect_program /usr/bin/squidGuard -c {{ squidguard_conf }}
-redirect_children 8
-redirector_bypass on
+url_rewrite_program /usr/bin/squidGuard -c {{ squidguard_conf }}
+url_rewrite_children 8
+url_rewrite_bypass on
 {%   endif %}
 {% endif %}
 
diff --git a/data/templates/squid/squidGuard.conf.tmpl b/data/templates/squid/squidGuard.conf.tmpl
index f530d1072..c59dc901e 100644
--- a/data/templates/squid/squidGuard.conf.tmpl
+++ b/data/templates/squid/squidGuard.conf.tmpl
@@ -75,17 +75,50 @@ dest local-block-keyword-default {
 {%         set acl.value = acl.value + ' ' + category + '-default' %}
 {%       endfor %}
 {%     endif %}
+{%     if sg_config.source_group is defined and sg_config.source_group is not none %}
+{%       for sgroup, sg_config in sg_config.source_group.items() %}
+{%         if sg_config.address is defined and sg_config.address is not none %}
+src {{ sgroup }} {
+{%           for address in sg_config.address %}
+        ip {{ address }}
+{%           endfor %}
+}
+
+{%         endif %}
+{%       endfor %}
+{%     endif %}
+{%     if sg_config.rule is defined and sg_config.rule is not none %}
+{%       for rule, rule_config in sg_config.rule.items() %}
+{%         for b_category in rule_config.block_category%}
+dest {{ b_category }} {
+        domainlist    {{ b_category }}/domains
+        urllist       {{ b_category }}/urls
+}
+{%         endfor %}
+
+{%       endfor %}
+{%     endif %}
 acl {
-    default {
+{%     if sg_config.rule is defined and sg_config.rule is not none %}
+{%       for rule, rule_config in sg_config.rule.items() %}
+        {{ rule_config.source_group }} {
+{%         for b_category in rule_config.block_category%}
+            pass local-ok-1 !in-addr !{{ b_category }} all
+{%         endfor %}
+        }
+{%       endfor %}
+{%     endif %}
+
+        default {
 {%     if sg_config.enable_safe_search is defined %}
-        rewrite safesearch
+            rewrite safesearch
 {%     endif %}
-        pass {{ acl.value }} {{ 'none' if sg_config.default_action is defined and sg_config.default_action == 'block' else 'allow' }}
-        redirect 302:http://{{ sg_config.redirect_url }}
+            pass {{ acl.value }} {{ 'none' if sg_config.default_action is defined and sg_config.default_action == 'block' else 'allow' }}
+            redirect 302:http://{{ sg_config.redirect_url }}
 {%     if sg_config.log is defined and sg_config.log is not none %}
-        log blacklist.log
+            log blacklist.log
 {%     endif %}
-    }
+        }
 }
 {%   endif %}
 {% endif %}