From 5ed9fab764d445f99aff4d42f350de1c68d5eb8c Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Thu, 4 Dec 2014 23:10:36 -0600 Subject: Proper CA certificates are in place to validate SSL in these cases where it previously couldn't be, remove disabling of verification. --- etc/inc/dyndns.class | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/etc/inc/dyndns.class b/etc/inc/dyndns.class index 2177360..ac5b08b 100644 --- a/etc/inc/dyndns.class +++ b/etc/inc/dyndns.class @@ -29,7 +29,7 @@ * - CloudFlare (www.cloudflare.com) * - Eurodns (eurodns.com) * - GratisDNS (gratisdns.dk) - * - City Network (citynetwork.se) + * - City Network (citynetwork.se) * +----------------------------------------------------+ * Requirements: * - PHP version 4.0.2 or higher with the CURL Library and the PCRE Library @@ -71,7 +71,7 @@ * Eurodns - Last Tested: 27 June 2013 * GratisDNS - Last Tested: 15 August 2012 * OVH DynHOST - Last Tested: NEVER - * City Network - Last Tested: 13 November 2013 + * City Network - Last Tested: 13 November 2013 * +====================================================+ * * @author E.Kristensen @@ -286,7 +286,6 @@ if ($this->_dnsVerboseLog) log_error("DynDNS: ({$this->_dnsHost}) DNS update() starting."); if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://members.dyndns.org/nic/update"; $port = ""; @@ -312,7 +311,6 @@ $post_data['domain'] = 'dyn.dhs.org'; $post_data['hostname'] = $this->_dnsHost; $post_data['submit'] = 'Update'; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); $server = "https://members.dhs.org/nic/hosts"; $port = ""; if($this->_dnsServer) @@ -326,7 +324,6 @@ case 'noip': case 'noip-free': $needsIP = TRUE; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); $server = "https://dynupdate.no-ip.com/ducupdate.php"; $port = ""; if($this->_dnsServer) @@ -347,7 +344,6 @@ break; case 'easydns': $needsIP = TRUE; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://members.easydns.com/dyn/dyndns.php"; $port = ""; @@ -359,7 +355,6 @@ break; case 'hn': $needsIP = TRUE; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "http://dup.hn.org/vanity/update"; $port = ""; @@ -371,8 +366,6 @@ break; case 'zoneedit': $needsIP = FALSE; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://dynamic.zoneedit.com/auth/dynamic.html"; @@ -441,14 +434,12 @@ break; case 'loopia': $needsIP = TRUE; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); curl_setopt($ch, CURLOPT_URL, 'https://dns.loopia.se/XDynDNSServer/XDynDNS.php?hostname='.$this->_dnsHost.'&myip='.$this->_dnsIP); break; case 'opendns': $needsIP = FALSE; if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://updates.opendns.com/nic/update?hostname=". $this->_dnsHost; $port = ""; @@ -471,7 +462,6 @@ if ($this->_dnsVerboseLog) log_error("DNS-O-Matic: DNS update() starting."); if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); /* Reference: https://www.dnsomatic.com/wiki/api DNS-O-Matic usernames are 3-25 characters. @@ -495,7 +485,6 @@ $needsIP = FALSE; if ($this->_dnsVerboseLog) log_error("Namecheap ({$this->_dnsHost}): DNS update() starting."); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); $dparts = explode(".", trim($this->_dnsHost)); $domain_part_count = ($dparts[count($dparts)-1] == "uk") ? 3 : 2; $domain_offset = count($dparts) - $domain_part_count; @@ -511,7 +500,6 @@ if ($this->_dnsVerboseLog) log_error("HE.net ({$this->_dnsHost}): DNS update() starting."); $server = "https://dyn.dns.he.net/nic/update?"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 ); curl_setopt($ch, CURLOPT_URL, $server . 'hostname=' . $this->_dnsHost . '&password=' . $this->_dnsPass . '&myip=' . $this->_dnsIP); break; @@ -520,7 +508,6 @@ if ($this->_dnsVerboseLog) log_error("HE.net Tunnelbroker: DNS update() starting."); $server = "https://ipv4.tunnelbroker.net/ipv4_end.php?"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser . ':' . $this->_dnsPass); curl_setopt($ch, CURLOPT_URL, $server . 'tid=' . $this->_dnsHost); break; @@ -529,7 +516,6 @@ if ($this->_dnsVerboseLog) log_error("SelfHost: DNS update() starting."); if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://carol.selfhost.de/nic/update"; $port = ""; @@ -621,14 +607,12 @@ $dnsServer ='www.cloudflare.com'; $dnsHost = str_replace(' ','', $this->_dnsHost); $URL = "https://{$dnsServer}/api.html?a=DIUP&email={$this->_dnsUser}&tkn={$this->_dnsPass}&ip={$this->_dnsIP}&hosts={$dnsHost}"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_URL, $URL); break; case 'eurodns': $needsIP = TRUE; if ($this->_dnsVerboseLog) log_error("EuroDynDns ({$this->_dnsHost}) DNS update() starting."); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://eurodyndns.org/update/"; $port = ""; @@ -641,7 +625,6 @@ if ($this->_dnsVerboseLog) log_error("GratisDNS.dk ({$this->_dnsHost}): DNS update() starting."); $server = "https://ssl.gratisdns.dk/ddns.phtml"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); list($hostname, $domain) = explode(".", $this->_dnsHost, 2); curl_setopt($ch, CURLOPT_URL, $server . '?u=' . $this->_dnsUser . '&p=' . $this->_dnsPass . '&h=' . $this->_dnsHost . '&d=' . $domain); break; @@ -650,7 +633,6 @@ if ($this->_dnsVerboseLog) log_error("OVH DynHOST: ({$this->_dnsHost}) DNS update() starting."); if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON"; - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = "https://www.ovh.com/nic/update"; $port = ""; @@ -664,7 +646,6 @@ $needsIP = TRUE; if ($this->_dnsVerboseLog) log_error("City Network: ({$this->_dnsHost}) DNS update() starting."); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); $server = 'https://dyndns.citynetwork.se/nic/update'; $port = ""; @@ -1389,7 +1370,7 @@ $try++; } if ($try >= 3) { - log_error("Dyndns debug information ({$this->_dnsHost}): Could not resolve {$hosttocheck} to ip using interface ip {$ip_address}."); + log_error("Dyndns debug information ({$this->_dnsHost}): Could not resolve {$hosttocheck} to IP using interface IP {$ip_address}."); return 0; } $ip_ch = curl_init("http://{$checkip}"); -- cgit v1.1