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

util: move is_fqdn()

Browse Source 
The call stack is pretty loose on is_fqdn() as it is called by
system_routing_configure() which gets called in an uncontrollable
fashion in interface.inc.
This commit is contained in:
Franco Fichtner 2016-06-18 14:43:58 +02:00
parent 7bcc88ce29
commit 0b486cd14f
5 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/openvpn_wizard.inc
View File

@ -25,7 +25,9 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("openvpn.inc");
require_once("util.inc");
require_once("pfsense-utils.inc");
function cert_get_subject_hash($crt)

17
src/etc/inc/pfsense-utils.inc
View File

@ -215,23 +215,6 @@ function reload_ttys()
exec('/bin/kill -HUP 1');
}
function is_fqdn($fqdn) {
$hostname = false;
if (preg_match("/[-A-Z0-9\.]+\.[-A-Z0-9\.]+/i", $fqdn)) {
$hostname = true;
}
if (preg_match("/\.\./", $fqdn)) {
$hostname = false;
}
if (preg_match("/^\./i", $fqdn)) {
$hostname = false;
}
if (preg_match("/\//i", $fqdn)) {
$hostname = false;
}
return($hostname);
}
/* This xml 2 array function is courtesy of the php.net comment section on xml_parse.
* it is roughly 4 times faster then our existing pfSense parser but due to the large
* size of the RRD xml dumps this is required.

21
src/etc/inc/util.inc
View File

@ -2,6 +2,7 @@
/*
Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
Copyright (C) 2004-2007 Scott Ullrich <sullrich@gmail.com>
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved.
@ -1489,3 +1490,23 @@ function download_alias_geoip($alias)
return false;
}
}
function is_fqdn($fqdn)
{
$hostname = false;
if (preg_match("/[-A-Z0-9\.]+\.[-A-Z0-9\.]+/i", $fqdn)) {
$hostname = true;
}
if (preg_match("/\.\./", $fqdn)) {
$hostname = false;
}
if (preg_match("/^\./i", $fqdn)) {
$hostname = false;
}
if (preg_match("/\//i", $fqdn)) {
$hostname = false;
}
return $hostname;
}

2
src/etc/inc/xmlrpc/legacy.inc
View File

@ -121,8 +121,10 @@ function firmware_version_xmlrpc()
function filter_configure_xmlrpc()
{
global $config;
require_once("filter.inc");
require_once("system.inc");
require_once("util.inc");
require_once("interfaces.inc");
require_once("vslb.inc");
require_once("openvpn.inc");

1
src/etc/rc.newwanipv6
View File

@ -38,6 +38,7 @@ require_once("services.inc");
require_once("rrd.inc");
require_once("util.inc");
require_once("system.inc");
require_once("plugins.inc");
require_once("pfsense-utils.inc");
require_once("interfaces.inc");