Merge branch '1752-Error_critico_de_seguridad_en_Consola_6.0' into 'pandora_6.0'

fixed validate ip for create agent and network tools

See merge request artica/pandorafms!1235

pandora_console/extensions/net_tools.php

@@ -155,6 +155,10 @@ function main_net_tools () {
 	$community = get_parameter ("community", "public");
 	$ip = get_parameter("select_ips");
 	
+	if(!validate_address($ip)){
+		ui_print_error_message(__('The ip or dns name entered cannot be resolved'));
+	}
+	else{
 		switch($operation) {
 			case 1:
 				$traceroute = whereis_the_command ('traceroute');
@@ -249,6 +253,7 @@ function main_net_tools () {
 				}
 				break;
 		}
+	}
 	
 	echo "</div>";
 }

pandora_console/godmode/agentes/configurar_agente.php

@@ -146,10 +146,20 @@ $module_macros = array ();
 
 // Create agent
 if ($create_agent) {
+	$mssg_warning = 0;
 	$nombre_agente = (string) get_parameter_post("agente",'');
 	$direccion_agente = (string) get_parameter_post("direccion",'');
+	
+	//safe_output only validate ip
 	$direccion_agente = trim(io_safe_output($direccion_agente));
+	
+	if(!validate_address($direccion_agente)){
+		$mssg_warning = 1;
+	}
+
+	//safe-input before validate ip
 	$direccion_agente = io_safe_input($direccion_agente);
+
 	$grupo = (int) get_parameter_post ("grupo");
 	$intervalo = (string) get_parameter_post ("intervalo", SECONDS_5MINUTES);
 	$comentarios = (string) get_parameter_post ("comentarios", '');
@@ -594,6 +604,10 @@ if ($create_agent) {
 	ui_print_result_message ($agent_created_ok,
 		__('Successfully created'),
 		$agent_creation_error);
+
+	if($mssg_warning){
+		ui_print_warning_message(__('The ip or dns name entered cannot be resolved'));
+	}
 }
 
 // Fix / Normalize module data
@@ -635,10 +649,18 @@ $update_agent = (bool) get_parameter ('update_agent');
 
 // Update AGENT
 if ($update_agent) { // if modified some agent paramenter
+	$mssg_warning = 0;
 	$id_agente = (int) get_parameter_post ("id_agente");
 	$nombre_agente = str_replace('`','‘',(string) get_parameter_post ("agente", ""));
 	$direccion_agente = (string) get_parameter_post ("direccion", '');
+	//safe_output only validate ip
 	$direccion_agente = trim(io_safe_output($direccion_agente));
+	
+	if(!validate_address($direccion_agente)){
+		$mssg_warning = 1;
+	}
+
+	//safe-input before validate ip
 	$direccion_agente = io_safe_input($direccion_agente);
 	$address_list = (string) get_parameter_post ("address_list", '');
 	
@@ -699,6 +721,10 @@ if ($update_agent) { // if modified some agent paramenter
 		}
 	}
 
+	if($mssg_warning){
+		ui_print_warning_message(__('The ip or dns name entered cannot be resolved'));
+	}
+	
 	//Verify if there is another agent with the same name but different ID
 	if ($nombre_agente == "") {
 		ui_print_error_message(__('No agent name specified'));

pandora_console/include/functions.php

@@ -2699,4 +2699,26 @@ function remove_right_zeros ($value) {
 		return $value;
 	}
 }
+
+/**
+ * returns true or false if it is a valid ip 
+ * checking ipv4 and ipv6 or resolves the name dns
+ * @param string address
+ *
+*/
+function validate_address($address){
+	if($address){
+		if(!filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+			if(!filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				$ip_address_dns = gethostbyname($address);
+				if(!filter_var($ip_address_dns, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if(!filter_var($ip_address_dns, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+						return false;
+					}
+				}
+			}
+		}
+	}
+	return true;
+}
 ?>