Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aes
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
liu-puppet-modules
aes
Commits
4489dc6e
Commit
4489dc6e
authored
4 months ago
by
Klas Arvidsson
Browse files
Options
Downloads
Patches
Plain Diff
Reworked squid-url-rewrite and added config
parent
1e3c9d5b
No related branches found
No related tags found
1 merge request
!63
Reworked squid-url-rewrite and added config
Pipeline
#155073
passed
4 months ago
Stage: puppet
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
files/squid/helpers/squid-url-rewrite.py
+51
-45
51 additions, 45 deletions
files/squid/helpers/squid-url-rewrite.py
files/squid/squid.conf
+1
-0
1 addition, 0 deletions
files/squid/squid.conf
with
52 additions
and
45 deletions
files/squid/helpers/squid-url-rewrite.py
+
51
−
45
View file @
4489dc6e
...
@@ -17,6 +17,8 @@ filterlog = "/var/log/squid/filter.log"
...
@@ -17,6 +17,8 @@ filterlog = "/var/log/squid/filter.log"
basedir
=
"
/usr/libexec/squid/helpers
"
basedir
=
"
/usr/libexec/squid/helpers
"
hostname
=
socket
.
gethostname
()
hostname
=
socket
.
gethostname
()
log
=
open
(
filterlog
,
'
a
'
)
def
block_response
(
url
):
def
block_response
(
url
):
quoted_url
=
urllib
.
parse
.
quote
(
url
)
quoted_url
=
urllib
.
parse
.
quote
(
url
)
if
re
.
match
(
'
.*\.s?html([#?].*)?
'
,
url
)
or
re
.
match
(
'
.*/[^./]*
'
,
url
):
if
re
.
match
(
'
.*\.s?html([#?].*)?
'
,
url
)
or
re
.
match
(
'
.*/[^./]*
'
,
url
):
...
@@ -36,7 +38,7 @@ def modify_url(line, ruleset):
...
@@ -36,7 +38,7 @@ def modify_url(line, ruleset):
### [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
### [channel-ID <SP>] URL <SP> client_ip "/" fqdn <SP> user <SP> method [<SP> kv-pairs]<NL>
list
=
line
.
split
(
'
'
)
list
=
line
.
split
(
'
'
)
if
list
[
0
].
isdigit
():
if
list
[
0
].
isdigit
()
and
len
(
list
)
>
1
:
url
=
list
[
1
]
url
=
list
[
1
]
else
:
else
:
url
=
list
[
0
]
url
=
list
[
0
]
...
@@ -73,63 +75,67 @@ def load_rules(ruleset, filename):
...
@@ -73,63 +75,67 @@ def load_rules(ruleset, filename):
columns
=
line
.
strip
().
split
()
columns
=
line
.
strip
().
split
()
ruleset
.
append
(
[
re
.
compile
(
columns
[
0
]),
columns
[
1
].
lower
()
==
'
true
'
]
)
ruleset
.
append
(
[
re
.
compile
(
columns
[
0
]),
columns
[
1
].
lower
()
==
'
true
'
]
)
def
deny_all_ruleset
():
def
main
():
ruleset
=
list
()
ruleset
=
list
()
ruleset
.
append
(
[
re
.
compile
(
emptyrex
),
True
]
)
ruleset
.
append
(
[
re
.
compile
(
errorrex
),
True
]
)
ruleset
.
append
(
[
re
.
compile
(
"
^.*
"
),
False
]
)
return
ruleset
block_all
=
basedir
+
"
/../BLOCK_ALL
"
def
load_ruleset
():
if
os
.
path
.
isfile
(
block_all
):
ruleset
.
append
(
[
re
.
compile
(
emptyrex
),
True
]
)
ruleset
.
append
(
[
re
.
compile
(
errorrex
),
True
]
)
ruleset
.
append
(
[
re
.
compile
(
"
^.*
"
),
False
]
)
# Load all rules to a temporary ruleset and then add it to the rules
# Failure to load rules will then lead to complete denial of service and be noticed
tmpruleset
=
list
()
try
:
try
:
block_all
=
basedir
+
"
/../BLOCK_ALL
"
if
os
.
path
.
isfile
(
block_all
):
return
deny_all_ruleset
()
ruleset
=
list
()
devel_rules
=
basedir
+
"
/../devel.rules
"
devel_rules
=
basedir
+
"
/../devel.rules
"
if
os
.
path
.
isfile
(
devel_rules
):
if
os
.
path
.
isfile
(
devel_rules
):
load_rules
(
tmp
ruleset
,
devel_rules
)
load_rules
(
ruleset
,
devel_rules
)
# load opendsa first to let it override default rules
# load opendsa first to let it override default rules
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/opendsa.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/opendsa.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/default.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/default.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/rstudio.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/rstudio.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/cplusplus.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/cplusplus.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/python.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/python.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/java.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/java.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/ruby.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/ruby.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/sas.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/sas.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/translate.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/translate.rules
"
)
load_rules
(
tmp
ruleset
,
basedir
+
"
/rules.d/office.forms.rules
"
)
load_rules
(
ruleset
,
basedir
+
"
/rules.d/office.forms.rules
"
)
r
uleset
.
extend
(
tmp
ruleset
)
r
eturn
ruleset
except
Exception
as
e
:
except
Exception
as
e
:
sys
.
stderr
.
write
(
str
(
e
)
)
log
.
write
(
"
load_ruleset: Error: {}
\n
"
.
format
(
str
(
e
)
)
)
sys
.
stderr
.
flush
()
log
.
flush
()
with
open
(
filterlog
,
'
a
'
)
as
log
:
return
deny_all_ruleset
()
while
True
:
try
:
line
=
sys
.
stdin
.
readline
().
strip
()
log
.
write
(
'
{}: {}
\n
'
.
format
(
datetime
.
datetime
.
now
().
strftime
(
"
%Y-%m-%d_%H-%M
"
),
line
))
def
main
(
debug
=
False
):
try
:
ruleset
=
load_ruleset
()
while
True
:
line
=
sys
.
stdin
.
readline
().
strip
()
new_url
=
modify_url
(
line
,
ruleset
)
if
(
debug
):
time
=
datetime
.
datetime
.
now
().
strftime
(
"
%Y-%m-%d_%H-%M-%S
"
)
msg
=
'
{}: {}
\n
'
.
format
(
time
,
line
)
msg
+=
'
From: {}
\n
'
.
format
(
line
)
msg
+=
'
To: {}
\n
'
.
format
(
new_url
)
log
.
write
(
msg
)
log
.
flush
()
log
.
flush
()
log
.
write
(
"
From:
"
+
line
+
"
\n
"
)
sys
.
stdout
.
write
(
new_url
+
'
\n
'
)
log
.
flush
()
sys
.
stdout
.
flush
()
new_url
=
modify_url
(
line
,
ruleset
)
except
Exception
as
e
:
log
.
write
(
"
url_rewrite: Error: {}
\n
"
.
format
(
str
(
e
))
)
log
.
write
(
"
To:
"
+
new_url
+
"
\n
"
)
log
.
flush
()
log
.
flush
()
sys
.
stdout
.
write
(
new_url
+
'
\n
'
)
main
(
True
)
sys
.
stdout
.
flush
()
except
Exception
as
e
:
sys
.
stderr
.
write
(
str
(
e
)
)
sys
.
stderr
.
flush
()
main
()
log
.
close
()
This diff is collapsed.
Click to expand it.
files/squid/squid.conf
+
1
−
0
View file @
4489dc6e
...
@@ -70,6 +70,7 @@ http_access deny to_localhost
...
@@ -70,6 +70,7 @@ http_access deny to_localhost
# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
#
#
url_rewrite_program
/
usr
/
libexec
/
squid
/
helpers
/
squid
-
url
-
rewrite
.
py
url_rewrite_program
/
usr
/
libexec
/
squid
/
helpers
/
squid
-
url
-
rewrite
.
py
url_rewrite_children
20
startup
=
0
idle
=
1
concurrency
=
0
on
-
persistent
-
overload
=
die
logfile_rotate
6
logfile_rotate
6
#auth_param negotiate program /usr/lib64/squid/negotiate_kerberos_auth
#auth_param negotiate program /usr/lib64/squid/negotiate_kerberos_auth
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment