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
54c22d2c
Commit
54c22d2c
authored
Dec 30, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
firewall: remove the old ftp proxy
FTP proxy via squid proxy server is available if needed.
parent
06b0207e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
36 deletions
+2
-36
filter.inc
src/etc/inc/filter.inc
+0
-13
system_advanced_firewall.php
src/www/system_advanced_firewall.php
+2
-23
No files found.
src/etc/inc/filter.inc
View file @
54c22d2c
...
@@ -1882,14 +1882,6 @@ function filter_nat_rules_generate(&$FilterIflist)
...
@@ -1882,14 +1882,6 @@ function filter_nat_rules_generate(&$FilterIflist)
$natrules
.=
"
\n
# Load balancing
\n
"
;
$natrules
.=
"
\n
# Load balancing
\n
"
;
$natrules
.=
"rdr-anchor
\"
relayd/*
\"\n
"
;
$natrules
.=
"rdr-anchor
\"
relayd/*
\"\n
"
;
if
(
isset
(
$config
[
'system'
][
'ftp-proxy'
][
'client'
]))
{
$natrules
.=
"
\n
# FTP proxy
\n
"
;
$natrules
.=
"nat-anchor
\"
ftp-proxy/*
\"\n
"
;
$natrules
.=
"rdr-anchor
\"
ftp-proxy/*
\"\n
"
;
$natrules
.=
"rdr pass proto tcp to port ftp -> 127.0.0.1 port 8021
\n
"
;
mwexec
(
'service ftp-proxy onerestart'
);
}
/* DIAG: add ipv6 NAT, if requested */
/* DIAG: add ipv6 NAT, if requested */
if
(
isset
(
$config
[
'diag'
][
'ipv6nat'
][
'enable'
])
&&
if
(
isset
(
$config
[
'diag'
][
'ipv6nat'
][
'enable'
])
&&
is_ipaddr
(
$config
[
'diag'
][
'ipv6nat'
][
'ipaddr'
])
&&
is_ipaddr
(
$config
[
'diag'
][
'ipv6nat'
][
'ipaddr'
])
&&
...
@@ -2806,11 +2798,6 @@ function filter_rules_generate(&$FilterIflist)
...
@@ -2806,11 +2798,6 @@ function filter_rules_generate(&$FilterIflist)
/* IPsec user rules from radius */
/* IPsec user rules from radius */
$ipfrules
.=
"anchor
\"
ipsec/*
\"\n
"
;
$ipfrules
.=
"anchor
\"
ipsec/*
\"\n
"
;
if
(
isset
(
$config
[
'system'
][
'ftp-proxy'
][
'client'
]))
{
$ipfrules
.=
"
\n
anchor
\"
ftp-proxy/*
\"\n
"
;
$ipfrules
.=
"pass out quick proto tcp from 127.0.0.1 to port ftp
\n
"
;
}
# BEGIN OF firewall rules
# BEGIN OF firewall rules
/* default block logging? */
/* default block logging? */
$log
=
array
(
"block"
=>
null
,
"pass"
=>
null
);
$log
=
array
(
"block"
=>
null
,
"pass"
=>
null
);
...
...
src/www/system_advanced_firewall.php
View file @
54c22d2c
...
@@ -68,7 +68,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
...
@@ -68,7 +68,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig
[
'reflectiontimeout'
]
=
!
empty
(
$config
[
'system'
][
'reflectiontimeout'
])
?
$config
[
'system'
][
'reflectiontimeout'
]
:
null
;
$pconfig
[
'reflectiontimeout'
]
=
!
empty
(
$config
[
'system'
][
'reflectiontimeout'
])
?
$config
[
'system'
][
'reflectiontimeout'
]
:
null
;
$pconfig
[
'bypassstaticroutes'
]
=
isset
(
$config
[
'filter'
][
'bypassstaticroutes'
]);
$pconfig
[
'bypassstaticroutes'
]
=
isset
(
$config
[
'filter'
][
'bypassstaticroutes'
]);
$pconfig
[
'disablescrub'
]
=
isset
(
$config
[
'system'
][
'disablescrub'
]);
$pconfig
[
'disablescrub'
]
=
isset
(
$config
[
'system'
][
'disablescrub'
]);
$pconfig
[
'ftp-proxy-client'
]
=
isset
(
$config
[
'system'
][
'ftp-proxy'
][
'client'
]);
$pconfig
[
'disablevpnrules'
]
=
isset
(
$config
[
'system'
][
'disablevpnrules'
]);
$pconfig
[
'disablevpnrules'
]
=
isset
(
$config
[
'system'
][
'disablevpnrules'
]);
}
elseif
(
$_SERVER
[
'REQUEST_METHOD'
]
===
'POST'
)
{
}
elseif
(
$_SERVER
[
'REQUEST_METHOD'
]
===
'POST'
)
{
$pconfig
=
$_POST
;
$pconfig
=
$_POST
;
...
@@ -194,12 +193,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
...
@@ -194,12 +193,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
unset
(
$config
[
'system'
][
'disablescrub'
]);
unset
(
$config
[
'system'
][
'disablescrub'
]);
}
}
if
(
!
empty
(
$pconfig
[
'ftp-proxy-client'
]))
{
$config
[
'system'
][
'ftp-proxy'
][
'client'
]
=
true
;
}
elseif
(
isset
(
$config
[
'system'
][
'ftp-proxy'
][
'client'
]))
{
unset
(
$config
[
'system'
][
'ftp-proxy'
][
'client'
]);
}
if
(
$pconfig
[
'bogonsinterval'
]
!=
$config
[
'system'
][
'bogons'
][
'interval'
])
{
if
(
$pconfig
[
'bogonsinterval'
]
!=
$config
[
'system'
][
'bogons'
][
'interval'
])
{
switch
(
$pconfig
[
'bogonsinterval'
])
{
switch
(
$pconfig
[
'bogonsinterval'
])
{
case
'daily'
:
case
'daily'
:
...
@@ -506,8 +499,7 @@ include("head.inc");
...
@@ -506,8 +499,7 @@ include("head.inc");
</div>
</div>
</td>
</td>
</tr>
</tr>
<?php
<?php
if
(
count
(
$config
[
'interfaces'
])
>
1
)
:
?>
if
(
count
(
$config
[
'interfaces'
])
>
1
)
:?>
<tr>
<tr>
<th
colspan=
"2"
valign=
"top"
class=
"listtopic"
>
<?=
gettext
(
"Network Address Translation"
);
?>
</th>
<th
colspan=
"2"
valign=
"top"
class=
"listtopic"
>
<?=
gettext
(
"Network Address Translation"
);
?>
</th>
</tr>
</tr>
...
@@ -573,20 +565,7 @@ include("head.inc");
...
@@ -573,20 +565,7 @@ include("head.inc");
</div>
</div>
</td>
</td>
</tr>
</tr>
<tr>
<?php
endif
;
?>
<td><a
id=
"help_for_ftp_proxy_client"
href=
"#"
class=
"showhelp"
><i
class=
"fa fa-info-circle"
></i></a>
<?=
gettext
(
"FTP Proxy"
);
?>
</td>
<td>
<input
name=
"ftp-proxy-client"
type=
"checkbox"
value=
"yes"
<?=
!
empty
(
$pconfig
[
'ftp-proxy-client'
])
?
"checked=
\"
checked
\"
"
:
""
;
?>
/>
<div
class=
"hidden"
for=
"help_for_ftp_proxy_client"
>
<strong>
<?=
gettext
(
"Enable FTP proxy for clients"
);
?>
</strong>
<br
/>
<?=
gettext
(
"Configures the FTP proxy to allow for client connections behind the firewall using active file transfer mode."
);
?>
</div>
</td>
</tr>
<?php
endif
;
?>
<tr>
<tr>
<td></td>
<td></td>
<td><input
name=
"Submit"
type=
"submit"
class=
"btn btn-primary"
value=
"
<?=
gettext
(
"Save"
);
?>
"
/></td>
<td><input
name=
"Submit"
type=
"submit"
class=
"btn btn-primary"
value=
"
<?=
gettext
(
"Save"
);
?>
"
/></td>
...
...
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