*** squid.conf 2016-09-30 11:56:40.584021788 +0200 --- squid.conf-modified 2016-09-30 11:57:36.272527091 +0200 *************** def user_acls(): *** 178,189 **** --- 178,204 ---- return 'dstdom_regex' def acl_dstdomain_regex_i(): return 'dstdom_regex -i' + def acl_proxy_auth_regex(): + return 'proxy_auth_regex' + def acl_rep_mime_type(): + return 'rep_mime_type' + def acl_rep_mime_type_i(): + return 'rep_mime_type -i' + def acl_urlpath_regex(): + return 'urlpath_regex' + def acl_urlpath_regex_i(): + return 'urlpath_regex -i' acltypes = { 'browser': acl_browser, 'browser-i': acl_browser_i, 'dstdomain': acl_dstdomain_regex, 'dstdomain-i': acl_dstdomain_regex_i, 'port': acl_port, + 'proxy': acl_proxy_auth_regex, + 'mime': acl_rep_mime_type, + 'mime-i': acl_rep_mime_type_i, + 'urlpath': acl_urlpath_regex, + 'urlpath-i': acl_urlpath_regex_i, } def squid_re_escape(value): return r'\x20'.join(map(re.escape, value.split(' '))) *************** def user_acls(): *** 216,221 **** --- 231,241 ---- 'dstdomain': valuetypes_regex, 'dstdomain-i': valuetypes_regex, 'port': valuetypes_port, + 'proxy': valuetypes_regex, + 'mime': valuetypes_regex, + 'mime-i': valuetypes_regex, + 'urlpath': valuetypes_regex, + 'urlpath-i': valuetypes_regex, } aclnames = set() for key, value, in configRegistry.items():