lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check IP Services - Plugin Support

Browse Source 
Update get_dyndns_ip function to support adding other services and disabling the factory default service (Check IP Services - Plugin).
  Factory default check IP service as array
  Support verify peer
  Support authentication
This commit is contained in:
NOYB 2018-03-02 20:07:38 -08:00 committed by Franco Fichtner
parent 3bca588177
commit 06bc82ee3f
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/etc/inc/services.inc
View File

@ -1570,6 +1570,21 @@ function services_dhcrelay6_configure($verbose = false)
}
}
/* Factory default check IP service. */
function factory_default_checkipservice()
{
return array(
"enable" => true,
"name" => 'Default',
"url" => 'http://checkip.dyndns.org',
# "url" => 'http://ip.3322.net/', /* Chinese alternative */
# "username" => '',
# "password" => '',
# "verifysslpeer" => true,
"descr" => 'Factory Default Check IP Service'
);
}
function get_dyndns_ip($int, $ipver = 4)
{
global $config;
@ -1592,14 +1607,35 @@ function get_dyndns_ip($int, $ipver = 4)
}
if ($ipver == 4 && is_private_ip($ip_address)) {
/* Chinese alternative is http://ip.3322.net/ */
$hosttocheck = 'http://checkip.dyndns.org';
/* Append the factory default check IP service to the list (if not disabled). */
if (!isset($config['checkipservices']['disable_factory_default'])) {
$config['checkipservices']['service'][] = factory_default_checkipservice();
}
/* Use the first enabled check IP service as the default. */
if (is_array($config['checkipservices']['service'])) {
foreach ($config['checkipservices']['service'] as $i => $checkipservice) {
if (isset($checkipservice['enable'])) {
$url = $checkipservice['url'];
$username = $checkipservice['username'];
$password = $checkipservice['password'];
$verifysslpeer = isset($checkipservice['verifysslpeer']);
break;
}
}
}
$hosttocheck = $url;
$ip_ch = curl_init($hosttocheck);
curl_setopt($ip_ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ip_ch, CURLOPT_SSL_VERIFYPEER, $verifysslpeer);
curl_setopt($ip_ch, CURLOPT_INTERFACE, $ip_address);
curl_setopt($ip_ch, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($ip_ch, CURLOPT_TIMEOUT, 30);
curl_setopt($ip_ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
curl_setopt($ip_ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
curl_setopt($ip_ch, CURLOPT_USERPWD, "{$username}:{$password}");
$ip_result = curl_exec($ip_ch);
if ($ip_result !== false) {
preg_match('=<body>Current IP Address: (.*)</body>=siU', $ip_result, $matches);