Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
419679c9
Commit
419679c9
authored
Oct 17, 2016
by
Ad Schellevis
Committed by
Franco Fichtner
Oct 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(proxy) add basic auth support for remote ACL's, replace urllib2 with requests.
(cherry picked from commit
f8645117
)
parent
16cbb531
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
15 deletions
+45
-15
dialogEditBlacklist.xml
.../controllers/OPNsense/Proxy/forms/dialogEditBlacklist.xml
+12
-0
Proxy.xml
src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+8
-0
fetchACLs.py
src/opnsense/scripts/proxy/fetchACLs.py
+21
-15
externalACLs.conf
...nsense/service/templates/OPNsense/Proxy/externalACLs.conf
+4
-0
No files found.
src/opnsense/mvc/app/controllers/OPNsense/Proxy/forms/dialogEditBlacklist.xml
View file @
419679c9
...
...
@@ -17,6 +17,18 @@
<type>
text
</type>
<help>
Enter an url to fetch the blacklist from.
</help>
</field>
<field>
<id>
blacklist.username
</id>
<label>
username (optional)
</label>
<type>
text
</type>
<help>
(optional) user credentials.
</help>
</field>
<field>
<id>
blacklist.password
</id>
<label>
password (optional)
</label>
<type>
password
</type>
<help>
(optional) user credentials.
</help>
</field>
<field>
<id>
blacklist.filter
</id>
<label>
categories (if available)
</label>
...
...
src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
View file @
419679c9
...
...
@@ -294,6 +294,14 @@
<Required>
Y
</Required>
<ValidationMessage>
This does not look like a valid url.
</ValidationMessage>
</url>
<username
type=
"TextField"
>
<Required>
N
</Required>
<mask>
/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u
</mask>
</username>
<password
type=
"TextField"
>
<Required>
N
</Required>
<mask>
/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u
</mask>
</password>
<filter
type=
"JsonKeyValueStoreField"
>
<Required>
N
</Required>
<SourceField>
filename
</SourceField>
...
...
src/opnsense/scripts/proxy/fetchACLs.py
View file @
419679c9
...
...
@@ -28,7 +28,6 @@
"""
import
tempfile
import
urllib2
import
os
import
json
import
glob
...
...
@@ -37,7 +36,9 @@ import tarfile
import
gzip
import
zipfile
import
syslog
import
shutil
from
ConfigParser
import
ConfigParser
import
requests
acl_config_fn
=
'/usr/local/etc/squid/externalACLs.conf'
acl_target_dir
=
'/usr/local/etc/squid/acl'
...
...
@@ -48,7 +49,7 @@ class Downloader(object):
""" Download helper
"""
def
__init__
(
self
,
url
,
timeout
):
def
__init__
(
self
,
url
,
username
,
password
,
timeout
):
""" init new
:param url: source url
:param timeout: timeout in seconds
...
...
@@ -56,24 +57,23 @@ class Downloader(object):
self
.
_url
=
url
self
.
_timeout
=
timeout
self
.
_source_handle
=
None
self
.
_username
=
username
self
.
_password
=
password
def
fetch
(
self
):
""" fetch (raw) source data into tempfile using self._source_handle
"""
try
:
f
=
urllib2
.
urlopen
(
self
.
_url
,
timeout
=
self
.
_timeout
)
# flush to temp file
if
self
.
_username
is
not
None
:
req
=
requests
.
get
(
url
=
self
.
_url
,
stream
=
True
,
timeout
=
self
.
_timeout
,
auth
=
(
self
.
_username
,
self
.
_password
))
else
:
req
=
requests
.
get
(
url
=
self
.
_url
,
stream
=
True
,
timeout
=
self
.
_timeout
)
if
req
.
status_code
==
200
:
self
.
_source_handle
=
tempfile
.
NamedTemporaryFile
()
while
True
:
data
=
f
.
read
(
1024
)
if
not
data
:
break
else
:
self
.
_source_handle
.
write
(
data
)
shutil
.
copyfileobj
(
req
.
raw
,
self
.
_source_handle
)
self
.
_source_handle
.
seek
(
0
)
f
.
close
()
except
(
urllib2
.
URLError
,
urllib2
.
HTTPError
,
IOError
)
as
e
:
syslog
.
syslog
(
syslog
.
LOG_ERR
,
'proxy acl: error downloading
%
s'
%
self
.
_url
)
else
:
syslog
.
syslog
(
syslog
.
LOG_ERR
,
'proxy acl: error downloading
%
s (http code:
%
s)'
%
(
self
.
_url
,
req
.
status_code
)
)
self
.
_source_handle
=
None
def
get_files
(
self
):
...
...
@@ -271,7 +271,13 @@ def main():
# only generate files if enabled, otherwise dump empty files
if
cnf
.
has_option
(
section
,
'enabled'
)
and
cnf
.
get
(
section
,
'enabled'
)
==
'1'
:
download_url
=
cnf
.
get
(
section
,
'url'
)
acl
=
Downloader
(
download_url
,
acl_max_timeout
)
if
cnf
.
has_option
(
section
,
'username'
):
download_username
=
cnf
.
get
(
section
,
'username'
)
download_password
=
cnf
.
get
(
section
,
'password'
)
else
:
download_username
=
None
download_password
=
None
acl
=
Downloader
(
download_url
,
download_username
,
download_password
,
acl_max_timeout
)
all_filenames
=
list
()
for
filename
,
line
in
acl
.
download
():
if
filename_in_ignorelist
(
os
.
path
.
basename
(
filename
)):
...
...
src/opnsense/service/templates/OPNsense/Proxy/externalACLs.conf
View file @
419679c9
...
...
@@ -7,5 +7,9 @@
url
:{{
blacklist
.
url
}}
enabled
:{{
blacklist
.
enabled
}}
filter
:{{
blacklist
.
filter
|
default
(
''
)}}
{%
if
blacklist
.
username
|
default
(
''
) !=
''
%}
username
={{
blacklist
.
username
}}
password
={{
blacklist
.
password
|
default
(
''
)}}
{%
endif
%}
{%
endfor
%}
{%
endif
%}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment