diff options
author | CarlGill <carl.gill@worldtech.io> | 2016-09-05 21:28:05 -0400 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-01-04 13:48:51 -0200 |
commit | 23bd0f9ddf0da456d39fdb4e91d6f181604031ab (patch) | |
tree | 62a1fc48e7fb65c27e1e988c2221e185ee55e287 /src/etc | |
parent | 32771b5a8d0cfc592bb851e171b68062a2b285d5 (diff) | |
download | pfsense-23bd0f9ddf0da456d39fdb4e91d6f181604031ab.zip pfsense-23bd0f9ddf0da456d39fdb4e91d6f181604031ab.tar.gz |
Added support for CloudFlares Proxy.
Included a checkbox to enable and disable this feature when CloudeFlare
type is selected.
Included proxied variable in the update script as well.
Defaults to false, as the is the current functionality
Added help text
Updated Last tested date
Hope this helps other people. I use both dynDNS and the Proxy service.
And by default without this feature, the proxy gets disabled. This
is a huge problem, as I have all traffic blocked except for CloudFlare.
And because I have certain other security features enabled, when the Proxy
goes disabled, The Site goes down hard to end users.
With this feature, I can ensure the proxy stays enabled.
(cherry picked from commit e10d25b4c3109347a43a729f8c098138272fe1e7)
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/dyndns.class | 7 | ||||
-rw-r--r-- | src/etc/inc/services.inc | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index 0cfbbdd..334dadd 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -130,7 +130,7 @@ * SelfHost - Last Tested: 26 December 2011 * Amazon Route 53 - Last Tested: 30 August 2016 * DNS-O-Matic - Last Tested: 9 September 2010 - * CloudFlare - Last Tested: 17 July 2016 + * CloudFlare - Last Tested: 05 September 2016 * CloudFlare IPv6 - Last Tested: 17 July 2016 * Eurodns - Last Tested: 27 June 2013 * GratisDNS - Last Tested: 15 August 2012 @@ -171,6 +171,7 @@ var $_FQDN; var $_dnsIP; var $_dnsWildcard; + var $_dnsProxied; var $_dnsMX; var $_dnsBackMX; var $_dnsServer; @@ -202,7 +203,7 @@ * - $For custom requests, $dnsUpdateURL is parsed for '%IP%', which is replaced with the new IP. */ function updatedns ($dnsService = '', $dnsHost = '', $dnsDomain = '', $dnsUser = '', $dnsPass = '', - $dnsWildcard = 'OFF', $dnsMX = '', $dnsIf = '', $dnsBackMX = '', + $dnsWildcard = 'OFF', $dnsProxied = false, $dnsMX = '', $dnsIf = '', $dnsBackMX = '', $dnsServer = '', $dnsPort = '', $dnsUpdateURL = '', $forceUpdate = false, $dnsZoneID ='', $dnsTTL='', $dnsResultMatch = '', $dnsRequestIf = '', $dnsID = '', $dnsVerboseLog = false, $curlIpresolveV4 = false, $curlSslVerifypeer = true) { @@ -279,6 +280,7 @@ $this->_dnsServer = $dnsServer; $this->_dnsPort = $dnsPort; $this->_dnsWildcard = $dnsWildcard; + $this->_dnsProxied = $dnsProxied; $this->_dnsMX = $dnsMX; $this->_dnsZoneID = $dnsZoneID; $this->_dnsTTL = $dnsTTL; @@ -745,6 +747,7 @@ $hostData = array( "content" => "{$this->_dnsIP}", "type" => "{$recordType}", + "proxied" => $this->_dnsProxied, "name" => "{$this->_dnsHost}" ); $data_json = json_encode($hostData); diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index e8f84de..4e70674 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1994,6 +1994,7 @@ function services_dyndns_configure_client($conf) { $dnsUser = $conf['username'], $dnsPass = $conf['password'], $dnsWildcard = $conf['wildcard'], + $dnsProxied = $conf['proxied'], $dnsMX = $conf['mx'], $dnsIf = "{$conf['interface']}", $dnsBackMX = NULL, |