From 27dc0227d1a13008b97040a99e2e0306a00851f6 Mon Sep 17 00:00:00 2001
From: Klas Arvidsson <klas.arvidsson@liu.se>
Date: Wed, 28 Oct 2020 14:26:15 +0100
Subject: [PATCH] File /usr/libexec/squid/BLOCK_ALL will block all web access
if it exist
---
files/squid/helpers/rules.d/opendsa.rules | 2 --
files/squid/helpers/squid-url-rewrite.py | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/files/squid/helpers/rules.d/opendsa.rules b/files/squid/helpers/rules.d/opendsa.rules
index 724eedb..893734b 100644
--- a/files/squid/helpers/rules.d/opendsa.rules
+++ b/files/squid/helpers/rules.d/opendsa.rules
@@ -1,7 +1,5 @@
// OpenDSA
-// ^.* false
-
^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/Books/TDDD86_200317/.* true
^https?://www\.ida\.liu\.se/edu/ugrad/datortenta/OpenDSA/Books/.* false
diff --git a/files/squid/helpers/squid-url-rewrite.py b/files/squid/helpers/squid-url-rewrite.py
index c827c18..92b01a7 100755
--- a/files/squid/helpers/squid-url-rewrite.py
+++ b/files/squid/helpers/squid-url-rewrite.py
@@ -74,6 +74,10 @@ def main():
ruleset = list()
+ block_all = basedir + "/../BLOCK_ALL"
+ if os.path.isfile(block_all):
+ ruleset.append( ["^.*", False] )
+
devel_rules = basedir + "/../devel.rules"
if 'devel' in hostname and os.path.isfile(devel_rules):
load_rules(ruleset, devel_rules)
--
GitLab