diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-12 13:10:25 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-12 13:10:25 -0300 |
| commit | 01cbf628b0c380390ea05bd0b4aec62240160c1f (patch) | |
| tree | be7817999bd1674046c811d12103d94fb605fc45 /config | |
| parent | 962d6b0bbe07c96776950a24a06043cd295ce26c (diff) | |
| parent | 8bf072f84eaf475ab344fb6b9264c6d02cec677f (diff) | |
| download | pfsense-packages-01cbf628b0c380390ea05bd0b4aec62240160c1f.tar.gz pfsense-packages-01cbf628b0c380390ea05bd0b4aec62240160c1f.tar.bz2 pfsense-packages-01cbf628b0c380390ea05bd0b4aec62240160c1f.zip | |
Merge pull request #1095 from doktornotor/patch-1
Diffstat (limited to 'config')
| -rw-r--r-- | config/ftpproxy/ftpproxy.inc | 7 | ||||
| -rw-r--r-- | config/ftpproxy/ftpproxy.xml | 9 | ||||
| -rw-r--r-- | config/squid3/34/squid.xml | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/config/ftpproxy/ftpproxy.inc b/config/ftpproxy/ftpproxy.inc index 386a1d84..cc2aa27a 100644 --- a/config/ftpproxy/ftpproxy.inc +++ b/config/ftpproxy/ftpproxy.inc @@ -125,6 +125,11 @@ function ftpproxy_generate_rules($type) { global $config; $cf = $config['installedpackages']['ftpclientproxy']['config'][0]; $interface_list = explode(",", $cf['localints']); + if ($cf['earlyrule']) { + $ruletype = "pfearly"; + } else { + $ruletype = "filter"; + } /* Proxy is not enabled, therefore, no rules/anchors. */ if ($cf["proxy_enable"] != "on") { @@ -164,7 +169,7 @@ function ftpproxy_generate_rules($type) { $rules .= "rdr pass on {$interface} inet proto tcp from any to any port 21 -> 127.0.0.1 port " . ftpproxy_get_port() . "\n"; } break; - case "filter": + case $ruletype: $rules .= "anchor \"ftp-proxy/*\"\n"; // $rules = "pass out proto tcp from any to any port 21\n"; break; diff --git a/config/ftpproxy/ftpproxy.xml b/config/ftpproxy/ftpproxy.xml index 53740832..d45e4eb6 100644 --- a/config/ftpproxy/ftpproxy.xml +++ b/config/ftpproxy/ftpproxy.xml @@ -41,7 +41,7 @@ ]]> </copyright> <name>FTP Client Proxy</name> - <version>0.2.2</version> + <version>0.3</version> <title>FTP Client Proxy</title> <aftersaveredirect>pkg_edit.php?xml=ftpproxy.xml</aftersaveredirect> <include_file>/usr/local/pkg/ftpproxy.inc</include_file> @@ -87,6 +87,13 @@ <multiple/> </field> <field> + <fielddescr>Early Firewall Rule</fielddescr> + <fieldname>earlyrule</fieldname> + <description>Check this box to move the automatically added FTP rules higher in the ruleset to bypass explicit blocks. Helps allow passive FTP to arbitrary destinations, but FTP will always be allowed outbound when checked.</description> + <type>checkbox</type> + <default_value>off</default_value> + </field> + <field> <fielddescr>Anonymous Only</fielddescr> <fieldname>anononly</fieldname> <description>Only permit anonymous FTP connections using the "ftp" or "anonymous" users.</description> diff --git a/config/squid3/34/squid.xml b/config/squid3/34/squid.xml index f0289e6e..a7b53fca 100644 --- a/config/squid3/34/squid.xml +++ b/config/squid3/34/squid.xml @@ -128,7 +128,7 @@ <item>https://packages.pfsense.org/packages/config/squid3/34/squid_antivirus.inc</item> </additional_files_needed> <additional_files_needed> - <prefix>/usr/local/www/widgets/include</prefix> + <prefix>/usr/local/www/widgets/include/</prefix> <item>https://packages.pfsense.org/packages/config/squid3/34/squid_antivirus_status.inc</item> </additional_files_needed> <additional_files_needed> @@ -204,7 +204,7 @@ <!-- END XML files --> <!-- START additional PHP files --> <additional_files_needed> - <prefix>/usr/local/www/widgets/widgets</prefix> + <prefix>/usr/local/www/widgets/widgets/</prefix> <item>https://packages.pfsense.org/packages/config/squid3/34/squid_antivirus_status.widget.php</item> </additional_files_needed> <additional_files_needed> |