From 895b7c74032bc4b04e3b05a424b629c59514cc5e Mon Sep 17 00:00:00 2001 From: alejandro Date: Mon, 23 Jan 2023 18:17:05 +0100 Subject: [PATCH 001/150] added exchange mail plugin --- .../Exchange_mail/exchange_mail.py | 451 ++++++++++++++++++ 1 file changed, 451 insertions(+) create mode 100644 pandora_plugins/Exchange_mail/exchange_mail.py diff --git a/pandora_plugins/Exchange_mail/exchange_mail.py b/pandora_plugins/Exchange_mail/exchange_mail.py new file mode 100644 index 0000000000..638c00d07e --- /dev/null +++ b/pandora_plugins/Exchange_mail/exchange_mail.py @@ -0,0 +1,451 @@ +# -*- coding: utf-8 -*- +from exchangelib import DELEGATE, Account, Credentials, Configuration,Message, Mailbox +from exchangelib.protocol import BaseProtocol, NoVerifyHTTPAdapter +from exchangelib import EWSTimeZone, EWSDateTime +BaseProtocol.HTTP_ADAPTER_CLS = NoVerifyHTTPAdapter + +import urllib3 +urllib3.disable_warnings() + +import argparse,sys,re,json,os,traceback +from datetime import datetime,timedelta,timezone + + +__author__ = "Alejandro Sánchez Carrion" +__copyright__ = "Copyright 2022, PandoraFMS" +__maintainer__ = "Operations department" +__status__ = "Production" +__version__= '1.0' + +info = f""" +Pandora FMS Exchange Mail +Version = {__version__} +Description = This plugin can search for matches in your mail and find the number of matches, as well as list them. + +Manual execution + +./exchange_mail --server --username --password [ --subject ] [ --sender ] [ --date_start ] [ --date_end ] [ --agent_name ] [ --as_agent_plugin ] [ --tentacle_port ] [ --tentacle_address ] [ -g ] [ --data_dir ] + +there are four parameters with which to filter the mails + +subject +email +date + +You can use only one and filter from that or use the following combinations: + +subject +subject + sender +subject + sender + date +""" + +parser = argparse.ArgumentParser(description= info, formatter_class=argparse.RawTextHelpFormatter) +parser.add_argument('--server', help="Server name") +parser.add_argument('--username', help="User name") +parser.add_argument('--password', help="Password") +parser.add_argument('--smtp_address', help="SMTP address") +parser.add_argument('--subject', help="Select match in subjects") +parser.add_argument('--sender', help="Select coincidences from email") +parser.add_argument('--date_start', help="Search for matches from a certain date,Each date must be separated by a hyphen and in quotation marks, with the following format: 'year-month-day-hour-minute'. example: '2021-1-12-0-0'") +parser.add_argument('--date_end', help="Search for matches from a certain date,Each date must be separated by a hyphen and in quotation marks, with the following format: 'year-month-day-hour-minute'. example: '2021-6-12-0-0'") +parser.add_argument('--mail_list', help='List mail coincidences',type=int,default=0) + +parser.add_argument('--agent_name', help='agent name', default= "Exchange") +parser.add_argument('--module_prefix', help='module prefix', default= "Exchange") +parser.add_argument('-g', '--group', help='PandoraFMS destination group (default exchange)', default='exchange') +parser.add_argument('--data_dir', help='PandoraFMS data dir (default: /var/spool/pandora/data_in/)', default='/var/spool/pandora/data_in/') +parser.add_argument('--as_agent_plugin', help='mode plugin', default=0,type=int) +parser.add_argument('--tentacle_port', help='tentacle port', default=41121) +parser.add_argument('--tentacle_address', help='tentacle adress', default=None) + + +args = parser.parse_args() + +username,password,server,smtp_address=args.username,args.password,args.server,args.smtp_address + + +### Pandora Tools ###------------------------------------------------------------------------------------------------------- +modules = [] + +configuration = { + "data_in": args.data_dir, + "group" : args.group +} + +######################################################################################### +# print_agent +######################################################################################### +def print_agent(agent, modules, data_dir="/var/spool/pandora/data_in/", log_modules= None, print_flag = None): + """Prints agent XML. Requires agent conf (dict) and modules (list) as arguments. + - Use print_flag to show modules' XML in STDOUT. + - Returns a tuple (xml, data_file). + """ + data_file=None + + header = "\n" + header += "\n" + "\t\n" + "\t" + str(data["type"]) + "\n" + ) + + if type(data["type"]) is not str and "string" not in data["type"]: #### Strip spaces if module not generic_data_string + data["value"] = data["value"].strip() + if isinstance(data["value"], list): # Checks if value is a list + module_xml += "\t\n" + for value in data["value"]: + if type(value) is dict and "value" in value: + module_xml += "\t\n" + module_xml += "\t\t\n" + if "timestamp" in value: + module_xml += "\t\t\n" + module_xml += "\t\n" + module_xml += "\t\n" + else: + module_xml += "\t\n" + if "desc" in data: + module_xml += "\t\n" + if "unit" in data: + module_xml += "\t\n" + if "interval" in data: + module_xml += "\t\n" + if "tags" in data: + module_xml += "\t" + str(data["tags"]) + "\n" + if "module_group" in data: + module_xml += "\t" + str(data["module_group"]) + "\n" + if "module_parent" in data: + module_xml += "\t" + str(data["module_parent"]) + "\n" + if "min_warning" in data: + module_xml += "\t\n" + if "min_warning_forced" in data: + module_xml += "\t\n" + if "max_warning" in data: + module_xml += "\t\n" + if "max_warning_forced" in data: + module_xml += "\t\n" + if "min_critical" in data: + module_xml += "\t\n" + if "min_critical_forced" in data: + module_xml += "\t\n" + if "max_critical" in data: + module_xml += "\t\n" + if "max_critical_forced" in data: + module_xml += "\t\n" + if "str_warning" in data: + module_xml += "\t\n" + if "str_warning_forced" in data: + module_xml += "\t\n" + if "str_critical" in data: + module_xml += "\t\n" + if "str_critical_forced" in data: + module_xml += "\t\n" + if "critical_inverse" in data: + module_xml += "\t\n" + if "warning_inverse" in data: + module_xml += "\t\n" + if "max" in data: + module_xml += "\t\n" + if "min" in data: + module_xml += "\t\n" + if "post_process" in data: + module_xml += "\t\n" + if "disabled" in data: + module_xml += "\t\n" + if "min_ff_event" in data: + module_xml += "\t\n" + if "status" in data: + module_xml += "\t\n" + if "timestamp" in data: + module_xml += "\t\n" + if "custom_id" in data: + module_xml += "\t\n" + if "critical_instructions" in data: + module_xml += "\t\n" + if "warning_instructions" in data: + module_xml += "\t\n" + if "unknown_instructions" in data: + module_xml += "\t\n" + if "quiet" in data: + module_xml += "\t\n" + if "module_ff_interval" in data: + module_xml += "\t\n" + if "crontab" in data: + module_xml += "\t\n" + if "min_ff_event_normal" in data: + module_xml += "\t\n" + if "min_ff_event_warning" in data: + module_xml += "\t\n" + if "min_ff_event_critical" in data: + module_xml += "\t\n" + if "ff_type" in data: + module_xml += "\t\n" + if "ff_timeout" in data: + module_xml += "\t\n" + if "each_ff" in data: + module_xml += "\t\n" + if "module_parent_unlink" in data: + module_xml += "\t\n" + if "global_alerts" in data: + for alert in data["alert"]: + module_xml += "\t\n" + module_xml += "\n" + + if print_flag: + print (module_xml) + + return (module_xml) + +######################################################################################### +# write_xml +######################################################################################### + +def write_xml(xml, agent_name, data_dir="/var/spool/pandora/data_in/"): + """Creates a agent .data file in the specified data_dir folder\n + Args: + - xml (str): XML string to be written in the file. + - agent_name (str): agent name for the xml and file name. + - data_dir (str): folder in which the file will be created.""" + Utime = datetime.now().strftime('%s') + data_file = "%s/%s.%s.data" %(str(data_dir),agent_name,str(Utime)) + try: + with open(data_file, 'x') as data: + data.write(xml) + except OSError as o: + sys.exit(f"ERROR - Could not write file: {o}, please check directory permissions") + except Exception as e: + sys.exit(f"{type(e).__name__}: {e}") + return (data_file) + +# # default agent +def clean_agent() : + global agent + agent = { + "agent_name" : "", + "agent_alias" : "", + "parent_agent_name" : "", + "description" : "", + "version" : "", + "os_name" : "", + "os_version" : "", + "timestamp" : datetime.today().strftime('%Y/%m/%d %H:%M:%S'), + #"utimestamp" : int(datetime.timestamp(datetime.today())), + "address" : "", + "group" : configuration["group"], + "interval" : "", + "agent_mode" : "1", + } + return agent + +# default module +def clean_module() : + global modulo + modulo = { + "name" : "", + "type" : "generic_data_string", + "desc" : "", + "value" : "", + } + return modulo + +######################################################################################### +# tentacle_xml +######################################################################################### +def tentacle_xml(file, tentacle_ops,tentacle_path='', debug=0): + """Sends file using tentacle protocol\n + - Only works with one file at time. + - file variable needs full file path. + - tentacle_opts should be a dict with tentacle options (address [password] [port]). + - tentacle_path allows to define a custom path for tentacle client in case is not in sys path). + - if debug is enabled, the data file will not be removed after being sent. + + Returns 0 for OK and 1 for errors. + """ + + if file is None : + sys.stderr.write("Tentacle error: file path is required.") + else : + data_file = file + + if tentacle_ops['address'] is None : + sys.stderr.write("Tentacle error: No address defined") + return 1 + + try : + with open(data_file, 'r') as data: + data.read() + data.close() + except Exception as e : + sys.stderr.write(f"Tentacle error: {type(e).__name__} {e}") + return 1 + + tentacle_cmd = f"{tentacle_path}tentacle_client -v -a {tentacle_ops['address']} " + if "port" in tentacle_ops: + tentacle_cmd += f"-p {tentacle_ops['port']} " + if "password" in tentacle_ops: + tentacle_cmd += f"-x {tentacle_ops['password']} " + tentacle_cmd += f"{data_file} " + + tentacle_exe=Popen(tentacle_cmd, stdout=PIPE, shell=True) + rc=tentacle_exe.wait() + + if rc != 0 : + sys.stderr.write("Tentacle error") + return 1 + elif debug == 0 : + os.remove(file) + + return 0 + +## funcion agent +def agentplugin(modules,agent,plugin_type="server",data_dir="/var/spool/pandora/data_in/",tentacle=False,tentacle_conf=None) : + if plugin_type == "server": + for modulo in modules: + print_module(modulo,1) + + elif tentacle == True and tentacle_conf is not None: + agent_file=print_agent(agent, modules,data_dir) + if agent_file[1] is not None: + tentacle_xml(agent_file[1],tentacle_conf) + print ("1") + else: + print_agent(agent, modules,data_dir) + print ("1") + +def parse_result(list_email,sep="")-> list: + """ + + Return list containing each line as element + """ + + result=[] + + for line in list_email: + str_line=sep.join(str(elem) for elem in line) + str_dict={"value":str_line} + result.append(str_dict) + + return result + +# Create agent +clean_agent() +agent.update( + agent_name = args.agent_name , + agent_alias =args.agent_name , + description ="" +) + + +def connect(username,password,server,smtp_address): + creds = Credentials( + username=args.username, + password=args.password + ) + + try: + config = Configuration(server=args.server, credentials=creds) + + account = Account( + primary_smtp_address=args.smtp_address, + autodiscover=False, + config=config, + access_type=DELEGATE + ) + return account + except Exception as e: + sys.exit(f"{type(e).__name__}: {e}") + #print(account.root.tree()) + +account=connect(args.username,args.password,args.server,args.smtp_address) + +## Only one parameter +if args.subject and args.sender==None and args.date_start==None and args.date_end == None: + filtered_items = account.inbox.filter(subject__contains=args.subject) +if args.subject==None and args.sender and args.date_start==None and args.date_end == None: + filtered_items = account.inbox.filter(sender__icontains=args.sender) +if args.subject==None and args.sender==None and args.date_start and args.date_end : + date_start=args.date_start.split("-") + date_end=args.date_end.split("-") + filtered_items = account.inbox.filter(datetime_received__range=(datetime(int(date_start[0].strip()), int(date_start[1].strip()), int(date_start[2].strip()), int(date_start[3].strip()), int(date_start[4].strip())).replace(tzinfo=timezone.utc),datetime(int(date_end[0].strip()), int(date_end[1].strip()), int(date_end[2].strip()), int(date_end[3].strip()), int(date_end[4].strip())).replace(tzinfo=timezone.utc))) + +## Subject + sender +if args.subject and args.sender and args.date_start==None and args.date_end==None : + filtered_items = account.inbox.filter(sender__icontains=args.sender,subject__contains=args.subject) + +## All parameters +if args.subject and args.sender and args.date_start and args.date_end : + date_start=args.date_start.split("-") + date_end=args.date_end.split("-") + filtered_items = account.inbox.filter(datetime_received__range=(datetime(int(date_start[0].strip()), int(date_start[1].strip()), int(date_start[2].strip()), int(date_start[3].strip()), int(date_start[4].strip())).replace(tzinfo=timezone.utc),datetime(int(date_end[0].strip()), int(date_end[1].strip()), int(date_end[2].strip()), int(date_end[3].strip()), int(date_end[4].strip())).replace(tzinfo=timezone.utc)),sender__icontains=args.sender,subject__contains=args.subject) + +# List Number email coincidences +list_email=[] +# Count number messages coincidences +count=0 + +for item in filtered_items: + + count=count+1 + + list_email.append("("+str(item.datetime_received) + ") - "+str(item.subject)+" - "+str(item.sender)) + + #print(item.subject, item.sender, item.datetime_received) + +list_email = parse_result(list_email) + +clean_module() +modulo.update( + name = f"{args.module_prefix}.Coincidences_count", + type = "generic_data", + desc = "Number of mails matching the filter used in the run", + value = count +) +modules.append(modulo) + +if args.mail_list: + clean_module() + modulo.update( + name = f"{args.module_prefix}.Coincidences_list", + type = "generic_data_string", + desc = "List of mails matching the filter used in the run", + timestamp=datetime.today().strftime('%Y/%m/%d %H:%M:%S'), + value = list_email + ) + modules.append(modulo) + + +if args.tentacle_address is not None: + tentacle_conf={"address":args.tentacle_address,"port":args.tentacle_port} + agentplugin(modules,agent,"agent",configuration["data_in"],True,tentacle_conf) +elif args.as_agent_plugin!=1: + agentplugin(modules,agent,"agent",configuration["data_in"]) +else: + agentplugin(modules,agent) From e4ed319bcc37cf2d55aa4cba793d104e20882d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Sun, 4 Jun 2023 09:04:50 -0600 Subject: [PATCH 002/150] Correct comments in Tentacle Server Conf. --- pandora_server/conf/tentacle_server.conf.new | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pandora_server/conf/tentacle_server.conf.new b/pandora_server/conf/tentacle_server.conf.new index 1acf082ca2..4fa307e0e8 100644 --- a/pandora_server/conf/tentacle_server.conf.new +++ b/pandora_server/conf/tentacle_server.conf.new @@ -5,10 +5,10 @@ # Tentacle have IANA assigned port tpc/41121 as official port. ########################################################################## -# [-a] IPv4 address to listen on. Several IPs cam be selected separating if by comma. +# [-a] IPv4 address to listen on. Several IP adresses can be selected separated by commas. addresses 0.0.0.0 -# [-p] Port to listen on +# [-p] Port number to listen on. port 41121 # [-c] Maximum number of simultaneous connections @@ -17,19 +17,19 @@ port 41121 # [-d] Run as daemon. 1 true, 0 false daemon 1 -# [-i] Enable insecure mode -# insecure 0 +# [-I] Enable insecure mode. 1 true, 0 false. +#insecure 0 -# Filters (regexp:dir;regexp:dir...) -filters .*\.conf:conf;.*\.md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:commands +# [-i] Filters (regexp:dir;regexp:dir...). +filters ..conf:conf;..md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:commands # [-m] Maximum file size allowed by the server in bytes -#max_size 2000000 +# max_size 2000000 -# [-o] Accept files with a repeated name +# [-o] Accept files with a repeated name. 1 true, 0 false. # overwrite 0 -# [-q] Do not output error messages. +# [-q] No output error messages. 1 true, 0 false. # quiet 0 # [-r] Number of retries for socket read/write operations @@ -38,10 +38,10 @@ filters .*\.conf:conf;.*\.md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:co # [-s] Storage directory directory /var/spool/pandora/data_in -# [-b] Address to proxy client requests to +# [-b] IP address proxy client requests to. # proxy_ip 127.0.0.1 -# [-g] Port to proxy client requests to +# [-g] Port number proxy client requests to. # proxy_port 41121 # [-t] Timeout for socket read/write operations in seconds @@ -71,5 +71,5 @@ log_file /dev/null # [-w] SSL password. Set to 1 to ask for password by command line # ssl_password 0 -# [-T] Use libwrap library (Authen::Libwrap perl module) +# [-T] Use libwrap library (Authen::Libwrap perl module). 1 true, 0 false. # use_libwrap 0 \ No newline at end of file From a85a7eccf8c212f854dd9af6cc1cf561aa7b3dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Sun, 4 Jun 2023 10:34:33 -0600 Subject: [PATCH 003/150] Modifications to accept spaces in agent alias CLI --- pandora_server/util/pandora_manage.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 07c7bf6ad1..b11e862790 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -5389,6 +5389,8 @@ sub cli_get_agents_id_name_by_alias() { my @agents; my $where_value; + $agent_alias =~ s/ / /g; + if($strict eq 'strict') { $where_value = $agent_alias; } else { @@ -5404,14 +5406,14 @@ sub cli_get_agents_id_name_by_alias() { print "[ERROR] No agents retrieved.\n\n"; } else { if(is_metaconsole($conf) == 1) { - print "alias, id_agente, id_tagente, id_server, server_name\n"; + print "id_agente, alias, id_tagente, id_server, server_name\n"; foreach my $agent (@agents) { - print safe_output($agent->{'alias'}).", ".$agent->{'id_agente'}.", ".$agent->{'id_tagente'}.", ".$agent->{'id_server'}.", ".$agent->{'server_name'}."\n"; + print safe_output($agent->{'id_agente'}).", ".$agent->{'alias'}.", ".$agent->{'id_tagente'}.", ".$agent->{'id_server'}.", ".$agent->{'server_name'}."\n"; } } else { - print "alias, id_agente\n"; + print "id_agente, alias\n"; foreach my $agent (@agents) { print $agent->{'id_agente'}.",".safe_output($agent->{'alias'})."\n"; From b7a6c8f7301eea6145e1a1eef2094493ed512dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Mon, 5 Jun 2023 08:41:10 -0600 Subject: [PATCH 004/150] Validate entities with safe input. --- pandora_server/util/pandora_manage.pl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index b11e862790..a7cc0af873 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -5384,13 +5384,11 @@ sub cli_get_agent_status() { ############################################################################## sub cli_get_agents_id_name_by_alias() { - my $agent_alias = @ARGV[2]; + my $agent_alias = safe_input(@ARGV[2]); my $strict = @ARGV[3]; my @agents; my $where_value; - $agent_alias =~ s/ / /g; - if($strict eq 'strict') { $where_value = $agent_alias; } else { From 936d9cac4c93b7af022bd4c829d0e74bc0ff5027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Su=C3=A1rez?= Date: Mon, 5 Jun 2023 08:48:15 -0600 Subject: [PATCH 005/150] Set the filter as it was originally --- pandora_server/conf/tentacle_server.conf.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/conf/tentacle_server.conf.new b/pandora_server/conf/tentacle_server.conf.new index 4fa307e0e8..a7cec8fd2c 100644 --- a/pandora_server/conf/tentacle_server.conf.new +++ b/pandora_server/conf/tentacle_server.conf.new @@ -21,7 +21,7 @@ daemon 1 #insecure 0 # [-i] Filters (regexp:dir;regexp:dir...). -filters ..conf:conf;..md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:commands +filters .*\.conf:conf;.*\.md5:md5;.*\.zip:collections;.*\.lock:trans;.*\.rcmd:commands # [-m] Maximum file size allowed by the server in bytes # max_size 2000000 From 4ed724edccfbbca7216fdb6748fdac17b8fc0a3f Mon Sep 17 00:00:00 2001 From: "felix.suarez" Date: Thu, 23 Nov 2023 12:15:55 -0600 Subject: [PATCH 006/150] Add SSL valitations for Cipher and Version --- tentacle/conf/tentacle_server.conf.new | 8 ++++- tentacle/tentacle_server | 47 ++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/tentacle/conf/tentacle_server.conf.new b/tentacle/conf/tentacle_server.conf.new index 1acf082ca2..390369995f 100644 --- a/tentacle/conf/tentacle_server.conf.new +++ b/tentacle/conf/tentacle_server.conf.new @@ -72,4 +72,10 @@ log_file /dev/null # ssl_password 0 # [-T] Use libwrap library (Authen::Libwrap perl module) -# use_libwrap 0 \ No newline at end of file +# use_libwrap 0 + +# [-z] Restrict to a specific ssl version +# ssl_version TLSv1_3 + +# [-u] Restrict to a specific ssl cipher +# ssl_cipher AES256-SHA diff --git a/tentacle/tentacle_server b/tentacle/tentacle_server index 6d503e0053..cf9b521cdd 100755 --- a/tentacle/tentacle_server +++ b/tentacle/tentacle_server @@ -187,6 +187,12 @@ my $t_proxy_ip = undef; # Port to proxy client requests to my $t_proxy_port = 41121; +# Allowed SSL Cipher +my $t_ssl_cipher= ''; + +# Allowed SSL Version +my $t_ssl_version= ''; + # Proxy socket my $t_proxy_socket; @@ -230,7 +236,7 @@ sub print_help { print ("\t-p port\t\tPort to listen on (default $t_port).\n"); print ("\t-q\t\tQuiet. Do now print error messages.\n"); print ("\t-r number\tNumber of retries for network opertions (default $t_retries).\n"); - print ("\t-S (install|uninstall|run) Manage the win32 service.\n"); + print ("\t-S \t\t(install|uninstall|run) Manage the win32 service.\n"); print ("\t-t time\t\tTime-out for network operations in seconds (default ${t_timeout}s).\n"); print ("\t-v\t\tBe verbose (display errors).\n"); print ("\t-V\t\tBe verbose on hard way (display errors and other info).\n"); @@ -239,7 +245,9 @@ sub print_help { print ("\t-b ip_address\tProxy requests to the given address.\n"); print ("\t-g port\t\tProxy requests to the given port.\n"); print ("\t-T\t\tEnable tcpwrappers support.\n"); - print ("\t \t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n"); + print ("\t \t\t(To use this option, 'Authen::Libwrap' should be installed.)\n"); + print ("\t-z\t\tRestrict to a specific SSL Version.\n"); + print ("\t-u\t\tRestrict to a specific SSL Cipher.\n\n"); } ################################################################################ @@ -287,7 +295,7 @@ sub parse_options { my @t_addresses_tmp; # Get options - if (getopts ('a:b:c:de:f:F:g:hIi:k:l:m:op:qr:s:S:t:TvVwx:', \%opts) == 0 || defined ($opts{'h'})) { + if (getopts ('a:b:c:de:f:F:g:hIi:k:l:m:op:qr:s:S:t:TvVwx:zu:', \%opts) == 0 || defined ($opts{'h'})) { print_help (); exit 1; } @@ -547,6 +555,18 @@ sub parse_options { } } + # Specific SSL Version + $token_value = get_config_value($opts{'z'}, $CONF->{'ssl_version'}); + if (defined ($token_value)) { + $t_ssl_version = $token_value; + } + + # Specific SSL Cipher + $token_value = get_config_value($opts{'u'}, $CONF->{'ssl_cipher'}); + if (defined ($token_value)) { + $t_ssl_cipher = $token_value; + } + # Win32 service management if (defined ($opts{'S'})) { my $service_action = $opts{'S'}; @@ -817,9 +837,30 @@ sub start_ssl { error ($err); } + validate_ssl(); + print_log ("SSL started for " . $t_client_socket->sockhost ()); } +################################################################################ +## SUB validate_ssl +## Validate that a socket has a defined ssl version and cipher. +################################################################################ +sub validate_ssl{ + my $ssl_version = $t_client_socket->get_ssl_version(); + my $ssl_cipher = $t_client_socket->get_cipher(); + + if($t_ssl_version && $ssl_version ne $t_ssl_version){ + $t_client_socket->close(); + error ("Invalid SSL Version " . $ssl_version . ", expected version is " . $t_ssl_version . "."); + } + + if($t_ssl_cipher && $ssl_cipher ne $t_ssl_cipher){ + $t_client_socket->close(); + error ("Invalid SSL Cipher " . $ssl_cipher . ", expected cipher is " . $t_ssl_cipher . "."); + } +} + ################################################################################ ## SUB accept_connections ## Manage incoming connections. From 245154ce21e8ae1cdba4daf1f436dd737d576a58 Mon Sep 17 00:00:00 2001 From: "felix.suarez" Date: Fri, 24 Nov 2023 09:37:20 -0600 Subject: [PATCH 007/150] Pass version and cipher as args instead of validating afterwards. --- tentacle/tentacle_server | 41 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/tentacle/tentacle_server b/tentacle/tentacle_server index cf9b521cdd..b6d6ae7b08 100755 --- a/tentacle/tentacle_server +++ b/tentacle/tentacle_server @@ -295,7 +295,7 @@ sub parse_options { my @t_addresses_tmp; # Get options - if (getopts ('a:b:c:de:f:F:g:hIi:k:l:m:op:qr:s:S:t:TvVwx:zu:', \%opts) == 0 || defined ($opts{'h'})) { + if (getopts ('a:b:c:de:f:F:g:hIi:k:l:m:op:qr:s:S:t:TvVwx:z:u:', \%opts) == 0 || defined ($opts{'h'})) { print_help (); exit 1; } @@ -808,13 +808,19 @@ sub stop_server { sub start_ssl { my $err; + my %ssl_args = ( + SSL_cert_file => $t_ssl_cert, + SSL_key_file => $t_ssl_key, + SSL_passwd_cb => sub {return $t_ssl_pwd}, + SSL_server => 1, + SSL_cipher_list => $t_ssl_cipher // '', + SSL_version => $t_ssl_version // '', + ); + if ($t_ssl_ca eq '') { IO::Socket::SSL->start_SSL ( $t_client_socket, - SSL_cert_file => $t_ssl_cert, - SSL_key_file => $t_ssl_key, - SSL_passwd_cb => sub {return $t_ssl_pwd}, - SSL_server => 1, + %ssl_args, # Verify peer SSL_verify_mode => 0x01, ); @@ -822,11 +828,8 @@ sub start_ssl { else { IO::Socket::SSL->start_SSL ( $t_client_socket, + %ssl_args, SSL_ca_file => $t_ssl_ca, - SSL_cert_file => $t_ssl_cert, - SSL_key_file => $t_ssl_key, - SSL_passwd_cb => sub {return $t_ssl_pwd}, - SSL_server => 1, # Fail verification if no peer certificate exists SSL_verify_mode => 0x03, ); @@ -837,29 +840,9 @@ sub start_ssl { error ($err); } - validate_ssl(); - print_log ("SSL started for " . $t_client_socket->sockhost ()); } -################################################################################ -## SUB validate_ssl -## Validate that a socket has a defined ssl version and cipher. -################################################################################ -sub validate_ssl{ - my $ssl_version = $t_client_socket->get_ssl_version(); - my $ssl_cipher = $t_client_socket->get_cipher(); - - if($t_ssl_version && $ssl_version ne $t_ssl_version){ - $t_client_socket->close(); - error ("Invalid SSL Version " . $ssl_version . ", expected version is " . $t_ssl_version . "."); - } - - if($t_ssl_cipher && $ssl_cipher ne $t_ssl_cipher){ - $t_client_socket->close(); - error ("Invalid SSL Cipher " . $ssl_cipher . ", expected cipher is " . $t_ssl_cipher . "."); - } -} ################################################################################ ## SUB accept_connections From 3d635449398886bf4392cdd6ead6422744211480 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Thu, 7 Dec 2023 14:14:12 +0100 Subject: [PATCH 008/150] get data in file count from module --- .../include/class/ConsoleSupervisor.php | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 83208256fb..e34740711e 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -27,6 +27,7 @@ */ use PandoraFMS\Tools\Files; +use PandoraFMS\Agent; global $config; @@ -1162,11 +1163,20 @@ class ConsoleSupervisor $this->cleanNotifications('NOTIF.WRITABLE.ATTACHMENT'); } - $filecount = $this->countFiles( - $config['attachment_store'], - '', - $config['num_files_attachment'] - ); + $agentId = db_get_value('id_agente', 'tagente', 'nombre', 'pandora.internals'); + if ($agentId !== false) { + $agent = new Agent($agentId); + + $moduleId = $agent->searchModules( + ['nombre' => 'Data_in_files'], + 1 + )->toArray()['id_agente_modulo']; + + if ($moduleId > 0) { + $filecount = (int) modules_get_last_value($moduleId); + } + } + if ($filecount > $config['num_files_attachment']) { $this->notify( [ From 2eae64407d4645cd8bc4eeb73a14005c4aac62fe Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Thu, 7 Dec 2023 14:17:42 +0100 Subject: [PATCH 009/150] get data in file count from module --- pandora_console/include/class/ConsoleSupervisor.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index e34740711e..a7676d4b40 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -1163,6 +1163,8 @@ class ConsoleSupervisor $this->cleanNotifications('NOTIF.WRITABLE.ATTACHMENT'); } + $filecount = 0; + $agentId = db_get_value('id_agente', 'tagente', 'nombre', 'pandora.internals'); if ($agentId !== false) { $agent = new Agent($agentId); From 7f4dc4fbe458b675a378b7e6813e908986eee0f1 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 11 Dec 2023 09:18:40 +0100 Subject: [PATCH 010/150] #12460 fixed log deprecated --- pandora_console/include/functions_api.php | 6 +++--- pandora_console/include/functions_ui.php | 4 ++++ .../include/lib/TacticalView/elements/NewsBoard.php | 2 ++ pandora_console/operation/events/events.php | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 8f5fb66f54..07b512f55c 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -541,7 +541,7 @@ function api_get_groups($thrash1, $thrash2, $other, $returnType, $user_in_db) } -function api_get_agent_module_name_last_value($agentName, $moduleName, $other=';', $returnType) +function api_get_agent_module_name_last_value($agentName, $moduleName, $other=';', $returnType='') { $idAgent = agents_get_agent_id($agentName); @@ -558,7 +558,7 @@ function api_get_agent_module_name_last_value($agentName, $moduleName, $other='; } -function api_get_agent_module_name_last_value_alias($alias, $moduleName, $other=';', $returnType) +function api_get_agent_module_name_last_value_alias($alias, $moduleName, $other=';', $returnType='') { $sql = sprintf( 'SELECT tagente_modulo.id_agente_modulo FROM tagente_modulo @@ -573,7 +573,7 @@ function api_get_agent_module_name_last_value_alias($alias, $moduleName, $other= } -function api_get_module_last_value($idAgentModule, $trash1, $other=';', $returnType) +function api_get_module_last_value($idAgentModule, $trash1, $other=';', $returnType='') { global $config; if (defined('METACONSOLE')) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 5c9a7e90fc..4a0db88991 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -147,6 +147,10 @@ function ui_print_truncate_text( $text_html_decoded = io_safe_output($text); $text_has_entities = $text != $text_html_decoded; + if ($text_html_decoded === null) { + $text_html_decoded = ''; + } + if (mb_strlen($text_html_decoded, 'UTF-8') > ($numChars)) { // '/2' because [...] is in the middle of the word. $half_length = intval(($numChars - 3) / 2); diff --git a/pandora_console/include/lib/TacticalView/elements/NewsBoard.php b/pandora_console/include/lib/TacticalView/elements/NewsBoard.php index 3be2dd685f..a2a2b7faba 100644 --- a/pandora_console/include/lib/TacticalView/elements/NewsBoard.php +++ b/pandora_console/include/lib/TacticalView/elements/NewsBoard.php @@ -117,6 +117,8 @@ class NewsBoard extends Element $output .= ''; return $output; + } else { + return ''; } } diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index be5f6047e3..c924794d6d 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -505,7 +505,7 @@ if (is_ajax() === true) { } } - if (strlen($tmp->server_name) >= 10) { + if (strlen(($tmp->server_name ?? '')) >= 10) { $tmp->server_name = ui_print_truncate_text( $tmp->server_name, 10, From 86671c721193b5bc4e202e3ae5d49937a724ed32 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 11 Dec 2023 11:36:34 +0100 Subject: [PATCH 011/150] #12350 added agent name editing --- .../godmode/agentes/agent_manager.php | 69 ++++++++++++++++++- .../godmode/agentes/configurar_agente.php | 18 ++++- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 26bae75929..a6e0d7e987 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -357,7 +357,18 @@ if ($new_agent === false) { $tableAgent->data['caption_name'][0] = __('Agent name'); $tableAgent->rowclass['name'] = 'w540px'; $tableAgent->cellstyle['name'][0] = 'width: 100%;'; - $tableAgent->data['name'][0] = html_print_input_text('agente', $nombre_agente, '', 76, 100, true, false, false, '', 'w100p'); + $tableAgent->data['name'][0] = html_print_input_text( + 'agente', + $nombre_agente, + '', + 76, + 100, + true, + true, + false, + '', + 'w100p' + ); $tableAgent->data['name'][0] .= html_print_div( [ 'class' => 'moduleIdBox', @@ -365,6 +376,28 @@ if ($new_agent === false) { ], true ); + + // Other than Linux, Solaris, AIX, BSD, HPUX, MacOs, and Windows. + if ($id_os !== '1' && $id_os !== '2' && $id_os !== '3' && $id_os !== '4' + && $id_os !== '5' && $id_os !== '7' && $id_os !== '8' + ) { + $tableAgent->data['name'][0] .= html_print_anchor( + [ + 'content' => html_print_image( + 'images/edit.svg', + true, + [ + 'border' => 0, + 'title' => __('Edit agent name'), + 'class' => 'main_menu_icon invert_filter after_input_icon forced_title clickable', + 'onclick' => 'editAgent()', + ] + ), + ], + true + ); + } + // Agent options for QR code. $agent_options_update = 'agent_options_update'; } @@ -1429,7 +1462,6 @@ ui_require_jquery_file('bgiframe'); 128 ); } - $("#text-agente").prop('readonly', true); // Disable fixed ip button if empty. @@ -1458,4 +1490,37 @@ ui_require_jquery_file('bgiframe'); $('#basic_options').addClass('invisible'); } } + + function editAgent() { + $(`#text-agente`).attr(`readonly`, false); + const title = ''; + const text = ''; + const id = uniqId(); + $("body").append('
'); + $("#" + id).empty(); + $("#" + id).append(text); + $("#" + id).dialog({ + height: 150, + width: 528, + opacity: 1, + modal: true, + position: { + my: "center", + at: "center", + of: window, + collision: "fit" + }, + title: title, + closeOnEscape: true, + buttons: [{ + text: "OK", + click: function() { + $(this).dialog("close"); + } + }], + open: function(event, ui) { + $(".ui-dialog-titlebar-close").hide(); + }, + }).show(); + } diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index b4abfa1ad7..673919908e 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -956,6 +956,13 @@ if ($update_agent) { $mssg_warning = 0; $id_agente = (int) get_parameter_post('id_agente'); $nombre_agente = str_replace('`', '‘', (string) get_parameter_post('agente', '')); + $repeated_name = db_get_row_sql( + sprintf( + 'SELECT nombre FROM tagente WHERE id_agente <> %s AND nombre like "%s"', + $id_agente, + $nombre_agente + ) + ); $alias_safe_output = strip_tags(io_safe_output(get_parameter('alias', ''))); $alias = io_safe_input(trim(preg_replace('/[\/\\\|%#&$]/', '', $alias_safe_output))); $alias_as_name = (int) get_parameter_post('alias_as_name', 0); @@ -1084,14 +1091,17 @@ if ($update_agent) { } } + // Verify if there is another agent with the same name but different ID. + if (empty($repeated_name) === false) { + ui_print_error_message(__('Agent with repeated name')); + } + 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 ($alias == '') { ui_print_error_message(__('No agent alias specified')); - // If there is an agent with the same name, but a different ID. } if ($direccion_agente !== $address_list && (bool) $unique_ip === true && $direccion_agente != '') { @@ -1152,6 +1162,10 @@ if ($update_agent) { 'vul_scan_enabled' => $vul_scan_enabled, ]; + if (empty($repeated_name) === true) { + $values['nombre'] = $nombre_agente; + } + if ($config['metaconsole_agent_cache'] == 1) { $values['update_module_count'] = 1; // Force an update of the agent cache. From bb8c55bf78b8cee73111a268a232df15367b42ef Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 20 Dec 2023 11:06:37 +0100 Subject: [PATCH 012/150] not show servers in metaconsole pandora_enterprise#12178 --- pandora_console/include/functions_servers.php | 58 ++++++++++++++----- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php index ff6fab73c6..d95e23494d 100644 --- a/pandora_console/include/functions_servers.php +++ b/pandora_console/include/functions_servers.php @@ -615,7 +615,7 @@ function servers_get_rate($avg_interval, $num_modules) * This function will get all the server information in an array * or a specific server. * - * @param integer $id_server An optional integer or array of integers + * @param integer|array $id_server An optional integer or array of integers * to select specific servers. * * @return mixed False in case the server doesn't exist or an array with info. @@ -624,28 +624,56 @@ function servers_get_info($id_server=-1, $sql_limit=-1) { global $config; - if (is_array($id_server)) { - $select_id = ' WHERE id_server IN ('.implode(',', $id_server).')'; + $select_id = ''; + if (is_array($id_server) === true) { + $select_id = ' AND id_server IN ('.implode(',', $id_server).')'; } else if ($id_server > 0) { - $select_id = ' WHERE id_server IN ('.(int) $id_server.')'; - } else { - $select_id = ''; + $select_id = ' AND id_server IN ('.(int) $id_server.')'; } - $sql = ' - SELECT * - FROM tserver '.$select_id.' - ORDER BY server_type'; + $types_sql = ''; + if (is_metaconsole() === true && isset($config['ndbh']) === false) { + $types_sql = sprintf( + ' AND ( + `server_type` = %d OR + `server_type` = %d OR + `server_type` = %d OR + `server_type` = %d + )', + SERVER_TYPE_AUTOPROVISION, + SERVER_TYPE_EVENT, + SERVER_TYPE_MIGRATION, + SERVER_TYPE_PREDICTION + ); + } + + $sql = sprintf( + 'SELECT * + FROM tserver + WHERE 1=1 + %s + %s + ORDER BY server_type', + $select_id, + $types_sql + ); if ($sql_limit !== -1) { - $sql = ' - SELECT * - FROM tserver '.$select_id.' - ORDER BY server_type'.$sql_limit; + $sql = sprintf( + 'SELECT * + FROM tserver + WHERE 1=1 + %s + %s + ORDER BY server_type + %s', + $select_id, + $types_sql, + $sql_limit + ); } $result = db_get_all_rows_sql($sql); - $time = get_system_time(); if (empty($result)) { return false; From a31f964753fbbec4e5d0a692e084969bc274fcfa Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 27 Dec 2023 11:12:43 +0100 Subject: [PATCH 013/150] #12460 fixed deprecated --- pandora_console/include/functions_api.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 07b512f55c..ba10227fa2 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -541,7 +541,7 @@ function api_get_groups($thrash1, $thrash2, $other, $returnType, $user_in_db) } -function api_get_agent_module_name_last_value($agentName, $moduleName, $other=';', $returnType='') +function api_get_agent_module_name_last_value($agentName, $moduleName, $other=';', $returnType='string') { $idAgent = agents_get_agent_id($agentName); @@ -558,7 +558,7 @@ function api_get_agent_module_name_last_value($agentName, $moduleName, $other='; } -function api_get_agent_module_name_last_value_alias($alias, $moduleName, $other=';', $returnType='') +function api_get_agent_module_name_last_value_alias($alias, $moduleName, $other=';', $returnType='string') { $sql = sprintf( 'SELECT tagente_modulo.id_agente_modulo FROM tagente_modulo @@ -573,7 +573,7 @@ function api_get_agent_module_name_last_value_alias($alias, $moduleName, $other= } -function api_get_module_last_value($idAgentModule, $trash1, $other=';', $returnType='') +function api_get_module_last_value($idAgentModule, $trash1, $other=';', $returnType='string') { global $config; if (defined('METACONSOLE')) { From e2471f817d41f9a30f453e238627bfa139db54d5 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 9 Jan 2024 14:38:44 +0100 Subject: [PATCH 014/150] #12321 Added widget Gis map --- pandora_console/extras/mr/68.sql | 7 + pandora_console/images/widgets/GisMap.png | Bin 0 -> 9713 bytes .../include/lib/Dashboard/Widgets/GisMap.php | 541 ++++++++++++++++++ .../operation/gis_maps/render_view.php | 18 +- pandora_console/pandoradb_data.sql | 3 +- .../views/dashboard/listWidgets.php | 4 + 6 files changed, 555 insertions(+), 18 deletions(-) create mode 100644 pandora_console/extras/mr/68.sql create mode 100644 pandora_console/images/widgets/GisMap.png create mode 100644 pandora_console/include/lib/Dashboard/Widgets/GisMap.php diff --git a/pandora_console/extras/mr/68.sql b/pandora_console/extras/mr/68.sql new file mode 100644 index 0000000000..669eceaecd --- /dev/null +++ b/pandora_console/extras/mr/68.sql @@ -0,0 +1,7 @@ +START TRANSACTION; + +SET @widget_id = NULL; +SELECT @widget_id := `id` FROM `twidget` WHERE `unique_name` = 'GisMap'; +INSERT IGNORE INTO `twidget` (`id`,`class_name`,`unique_name`,`description`,`options`,`page`) VALUES (@widget_id,'GisMap','GisMap','Gis map','','GisMap.php'); + +COMMIT; \ No newline at end of file diff --git a/pandora_console/images/widgets/GisMap.png b/pandora_console/images/widgets/GisMap.png new file mode 100644 index 0000000000000000000000000000000000000000..0cbfbf37b6e2c794aa04ac7dae32173dae9ed536 GIT binary patch literal 9713 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 literal 0 HcmV?d00001 diff --git a/pandora_console/include/lib/Dashboard/Widgets/GisMap.php b/pandora_console/include/lib/Dashboard/Widgets/GisMap.php new file mode 100644 index 0000000000..3cb967cf8c --- /dev/null +++ b/pandora_console/include/lib/Dashboard/Widgets/GisMap.php @@ -0,0 +1,541 @@ +width = $width; + + // Height. + $this->height = $height; + + // Grid Width. + $this->gridWidth = $gridWidth; + + // Cell Id. + $this->cellId = $cellId; + + // Options. + $this->values = $this->decoders($this->getOptionsWidget()); + + // Page. + $this->page = basename(__FILE__); + + // ClassName. + $class = new \ReflectionClass($this); + $this->className = $class->getShortName(); + + // Title. + $this->title = __('Gis map'); + + // Name. + if (empty($this->name) === true) { + $this->name = 'GisMap'; + } + + // This forces at least a first configuration. + $this->configurationRequired = false; + if (empty($this->values['gis_map']) === true) { + $this->configurationRequired = true; + } + } + + + /** + * Decoders hack for retrocompability. + * + * @param array $decoder Values. + * + * @return array Returns the values ​​with the correct key. + */ + public function decoders(array $decoder): array + { + $values = []; + // Retrieve global - common inputs. + $values = parent::decoders($decoder); + + if (isset($decoder['gis_map']) === true) { + $values['gis_map'] = $decoder['gis_map']; + } + + return $values; + } + + + /** + * Generates inputs for form (specific). + * + * @return array Of inputs. + * + * @throws Exception On error. + */ + public function getFormInputs(): array + { + global $config; + + include_once $config['homedir'].'/include/functions_gis.php'; + + // Retrieve global - common inputs. + $inputs = parent::getFormInputs(); + + if ((bool) $config['activate_gis'] === true) { + $maps = gis_get_maps(); + } + + $array_map = []; + foreach ($maps as $map) { + if (check_acl($config['id_user'], $map['group_id'], 'MR') === false + && check_acl($config['id_user'], $map['group_id'], 'MW') === false + && check_acl($config['id_user'], $map['group_id'], 'MM') === false + ) { + continue; + } + + $array_map[$map['id_tgis_map']] = $map['map_name']; + } + + // Filters. + $inputs[] = [ + 'class' => 'flex flex-row', + 'label' => __('GIS maps'), + 'arguments' => [ + 'type' => 'select', + 'fields' => $array_map, + 'name' => 'gis_map', + 'return' => true, + 'selected' => ($this->values['gis_map'] === null) ? 0 : $this->values['gis_map'], + ], + ]; + + return $inputs; + } + + + /** + * Get Post for widget. + * + * @return array + */ + public function getPost(): array + { + // Retrieve global - common inputs. + $values = parent::getPost(); + + $values['gis_map'] = \get_parameter('gis_map', 0); + + return $values; + } + + + /** + * Draw widget. + * + * @return string; + */ + public function load() + { + global $config; + + include_once $config['homedir'].'/include/functions_gis.php'; + include_once $config['homedir'].'/include/functions_agents.php'; + + \ui_require_javascript_file('openlayers.pandora', 'include/javascript/', true); + \ui_require_javascript_file('OpenLayers/OpenLayers', 'include/javascript/', true); + + $map = db_get_row('tgis_map', 'id_tgis_map', $this->values['gis_map']); + + $output = ''; + if (check_acl($config['id_user'], $map['group_id'], 'MR') === false + && check_acl($config['id_user'], $map['group_id'], 'MW') === false + && check_acl($config['id_user'], $map['group_id'], 'MM') === false + ) { + $output .= '
'; + $output .= ui_print_error_message( + __('You don\'t have access'), + '', + true + ); + $output .= '
'; + return $output; + } + + $confMap = gis_get_map_conf($this->values['gis_map']); + + // Default open map (used to overwrite unlicensed google map view). + $confMapDefault = get_good_con(); + $confMapDefaultFull = json_decode($confMapDefault['conection_data'], true); + $confMapUrlDefault = $confMapDefaultFull['url']; + + $num_baselayer = 0; + // Initialy there is no Gmap base layer. + $gmap_layer = false; + if ($confMap !== false) { + foreach ($confMap as $mapC) { + $baselayers[$num_baselayer]['typeBaseLayer'] = $mapC['connection_type']; + $baselayers[$num_baselayer]['name'] = $mapC['conection_name']; + $baselayers[$num_baselayer]['num_zoom_levels'] = $mapC['num_zoom_levels']; + $decodeJSON = json_decode($mapC['conection_data'], true); + + switch ($mapC['connection_type']) { + case 'OSM': + $baselayers[$num_baselayer]['url'] = $decodeJSON['url']; + break; + + case 'Gmap': + if (!isset($decodeJSON['gmap_key']) || empty($decodeJSON['gmap_key'])) { + // If there is not gmap_key, show the default view. + $baselayers[$num_baselayer]['url'] = $confMapUrlDefault; + $baselayers[$num_baselayer]['typeBaseLayer'] = 'OSM'; + } else { + $baselayers[$num_baselayer]['gmap_type'] = $decodeJSON['gmap_type']; + $baselayers[$num_baselayer]['gmap_key'] = $decodeJSON['gmap_key']; + $gmap_key = $decodeJSON['gmap_key']; + // Once a Gmap base layer is found we mark it to import the API. + $gmap_layer = true; + } + break; + + case 'Static_Image': + $baselayers[$num_baselayer]['url'] = $decodeJSON['url']; + $baselayers[$num_baselayer]['bb_left'] = $decodeJSON['bb_left']; + $baselayers[$num_baselayer]['bb_right'] = $decodeJSON['bb_right']; + $baselayers[$num_baselayer]['bb_bottom'] = $decodeJSON['bb_bottom']; + $baselayers[$num_baselayer]['bb_top'] = $decodeJSON['bb_top']; + $baselayers[$num_baselayer]['image_width'] = $decodeJSON['image_width']; + $baselayers[$num_baselayer]['image_height'] = $decodeJSON['image_height']; + break; + + case 'WMS': + $baselayers[$num_baselayer]['url'] = $decodeJSON['url']; + $baselayers[$num_baselayer]['layers'] = $decodeJSON['layers']; + break; + + default: + // Do nothing. + break; + } + + $num_baselayer++; + if ($mapC['default_map_connection'] == 1) { + $numZoomLevels = $mapC['num_zoom_levels']; + } + } + } + + if ($gmap_layer === true) { + if (https_is_running()) { + ?> + + + + values['gis_map']); + + $output .= '
'; + gis_print_map( + 'map_'.$this->cellId, + $map['zoom_level'], + $map['initial_latitude'], + $map['initial_longitude'], + $baselayers, + $controls + ); + $output .= '
'; + + if (empty($layers) === false) { + foreach ($layers as $layer) { + gis_make_layer( + $layer['layer_name'], + $layer['view_layer'], + null, + $layer['id_tmap_layer'] + ); + + // Calling agents_get_group_agents with none to obtain the names in the same case as they are in the DB. + $agentNamesByGroup = []; + if ($layer['tgrupo_id_grupo'] >= 0) { + $agentNamesByGroup = agents_get_group_agents( + $layer['tgrupo_id_grupo'], + false, + 'none', + true, + true, + false + ); + } + + $agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer']); + + $groupsByAgentId = gis_get_groups_layer_by_agent_id($layer['id_tmap_layer']); + $agentNamesOfGroupItems = []; + foreach ($groupsByAgentId as $agentId => $groupInfo) { + $agentNamesOfGroupItems[$agentId] = $groupInfo['agent_name']; + } + + $agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer + $agentNamesOfGroupItems); + + foreach ($agentNames as $key => $agentName) { + $idAgent = $key; + $coords = gis_get_data_last_position_agent($idAgent); + + if ($coords === false) { + $coords['stored_latitude'] = $map['default_latitude']; + $coords['stored_longitude'] = $map['default_longitude']; + } else { + if ($show_history == 'y') { + $lastPosition = [ + 'longitude' => $coords['stored_longitude'], + 'latitude' => $coords['stored_latitude'], + ]; + gis_add_path($layer['layer_name'], $idAgent, $lastPosition); + } + } + + $status = agents_get_status($idAgent, true); + $icon = gis_get_agent_icon_map($idAgent, true, $status); + $icon_size = getimagesize($icon); + $icon_width = $icon_size[0]; + $icon_height = $icon_size[1]; + + // Is a group item. + if (empty($groupsByAgentId[$idAgent]) === false) { + $groupId = (int) $groupsByAgentId[$idAgent]['id']; + $groupName = $groupsByAgentId[$idAgent]['name']; + + gis_add_agent_point( + $layer['layer_name'], + io_safe_output($groupName), + $coords['stored_latitude'], + $coords['stored_longitude'], + $icon, + $icon_width, + $icon_height, + $idAgent, + $status, + 'point_group_info', + $groupId + ); + } else { + $parent = db_get_value('id_parent', 'tagente', 'id_agente', $idAgent); + + gis_add_agent_point( + $layer['layer_name'], + io_safe_output($agentName), + $coords['stored_latitude'], + $coords['stored_longitude'], + $icon, + $icon_width, + $icon_height, + $idAgent, + $status, + 'point_agent_info', + $parent + ); + } + } + } + + gis_add_parent_lines(); + + $timestampLastOperation = db_get_value_sql('SELECT UNIX_TIMESTAMP()'); + + gis_activate_select_control(); + gis_activate_ajax_refresh($layers, $timestampLastOperation); + } + + return $output; + } + + + /** + * Get description. + * + * @return string. + */ + public static function getDescription() + { + return __('GIS map'); + } + + + /** + * Get Name. + * + * @return string. + */ + public static function getName() + { + return 'GisMap'; + } + + + /** + * Get size Modal Configuration. + * + * @return array + */ + public function getSizeModalConfiguration(): array + { + $size = [ + 'width' => 500, + 'height' => 300, + ]; + + return $size; + } + + +} diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php index e6cfaaee99..d826095a50 100644 --- a/pandora_console/operation/gis_maps/render_view.php +++ b/pandora_console/operation/gis_maps/render_view.php @@ -304,23 +304,7 @@ if ($layers != false) { gis_add_parent_lines(); - switch ($config['dbtype']) { - case 'mysql': - $timestampLastOperation = db_get_value_sql('SELECT UNIX_TIMESTAMP()'); - break; - - case 'postgresql': - $timestampLastOperation = db_get_value_sql( - "SELECT ceil(date_part('epoch', CURRENT_TIMESTAMP))" - ); - break; - - case 'oracle': - $timestampLastOperation = db_get_value_sql( - "SELECT ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) FROM dual' - ); - break; - } + $timestampLastOperation = db_get_value_sql('SELECT UNIX_TIMESTAMP()'); gis_activate_select_control(); gis_activate_ajax_refresh($layers, $timestampLastOperation); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index a7df8d9764..25b7cc781d 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -2832,7 +2832,8 @@ INSERT INTO `twidget` (`id`,`class_name`,`unique_name`,`description`,`options`,` (44,'WuxWidget','wux_transaction','Agent WUX transaction','','wux_transaction.php'), (45,'WuxStatsWidget','wux_transaction_stats','WUX transaction stats','','wux_transaction_stats.php'), (46,'SecurityHardening','security_hardening','Security Hardening','','security_hardening.php'), - (47,'ServiceLevelWidget','service_level','Service Level','','service_level.php'); + (47,'ServiceLevelWidget','service_level','Service Level','','service_level.php'), + (48,'GisMap','GisMap','Gis map','','GisMap.php'); INSERT INTO `tmap` (`id`,`id_group`,`id_user`,`type`,`subtype`,`name`,`description`,`height`,`width`,`center_x`,`center_y`,`background`,`background_options`,`source_period`,`source`,`source_data`,`generation_method`,`generated`,`filter`,`id_group_map`,`refresh_time`) VALUES (1,'0','admin',0,0,'Sample dynamic map','This is a sample dynamic map.',900,900,0,0,'',0,60,0,'0',6,0,'{\"dont_show_subgroups\":0,\"node_radius\":40,\"x_offs\":\"0\",\"y_offs\":\"0\",\"z_dash\":\"1\",\"node_sep\":\"0.25\",\"rank_sep\":\"0.5\",\"mindist\":\"1\",\"kval\":\"0.3\"}',0,300); INSERT INTO `treport` (`id_report`,`id_user`,`name`,`description`,`private`,`id_group`,`custom_logo`,`header`,`first_page`,`footer`,`custom_font`,`id_template`,`id_group_edit`,`metaconsole`,`non_interactive`,`hidden`,`orientation`,`cover_page_render`,`index_render`) VALUES (1,'admin','Sample report #1','This is a sample report, just to show you some general report items.',0,0,NULL,NULL,'<p style="text-align: center;">&nbsp;</p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;"><img src="http://localhost/pandora_console//images/pandora_report_logo.png" alt="" width="800" /></p> <p style="text-align: center;">&nbsp;</p> <p style="text-align: center;"><span style="font-size: xx-large;">(_REPORT_NAME_)</span></p> <p style="text-align: center;"><span style="font-size: large;">(_DATETIME_)</span></p>',NULL,'Lato-Regular.ttf',0,0,0,0,0,'vertical',1,1); diff --git a/pandora_console/views/dashboard/listWidgets.php b/pandora_console/views/dashboard/listWidgets.php index 01767c1f9c..2c4272ddeb 100644 --- a/pandora_console/views/dashboard/listWidgets.php +++ b/pandora_console/views/dashboard/listWidgets.php @@ -71,6 +71,10 @@ foreach ($widgets as $widget) { continue; } + if ($widget['unique_name'] === 'GisMap' && (bool) $config['activate_gis'] === false) { + continue; + } + $imageWidget = '/images/widgets/'.$widget['unique_name'].'.png'; $output .= '
'; From 678972bc587a9938cf7931b938ee7545125db77b Mon Sep 17 00:00:00 2001 From: "felix.suarez" Date: Tue, 9 Jan 2024 16:01:00 -0600 Subject: [PATCH 015/150] Add monitoring types --- pandora_agents/unix/pandora_agent | 59 ++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 65e217abf7..c56ccf33aa 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -3889,7 +3889,8 @@ sub module_logger ($) { my $status = grep_logs( $module->{'name'}, $module->{'params'}, - $module->{'filter'} + $module->{'filter'}, + $module->{'type'} ); return $status; @@ -3926,20 +3927,25 @@ my $encode_sub = defined(&MIME::Base64::encode_base64) ? \&MIME::Base64::encode_ }; sub grep_logs { - my ($str_name, $str_file, $str_regex) = @_; + my ($module_name, $log_file, $reg_exp, $module_type) = @_; - if(!$str_name){ + if(!$module_name){ log_message("module_logger", "Missing module name"); return; } - if(!$str_file){ + if(!$log_file){ log_message("module_logger", "Missing file name"); return; } - if(!$str_regex){ - $str_regex = '.*'; + if(!$module_type){ + log_message("module_logger", "Missing module type"); + return; + } + + if(!$reg_exp){ + $reg_exp = '.*'; } my $idx_dir = '/tmp/'; @@ -3947,9 +3953,6 @@ sub grep_logs { my $idx_pos = 0; my $idx_size = 0; my $idx_ino = ''; - my $module_name = $str_name; - my $log_file = $str_file; - my $reg_exp = $str_regex; # Check that log file exists if (! -e $log_file) { @@ -3975,7 +3978,7 @@ sub grep_logs { return if load_idx(\$idx_pos, \$idx_ino, \$idx_file, \$idx_size) == 1; my @data = parse_log(\$idx_pos, \$idx_ino, \$idx_file, \$log_file, \$module_name, \$reg_exp, \$idx_size); - my $output = create_log($module_name, @data); + my $output = create_log($module_name, $module_type, @data); return $output; } @@ -4090,19 +4093,26 @@ sub grep_logs { } sub create_log { - my ($module_name, @data) = @_; + my ($module_name, $module_type, @data) = @_; # No data - if ($#data < 0) { + if ($#data < 0 && $module_type ne "generic_proc") { return; } # Log module my $output = "\n"; - $output .= "\n"; - $output .= "base64\n"; - $output .= "\n"; + $output .= " \n"; + + my $data_content = process_log_monitoring($module_type, @data); + + if($module_type eq "log"){ + $output .= " base64\n"; + } + + $output .= " \n"; $output .= "\n"; @@ -4111,6 +4121,23 @@ sub grep_logs { } +sub process_log_monitoring { + my ($module_type, @data) = @_; + my $output = ""; + + if ($module_type eq "log"){ + $output = &$encode_sub(join('', @data), ''); + } elsif ($module_type eq "generic_data") { + $output = scalar @data; + } elsif ($module_type eq "generic_proc"){ + $output = scalar @data > 0 ? 1 : 0; + } elsif ($module_type eq "generic_data_string" || $module_type eq "async_string"){ + $output = join('', @data); + } + + return $output; +} + ################################################################################ # TERM Handler ################################################################################ From bb2d908de724b4af9cdd3c9864b13d24e37d8727 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 17 Jan 2024 12:25:57 +0100 Subject: [PATCH 016/150] #12460 fixed deprecated log --- .../godmode/wizards/Applications.class.php | 14 ++++++++++++++ pandora_console/godmode/wizards/Custom.class.php | 14 ++++++++++++++ .../godmode/wizards/DiscoveryTaskList.class.php | 7 +++++++ pandora_console/godmode/wizards/Wizard.main.php | 2 +- pandora_console/include/api.php | 4 +++- pandora_console/include/auth/mysql.php | 2 +- pandora_console/include/functions_events.php | 3 ++- pandora_console/include/functions_ui.php | 6 +----- .../lib/TacticalView/elements/SnmpTraps.php | 12 ++++++++++-- pandora_console/operation/events/events.php | 6 +++--- 10 files changed, 56 insertions(+), 14 deletions(-) diff --git a/pandora_console/godmode/wizards/Applications.class.php b/pandora_console/godmode/wizards/Applications.class.php index 7458aea872..29fee2e73a 100644 --- a/pandora_console/godmode/wizards/Applications.class.php +++ b/pandora_console/godmode/wizards/Applications.class.php @@ -37,6 +37,20 @@ class Applications extends Wizard */ public $mode; + /** + * Task properties. + * + * @var array + */ + public $task; + + /** + * Class of styles. + * + * @var string + */ + public $class; + /** * Constructor. diff --git a/pandora_console/godmode/wizards/Custom.class.php b/pandora_console/godmode/wizards/Custom.class.php index 41a177b3e3..9ddec3d9af 100644 --- a/pandora_console/godmode/wizards/Custom.class.php +++ b/pandora_console/godmode/wizards/Custom.class.php @@ -37,6 +37,20 @@ class Custom extends Wizard */ public $mode; + /** + * Task properties. + * + * @var array + */ + public $task; + + /** + * Class of styles. + * + * @var string + */ + public $class; + /** * Constructor. diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index e831022c23..3a7628d8b9 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -47,6 +47,13 @@ ui_require_javascript_file('simTree'); class DiscoveryTaskList extends HTML { + /** + * Task properties. + * + * @var array + */ + public $task; + /** * Constructor. diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php index a286b97fca..06276cb187 100644 --- a/pandora_console/godmode/wizards/Wizard.main.php +++ b/pandora_console/godmode/wizards/Wizard.main.php @@ -517,7 +517,7 @@ class Wizard public static function printBigButtonsList($list_data) { echo '
    '; - array_map('self::printBigButtonElement', $list_data); + array_map(['Wizard', 'printBigButtonElement'], $list_data); echo '
'; } diff --git a/pandora_console/include/api.php b/pandora_console/include/api.php index b29dd06bd3..4836f98c64 100644 --- a/pandora_console/include/api.php +++ b/pandora_console/include/api.php @@ -380,5 +380,7 @@ if (session_status() !== PHP_SESSION_DISABLED) { // Could give a warning if no session file is created. Ignore. @session_destroy(); header_remove('Set-Cookie'); - setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/'); + if (isset($_COOKIE[session_name()]) === true) { + setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/'); + } } diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index 76a6458f32..0a132829bf 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -575,7 +575,7 @@ function get_user_info($user) function get_users($order='fullname', $filter=false, $fields=false) { if (is_array($order) === true) { - $filter['order'] = $order['field'].' '.$order['order']; + $filter['order'] = (string) $order['field'].' '.(string) $order['order']; } else { if ($order !== 'registered' || $order !== 'last_connect' || $order !== 'fullname') { $order = 'fullname'; diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 747e5154ce..1f7a839e31 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -6471,7 +6471,8 @@ function event_print_graph( ]; $color[] = '#82b92f'; } - } else { + } else if ((int) $num_intervals > 0) { + // We assume that if num_interval is 0, not exist events. $interval_length = (int) ($period / $num_intervals); $intervals = []; $intervals[0] = $start_utimestamp; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 4a0db88991..cbfe60d7db 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -147,11 +147,7 @@ function ui_print_truncate_text( $text_html_decoded = io_safe_output($text); $text_has_entities = $text != $text_html_decoded; - if ($text_html_decoded === null) { - $text_html_decoded = ''; - } - - if (mb_strlen($text_html_decoded, 'UTF-8') > ($numChars)) { + if (isset($text_html_decoded) === true && mb_strlen($text_html_decoded, 'UTF-8') > ($numChars)) { // '/2' because [...] is in the middle of the word. $half_length = intval(($numChars - 3) / 2); diff --git a/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php b/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php index f606893429..9e1de4d891 100644 --- a/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php +++ b/pandora_console/include/lib/TacticalView/elements/SnmpTraps.php @@ -83,7 +83,11 @@ class SnmpTraps extends Element { if ($this->isEnabled() === true) { $value = $this->valueMonitoring('snmp_trap_queue'); - $total = round($value[0]['data']); + if (isset($value[0]['data']) === true) { + $total = round($value[0]['data']); + } else { + $total = __('N/A'); + } } else { $total = __('N/A'); } @@ -109,7 +113,11 @@ class SnmpTraps extends Element { if ($this->isEnabled() === true) { $value = $this->valueMonitoring('total_trap'); - $total = round($value[0]['data']); + if (isset($value[0]['data']) === true) { + $total = round($value[0]['data']); + } else { + $total = __('N/A'); + } } else { $total = __('N/A'); } diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index c924794d6d..976012720a 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -505,7 +505,7 @@ if (is_ajax() === true) { } } - if (strlen(($tmp->server_name ?? '')) >= 10) { + if (isset($tmp->server_name) === true && strlen($tmp->server_name) >= 10) { $tmp->server_name = ui_print_truncate_text( $tmp->server_name, 10, @@ -1216,7 +1216,7 @@ if (is_ajax() === true) { if (empty($tmp) === false && $regex !== '') { $regex_validation = false; foreach (json_decode(json_encode($tmp), true) as $key => $field) { - if (preg_match('/'.$regex.'/', $field)) { + if (isset($field) === true && preg_match('/'.$regex.'/', $field)) { $regex_validation = true; } } @@ -1234,7 +1234,7 @@ if (is_ajax() === true) { $data = array_values( array_filter( - $data, + ((is_array($data) === true) ? $data : []), function ($item) { return (bool) (array) $item; } From 209b4b3e8bbb2ec6c0dc7711395fa8b58b5f8298 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 17 Jan 2024 12:41:56 +0100 Subject: [PATCH 017/150] #12460 fixed deprecated in library phpchartjs --- .../vendor/artica/phpchartjs/src/Delegate/JsonSerializable.php | 2 +- .../vendor/artica/phpchartjs/src/Options/Elements.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/vendor/artica/phpchartjs/src/Delegate/JsonSerializable.php b/pandora_console/vendor/artica/phpchartjs/src/Delegate/JsonSerializable.php index abf59aa9f6..c689aae0ac 100644 --- a/pandora_console/vendor/artica/phpchartjs/src/Delegate/JsonSerializable.php +++ b/pandora_console/vendor/artica/phpchartjs/src/Delegate/JsonSerializable.php @@ -15,7 +15,7 @@ trait JsonSerializable /** * @return array */ - public function jsonSerialize() + public function jsonSerialize():mixed { return array_map(function ($value) { if ($value instanceof JsonSerializableInterface) { diff --git a/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php b/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php index b63513bc23..4350718958 100644 --- a/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php +++ b/pandora_console/vendor/artica/phpchartjs/src/Options/Elements.php @@ -148,7 +148,7 @@ class Elements implements ArraySerializableInterface, JsonSerializable /** * @return array */ - public function jsonSerialize() + public function jsonSerialize():mixed { return $this->getArrayCopy(); } From 29207ed367a1c2383c0cc3ba0e9439bedc7e57a6 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 22 Jan 2024 12:59:11 +0100 Subject: [PATCH 018/150] #12617 add class correct colum --- pandora_console/godmode/servers/servers.build_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 23a284caf9..1589f33fc9 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -115,7 +115,7 @@ foreach ($servers as $server) { $table->cellclass[] = [ 3 => 'progress_bar', - 8 => 'table_action_buttons', + 9 => 'table_action_buttons', ]; $data[0] = ''.strip_tags($server['name']).''; From 17056e4ac33cf26abbb74d360e37bd967196f111 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 22 Jan 2024 15:30:46 +0100 Subject: [PATCH 019/150] #12460 merge with 12643 --- pandora_console/operation/events/events.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 86a499762f..a668829d49 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -1253,15 +1253,6 @@ if (is_ajax() === true) { ); } - $data = array_values( - array_filter( - ((is_array($data) === true) ? $data : []), - function ($item) { - return (bool) (array) $item; - } - ) - ); - $count = count($data); // RecordsTotal && recordsfiltered resultados totales. echo json_encode( [ From a747308b268e4d3c9c1b04b1c5f721473e6e9b04 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 22 Jan 2024 16:21:51 +0100 Subject: [PATCH 020/150] #12636 fix errors --- pandora_console/godmode/setup/os.builder.php | 6 ++-- pandora_console/godmode/setup/os.php | 8 ++++++ pandora_console/include/functions_ui.php | 30 ++++++++++++++------ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php index 6313aa3edd..4f7b77099b 100644 --- a/pandora_console/godmode/setup/os.builder.php +++ b/pandora_console/godmode/setup/os.builder.php @@ -48,7 +48,7 @@ if ($idOS > 0) { } else { $name = io_safe_input(strip_tags(trim(io_safe_output((string) get_parameter('name'))))); $description = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description')))); - $icon = get_parameter('icon', 0); + $icon = get_parameter('icon', 'os@svg.svg'); } $icon_upload = get_parameter('icon_upload', null); @@ -246,7 +246,7 @@ $iconData[] = html_print_select( 'icon', $icon, 'show_icon_OS();', - __('None'), + '', 0, true ); @@ -356,6 +356,8 @@ function get_list_os_icons_dir() } } + $return['os@svg.svg'] = __('None'); + return $return; } diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php index dcfe95ecdb..403232c868 100644 --- a/pandora_console/godmode/setup/os.php +++ b/pandora_console/godmode/setup/os.php @@ -88,6 +88,14 @@ switch ($tab) { break; case 'manage_os': + $id_os = get_parameter('id_os', ''); + if ($id_os !== '') { + $headerTitle = __('Edit OS'); + } else { + $headerTitle = __('Create OS'); + } + break; + case 'list': if ($action === 'edit') { $headerTitle = __('Edit OS'); diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d6078c56a7..f36b024ac1 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -969,15 +969,27 @@ function ui_print_os_icon( $options['title'] = $os_name; } - $output = html_print_image( - 'images/'.$subfolder.'/'.$icon, - true, - $options, - false, - $relative, - $no_in_meta, - true - ); + if ($icon === '.png') { + $output = html_print_image( + 'images/os@svg.svg', + true, + $options, + false, + $relative, + $no_in_meta, + true + ); + } else { + $output = html_print_image( + 'images/'.$subfolder.'/'.$icon, + true, + $options, + false, + $relative, + $no_in_meta, + true + ); + } } } else { // $output = "" . $os_name . ""; From 95f8519d5d3cab5b34e92b362b1820eb7f293575 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 22 Jan 2024 17:22:23 +0100 Subject: [PATCH 021/150] #12687 Added import/export prd --- pandora_console/godmode/menu.php | 3 + .../resources/resources_export_import.php | 160 ++++++++++ .../include/ajax/resources.ajax.php | 74 +++++ pandora_console/include/class/Prd.class.php | 281 ++++++++++++++++++ 4 files changed, 518 insertions(+) create mode 100644 pandora_console/godmode/resources/resources_export_import.php create mode 100644 pandora_console/include/ajax/resources.ajax.php create mode 100644 pandora_console/include/class/Prd.class.php diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index a77e63b95b..4f116502e3 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -208,6 +208,9 @@ if ($access_console_node === true) { $sub['godmode/setup/os']['text'] = __('Operating systems'); $sub['godmode/setup/os']['id'] = 'edit_OS'; + + $sub['godmode/resources/resources_export_import']['text'] = __('Resources export/import'); + $sub['godmode/resources/resources_export_import']['id'] = 'resources_export_import'; } if ((bool) check_acl($config['id_user'], 0, 'AW') === true) { diff --git a/pandora_console/godmode/resources/resources_export_import.php b/pandora_console/godmode/resources/resources_export_import.php new file mode 100644 index 0000000000..569c854278 --- /dev/null +++ b/pandora_console/godmode/resources/resources_export_import.php @@ -0,0 +1,160 @@ +id = 'import_data_table'; +$table->class = 'databox filter-table-adv'; +$table->width = '100%'; +$table->data = []; +$table->style = []; +$table->size = []; + +$table->data[0][0] = html_print_label_input_block( + __('Resource importation'), + html_print_input_file('resource_import', true) +); + +$table->data[0][1] = html_print_label_input_block( + __('Group filter'), + html_print_select_groups(false, 'AW', true, 'group', '', '', __('All'), 0, true) +); + +html_print_table($table); + +$table = new stdClass(); +$table->id = 'export_data_table'; +$table->class = 'databox filter-table-adv'; +$table->width = '100%'; +$table->data = []; +$table->style = []; +$table->size = []; +$table->size[0] = '50%'; +$table->size[1] = '50%'; + +// Instance of the prd class. +$prd = new Prd(); + +$export_type = $prd->getTypesPrd(); + +$table->data[0][0] = html_print_label_input_block( + __('Export type'), + html_print_select( + $export_type, + 'export_type', + '', + '', + __('None'), + 0, + true, + false, + true, + 'w40p' + ) +); + +$table->data[1][0] = ''; + +$table->data[2][0] = html_print_button( + __('Export'), + 'export_button', + false, + '', + ['class' => 'flex_justify invisible_important'], + true +); + +html_print_table($table); + +?> + \ No newline at end of file diff --git a/pandora_console/include/ajax/resources.ajax.php b/pandora_console/include/ajax/resources.ajax.php new file mode 100644 index 0000000000..5c6c8ed02d --- /dev/null +++ b/pandora_console/include/ajax/resources.ajax.php @@ -0,0 +1,74 @@ +getOnePrdData($type); + if (empty($check) === false) { + switch ($type) { + case 'visual_console': + $result = html_print_label_input_block( + __('Visual console'), + io_safe_output( + html_print_select_from_sql( + 'SELECT id, name FROM tlayout', + 'select_value', + '', + '', + '', + 0, + true, + false, + true, + false, + false, + false, + GENERIC_SIZE_TEXT, + 'w40p', + ), + ) + ); + break; + + default: + // TODO. + break; + } + } + + echo $result; + return; + } + + if ($exportPrd === true) { + $type = (string) get_parameter('type', ''); + $value = (int) get_parameter('value', 0); + $name = (string) get_parameter('name', ''); + + $prd->exportPrd($type, $value, $name); + } +} diff --git a/pandora_console/include/class/Prd.class.php b/pandora_console/include/class/Prd.class.php new file mode 100644 index 0000000000..faf4a13c28 --- /dev/null +++ b/pandora_console/include/class/Prd.class.php @@ -0,0 +1,281 @@ +prdData = [ + 'visual_console' => [ + 'label' => __('Visual console'), + 'items' => [ + 'table' => 'tlayout', + 'value' => 'id', + 'show' => 'name', + ], + 'data' => [ + [ + 'table' => 'tlayout', + 'ref' => 'id', + ], + [ + 'table' => 'tlayout_data', + 'ref' => 'id_layout', + ], + ], + ], + ]; + + $this->columnRefs = [ + 'tlayout_data' => [ + 'id_agent' => [ + 'table' => 'tagente', + 'id' => 'id_agente', + 'column' => 'nombre', + ], + 'id_agente_modulo' => [ + 'table' => 'tagente_modulo', + 'id' => 'id_agente_modulo', + 'column' => 'nombre', + 'join' => [ + 'id_agente' => [ + 'table' => 'tagente', + 'id' => 'id_agente', + 'column' => 'nombre', + ], + ], + ], + ], + ]; + + $this->jsonRefs = [ + 'twidget_dashboard' => [ + 'options' => [ + 'agent' => [ + 'array' => false, + 'table' => 'tagente', + 'id' => 'id_agente', + 'column' => 'nombre', + ], + 'module' => [ + 'array' => false, + 'table' => 'tagente_modulo', + 'id' => 'id_agente_modulo', + 'column' => 'nombre', + 'join' => [ + 'id_agente' => [ + 'table' => 'tagente', + 'id' => 'id_agente', + 'column' => 'nombre', + ], + ], + ], + ], + ], + ]; + + $this->message = ''; + } + + + /** + * Generates a JSON error. + * + * @param string $msg Error message. + * + * @return void + */ + public function error(string $msg) + { + echo json_encode( + ['error' => $msg] + ); + } + + + /** + * Get $prdData. + * + * @return array + */ + public function getPrdData(): array + { + return $this->prdData; + } + + + /** + * Get one $prdData. + * + * @param string $item Item to be searched in array. + * + * @return boolean|array + */ + public function getOnePrdData(string $item): bool|array + { + if (isset($this->prdData[$item]) === false) { + return false; + } + + return $this->prdData[$item]; + } + + + /** + * Get $columnRefs. + * + * @return array + */ + public function getColumnRefs(): array + { + return $this->columnRefs; + } + + + /** + * Get one $columnRefs. + * + * @param string $item Item to be searched in array. + * + * @return boolean|array + */ + public function getOneColumnRefs(string $item): bool|array + { + if (isset($this->columnRefs[$item]) === false) { + return false; + } + + return $this->columnRefs[$item]; + } + + + /** + * Get $jsonRefs. + * + * @return array + */ + public function getJsonRefs(): array + { + return $this->jsonRefs; + } + + + /** + * Get types of prd. + * + * @return array + */ + public function getTypesPrd(): array + { + $result = []; + foreach ($this->prdData as $key => $value) { + $result[$key] = $value['label']; + } + + return $result; + } + + + /** + * Export prd. + * + * @return array + */ + public function exportPrd(string $type, $value, $name) :array + { + $result = []; + + $prd_data = $this->getOnePrdData($type); + if (empty($prd_data) === false) { + $result['prd_data'] = [ + 'type' => $type, + 'name' => $name, + ]; + + foreach ($prd_data['data'] as $key => $element) { + $sql = sprintf( + 'SELECT * FROM %s WHERE %s = %s', + $element['table'], + $element['ref'], + $value, + ); + + $test = db_get_all_rows_sql($sql); + + // $result[$element['table']] + // hd($test, true); + } + } + + return $result; + + } + + +} From 7f604f0c8dccbb4795fcfaeae9e33af860dc4b42 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Tue, 23 Jan 2024 17:47:26 +0100 Subject: [PATCH 022/150] #12460 fixed deprecated --- pandora_console/include/graphs/functions_gd.php | 7 +++++++ .../include/lib/ClusterViewer/ClusterWizard.php | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pandora_console/include/graphs/functions_gd.php b/pandora_console/include/graphs/functions_gd.php index e32e76222f..b34bed47f7 100755 --- a/pandora_console/include/graphs/functions_gd.php +++ b/pandora_console/include/graphs/functions_gd.php @@ -301,6 +301,13 @@ function gd_progress_bubble($width, $height, $progress, $title, $font, $out_of_l function ImageRectangleWithRoundedCorners(&$im, $x1, $y1, $x2, $y2, $radius, $color) { + $x1 = (int) $x1; + $y1 = (int) $y1; + $x2 = (int) $x2; + $y2 = (int) $y2; + $radius = (int) $radius; + $color = (int) $color; + // Draw rectangle without corners imagefilledrectangle($im, ($x1 + $radius), $y1, ($x2 - $radius), $y2, $color); imagefilledrectangle($im, $x1, ($y1 + $radius), $x2, ($y2 - $radius), $color); diff --git a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php index 3c4c4eb293..0c67cc64f9 100644 --- a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php +++ b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php @@ -113,6 +113,13 @@ class ClusterWizard extends \HTML */ private $agent; + /** + * Id of clusters. + * + * @var integer + */ + public $id; + /** * Builds a Cluster Wizard. From 401b1973bed7bde5e06a680d2d1973f1bb4184d4 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 24 Jan 2024 12:15:16 +0100 Subject: [PATCH 023/150] #12687 Added import/export prd 2 --- .../resources/resources_export_import.php | 28 +- .../include/ajax/resources.ajax.php | 94 ++++-- pandora_console/include/class/Prd.class.php | 318 ++++++++++++++++-- pandora_console/include/constants.php | 3 + 4 files changed, 381 insertions(+), 62 deletions(-) diff --git a/pandora_console/godmode/resources/resources_export_import.php b/pandora_console/godmode/resources/resources_export_import.php index 569c854278..146784f2e4 100644 --- a/pandora_console/godmode/resources/resources_export_import.php +++ b/pandora_console/godmode/resources/resources_export_import.php @@ -114,6 +114,7 @@ html_print_table($table); $("#button-export_button").addClass("invisible_important"); $("#export_data_table-1-0").html(''); } else { + $("#export_data_table-1-0").html(''); $.ajax({ type: "GET", url: "ajax.php", @@ -137,10 +138,18 @@ html_print_table($table); $("#button-export_button").click(function(e) { const value = $("#select_value").val(); if (value !== '0') { + //Show dialog. + confirmDialog({ + title: "", + message: "", + hideCancelButton: true + }, + "downloadDialog" + ); + $.ajax({ type: "GET", url: "ajax.php", - dataType: "html", data: { page: 'include/ajax/resources.ajax', exportPrd: 1, @@ -149,7 +158,24 @@ html_print_table($table); name: $("#select_value").text(), }, success: function(data) { + let a = document.createElement('a'); + const url = '' + data; + a.href = url; + a.download = data; + a.click(); + setTimeout(() => { + $.ajax({ + type: "DELETE", + url: "ajax.php", + data: { + page: 'include/ajax/resources.ajax', + deleteFile: 1, + filename: data, + }, + }); + $("#confirm_downloadDialog").dialog("close"); + }, 3000); }, error: function(data) { console.error("Fatal error in AJAX call to interpreter order", data) diff --git a/pandora_console/include/ajax/resources.ajax.php b/pandora_console/include/ajax/resources.ajax.php index 5c6c8ed02d..379a499407 100644 --- a/pandora_console/include/ajax/resources.ajax.php +++ b/pandora_console/include/ajax/resources.ajax.php @@ -20,6 +20,7 @@ if ((bool) is_ajax() === true) { $getResource = (bool) get_parameter('getResource', false); $exportPrd = (bool) get_parameter('exportPrd', false); + $deleteFile = (bool) get_parameter('deleteFile', false); $prd = new Prd(); @@ -27,37 +28,34 @@ if ((bool) is_ajax() === true) { $type = (string) get_parameter('type', ''); $result = false; - $check = $prd->getOnePrdData($type); - if (empty($check) === false) { - switch ($type) { - case 'visual_console': - $result = html_print_label_input_block( - __('Visual console'), - io_safe_output( - html_print_select_from_sql( - 'SELECT id, name FROM tlayout', - 'select_value', - '', - '', - '', - 0, - true, - false, - true, - false, - false, - false, - GENERIC_SIZE_TEXT, - 'w40p', - ), - ) - ); - break; - - default: - // TODO. - break; - } + $data = $prd->getOnePrdData($type); + if (empty($data) === false) { + $sql = sprintf( + 'SELECT %s FROM %s', + reset($data['items']['value']).', '.reset($data['items']['show']), + $data['items']['table'] + ); + $result = html_print_label_input_block( + $data['label'], + io_safe_output( + html_print_select_from_sql( + $sql, + 'select_value', + '', + '', + '', + 0, + true, + false, + true, + false, + false, + false, + GENERIC_SIZE_TEXT, + 'w40p', + ), + ) + ); } echo $result; @@ -69,6 +67,38 @@ if ((bool) is_ajax() === true) { $value = (int) get_parameter('value', 0); $name = (string) get_parameter('name', ''); - $prd->exportPrd($type, $value, $name); + $data = $prd->exportPrd($type, $value, $name); + + $return = ''; + + if (empty($data) === false) { + $filename = $type.'-'.date('Ymd').'-'.date('His').'.prd'; + $file = $config['attachment_store'].'/'.$filename; + + $file_pointer = fopen($file, 'a'); + if ($file_pointer !== false) { + $write = fwrite($file_pointer, $data); + + if ($write === false) { + $return = -2; + } else { + $return = $filename; + } + + fclose($file_pointer); + } else { + $return = -1; + } + } + + echo $return; + + return; + } + + if ($deleteFile === true) { + $filename = (string) get_parameter('filename', ''); + + unlink($config['attachment_store'].'/'.$filename); } } diff --git a/pandora_console/include/class/Prd.class.php b/pandora_console/include/class/Prd.class.php index faf4a13c28..c115b639a2 100644 --- a/pandora_console/include/class/Prd.class.php +++ b/pandora_console/include/class/Prd.class.php @@ -76,17 +76,219 @@ class Prd 'label' => __('Visual console'), 'items' => [ 'table' => 'tlayout', - 'value' => 'id', - 'show' => 'name', - ], - 'data' => [ - [ - 'table' => 'tlayout', - 'ref' => 'id', + 'value' => ['id'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'tlayout_data', + 'ref' => ['id_layout'], + 'value' => ['id'], + ], ], - [ - 'table' => 'tlayout_data', - 'ref' => 'id_layout', + ], + ], + 'custom_report' => [ + 'label' => __('Custom report'), + 'items' => [ + 'table' => 'treport', + 'value' => ['id_report'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'treport_content', + 'ref' => ['id_report'], + 'value' => ['id_rc'], + 'data' => [ + [ + 'table' => 'treport_content_item', + 'ref' => ['id_report_content'], + 'value' => ['id'], + ], + [ + 'table' => 'treport_content_sla_combined', + 'ref' => ['id_report_content'], + 'value' => ['id'], + ], + ], + ], + ], + ], + ], + 'policy' => [ + 'label' => __('Policy'), + 'items' => [ + 'table' => 'tpolicies', + 'value' => ['id'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'tpolicy_agents', + 'ref' => ['id_policy'], + 'value' => ['id'], + ], + [ + 'table' => 'tpolicy_alerts', + 'ref' => ['id_policy'], + 'value' => ['id'], + 'data' => [ + [ + 'table' => 'tpolicy_alerts_actions', + 'ref' => ['id_policy_alert'], + 'value' => ['id'], + ], + ], + ], + [ + 'table' => 'tpolicy_collections', + 'ref' => ['id_policy'], + 'value' => ['id'], + ], + [ + 'table' => 'tpolicy_group_agents', + 'ref' => ['id_policy'], + 'value' => ['id'], + ], + [ + 'table' => 'tpolicy_groups', + 'ref' => ['id_policy'], + 'value' => ['id'], + ], + [ + 'table' => 'tpolicy_modules', + 'ref' => ['id_policy'], + 'value' => ['id'], + 'data' => [ + [ + 'table' => 'ttag_policy_module', + 'ref' => ['id_policy_module'], + 'value' => [ + 'id_tag', + 'id_policy_module', + ], + ], + [ + 'table' => 'tpolicy_modules_synth', + 'ref' => ['id_agent_module_target'], + 'value' => ['id'], + ], + ], + ], + [ + 'table' => 'tpolicy_modules_inventory', + 'ref' => ['id_policy'], + 'value' => ['id'], + ], + [ + 'table' => 'tpolicy_plugins', + 'ref' => ['id_policy'], + 'value' => ['id'], + ], + ], + ], + ], + 'service' => [ + 'label' => __('Service'), + 'items' => [ + 'table' => 'tservice', + 'value' => ['id'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'tservice_element', + 'ref' => ['id_service'], + 'value' => ['id'], + ], + ], + ], + ], + 'network_map' => [ + 'label' => __('Network map'), + 'items' => [ + 'table' => 'tmap', + 'value' => ['id'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'titem', + 'ref' => ['id_map'], + 'value' => ['id'], + ], + [ + 'table' => 'trel_item', + 'ref' => ['id_map'], + 'value' => ['id'], + ], + ], + ], + ], + 'gis_map' => [ + 'label' => __('GIS map'), + 'items' => [ + 'table' => 'tgis_map', + 'value' => ['id_tgis_map'], + 'show' => ['map_name'], + 'data' => [ + [ + 'table' => 'tgis_map_layer', + 'ref' => ['tgis_map_id_tgis_map'], + 'value' => ['id_tmap_layer'], + 'data' => [ + [ + 'table' => 'tgis_map_layer_groups', + 'ref' => ['layer_id'], + 'value' => [ + 'layer_id', + 'group_id', + ], + ], + [ + 'table' => 'tgis_map_layer_has_tagente', + 'ref' => ['tgis_map_layer_id_tmap_layer'], + 'value' => [ + 'tgis_map_layer_id_tmap_layer', + 'tagente_id_agente', + ], + ], + ], + ], + [ + 'table' => 'tgis_map_has_tgis_map_con', + 'ref' => ['tgis_map_id_tgis_map'], + 'value' => [ + 'tgis_map_id_tgis_map', + 'tgis_map_con_id_tmap_con', + ], + ], + ], + ], + ], + 'custom_graph' => [ + 'label' => __('Custom graph'), + 'items' => [ + 'table' => 'tgraph', + 'value' => ['id_graph'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'tgraph_source', + 'ref' => ['id_graph'], + 'value' => ['id_gs'], + ], + ], + ], + ], + 'dashboard' => [ + 'label' => __('Dashboard'), + 'items' => [ + 'table' => 'tdashboard', + 'value' => ['id'], + 'show' => ['name'], + 'data' => [ + [ + 'table' => 'twidget_dashboard', + 'ref' => ['id_dashboard'], + 'value' => ['id'], + ], ], ], ], @@ -243,38 +445,96 @@ class Prd /** - * Export prd. + * Converts a resource into a string. * - * @return array + * @param string $type Item type. + * @param mixed $id Item value. + * @param string $name Item name. + * + * @return string */ - public function exportPrd(string $type, $value, $name) :array + public function exportPrd(string $type, mixed $id, string $name) :string { - $result = []; + $result = ''; $prd_data = $this->getOnePrdData($type); if (empty($prd_data) === false) { - $result['prd_data'] = [ - 'type' => $type, - 'name' => $name, - ]; + $result .= '[prd_data]'.LINE_BREAK.LINE_BREAK; + $result .= 'type="'.$type.'"'.LINE_BREAK; + $result .= 'name="'.$name.'"'.LINE_BREAK.LINE_BREAK; - foreach ($prd_data['data'] as $key => $element) { - $sql = sprintf( - 'SELECT * FROM %s WHERE %s = %s', - $element['table'], - $element['ref'], - $value, - ); + $result .= '['.$prd_data['items']['table'].']'.LINE_BREAK.LINE_BREAK; - $test = db_get_all_rows_sql($sql); + $sql = sprintf( + 'SELECT * FROM %s WHERE %s = %s', + $prd_data['items']['table'], + reset($prd_data['items']['value']), + $id, + ); - // $result[$element['table']] - // hd($test, true); + $row = db_get_row_sql($sql); + $primary_key = $row[reset($prd_data['items']['value'])]; + foreach ($row as $column => $value) { + $result .= $column.'['.$primary_key.']="'.$value.'"'.LINE_BREAK; + } + + $result .= LINE_BREAK; + + $result .= $this->recursiveExport($prd_data['items']['data'], $id); + } + + return $result; + } + + + /** + * Recursive function to traverse all data + * + * @param mixed $data Data. + * @param mixed $id Id value for search. + * + * @return string + */ + private function recursiveExport($data, $id): string + { + $result = ''; + + foreach ($data as $key => $element) { + $result .= '['.$element['table'].']'.LINE_BREAK.LINE_BREAK; + $sql = sprintf( + 'SELECT * FROM %s WHERE %s = %s', + $element['table'], + reset($element['ref']), + $id, + ); + + $rows = db_get_all_rows_sql($sql); + foreach ($rows as $row) { + if (count($element['value']) > 1) { + $primary_key = ''; + foreach ($element['value'] as $value) { + $primary_key .= $row[$value].'-'; + } + + $primary_key = substr($primary_key, 0, -1); + hd($primary_key, true); + } else { + $primary_key = $row[reset($element['value'])]; + } + + foreach ($row as $column => $value) { + $result .= $column.'['.$primary_key.']="'.$value.'"'.LINE_BREAK; + } + + $result .= LINE_BREAK; + } + + if (isset($element['data']) === true) { + $result .= $this->recursiveExport($element['data'], $primary_key); } } return $result; - } diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index b2ce8d88b4..422c2dcc95 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -906,3 +906,6 @@ define('DEMO_SERVICE', 6); define('DEMO_DASHBOARD', 7); define('DEMO_VISUAL_CONSOLE', 8); define('DEMO_PLUGIN', 9); + +// Export resources. +define('LINE_BREAK', "\n"); From fd8d233cf88cf2195f1242bdd3f4528de07527c4 Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Wed, 24 Jan 2024 13:28:43 +0100 Subject: [PATCH 024/150] #12460 fixed deprecated --- pandora_console/godmode/agentes/module_manager_editor.php | 2 +- .../godmode/agentes/module_manager_editor_plugin.php | 7 ++++++- pandora_console/godmode/wizards/HostDevices.class.php | 2 +- pandora_console/include/class/Diagnostics.class.php | 7 +++++++ pandora_console/include/class/NetworkMap.class.php | 2 +- pandora_console/include/functions.php | 6 +++++- pandora_console/include/functions_io.php | 4 +--- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 130f31c79d..543d241fc9 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -150,7 +150,7 @@ if (is_ajax()) { $component = db_get_row('tlocal_component', 'id', $id_component); foreach ($component as $index => $element) { $component[$index] = html_entity_decode( - $element, + (isset($element) === true) ? $element : '', ENT_QUOTES, 'UTF-8' ); diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php index 9b5d98c27d..abbbc4d9c1 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php +++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php @@ -60,7 +60,12 @@ $data[1] = html_print_select_from_sql( $disabledBecauseInPolicy ); // Store the macros in base64 into a hidden control to move between pages -$data[1] .= html_print_input_hidden('macros', base64_encode($macros), true); +$data[1] .= html_print_input_hidden( + 'macros', + (isset($macros) === true) ? base64_encode($macros) : '', + true +); + $table_simple->colspan['plugin_1'][2] = 2; if (!empty($id_plugin)) { diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php index 4f0043f038..08a47b12f8 100755 --- a/pandora_console/godmode/wizards/HostDevices.class.php +++ b/pandora_console/godmode/wizards/HostDevices.class.php @@ -1109,7 +1109,7 @@ class HostDevices extends Wizard 'return' => true, 'selected' => explode( ',', - $this->task['id_network_profile'] + (isset($this->task['id_network_profile']) === true) ? $this->task['id_network_profile'] : '' ), 'nothing_value' => 0, 'nothing' => __('None'), diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index 9d4a3b2901..898d9f5af9 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -54,6 +54,13 @@ class Diagnostics extends Wizard */ public $pdf; + /** + * Product name. + * + * @var string + */ + public $product_name; + /** * Constructor. diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php index 184e830e9c..3a8b947926 100644 --- a/pandora_console/include/class/NetworkMap.class.php +++ b/pandora_console/include/class/NetworkMap.class.php @@ -706,7 +706,7 @@ class NetworkMap */ public function setNodes($nodes) { - $this->nodes = $nodes; + $this->nodes = (array) $nodes; } diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 7c1638f8fa..421d3e7725 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2925,6 +2925,10 @@ function delete_dir($dir) */ function is_image_data($data) { + if (isset($data) === false) { + return false; + } + return (substr($data, 0, 10) == 'data:image'); } @@ -2947,7 +2951,7 @@ function is_snapshot_data($data) */ function is_text_to_black_string($data) { - if (is_image_data($data)) { + if (isset($data) === false || is_image_data($data)) { return false; } diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php index 445504b11c..dd8dd1f6dc 100755 --- a/pandora_console/include/functions_io.php +++ b/pandora_console/include/functions_io.php @@ -561,10 +561,8 @@ function io_output_password($password, $wrappedBy='') ] ); - $output = ($plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext; - // If password already decrypt return same password. - $output = (empty($plaintext) === true) ? $password : $plaintext; + $output = (empty($plaintext) === true || $plaintext === ENTERPRISE_NOT_HOOK) ? $password : $plaintext; return sprintf( '%s%s%s', From 22598b4bc26f08bdba5e5b019da31a99081b156a Mon Sep 17 00:00:00 2001 From: Daniel Cebrian Date: Mon, 29 Jan 2024 17:31:19 +0100 Subject: [PATCH 025/150] #12460 fixed deprecated --- pandora_console/include/ajax/heatmap.ajax.php | 1 + .../include/class/OrderInterpreter.class.php | 7 +++++++ .../include/functions_forecast.php | 2 +- .../include/lib/Dashboard/Manager.php | 14 +++++++++++++ .../include/lib/Dashboard/Widget.php | 21 +++++++++++++++++++ .../lib/Dashboard/Widgets/AgentHive.php | 2 +- .../lib/Dashboard/Widgets/DataMatrix.php | 7 +++++++ .../lib/Dashboard/Widgets/ModulesByStatus.php | 7 +++++++ .../lib/Dashboard/Widgets/agent_module.php | 2 +- .../lib/Dashboard/Widgets/events_list.php | 14 +++++++++++++ .../include/lib/Dashboard/Widgets/heatmap.php | 6 +++--- pandora_console/views/dashboard/cell.php | 7 ++++++- 12 files changed, 83 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/ajax/heatmap.ajax.php b/pandora_console/include/ajax/heatmap.ajax.php index 71020ad67f..83c7226388 100644 --- a/pandora_console/include/ajax/heatmap.ajax.php +++ b/pandora_console/include/ajax/heatmap.ajax.php @@ -250,6 +250,7 @@ if (is_ajax() === true) { if ($getInfo === true) { enterprise_include_once('include/functions_agents.php'); + include_once $config['homedir'].'/include/functions_graph.php'; $id = get_parameter('id', 0); $id_server = get_parameter('id_server', 0); if (empty($id_server) === false) { diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php index d41fbbf837..b96ad6e510 100644 --- a/pandora_console/include/class/OrderInterpreter.class.php +++ b/pandora_console/include/class/OrderInterpreter.class.php @@ -52,6 +52,13 @@ class OrderInterpreter extends Wizard */ public $ajaxController; + /** + * Pages menu + * + * @var array + */ + public $pages_menu; + /** * Generates a JSON error. diff --git a/pandora_console/include/functions_forecast.php b/pandora_console/include/functions_forecast.php index 540bbf7174..1f0d1e59d9 100644 --- a/pandora_console/include/functions_forecast.php +++ b/pandora_console/include/functions_forecast.php @@ -100,7 +100,7 @@ function forecast_projection_graph( $data[0] = ''; $data[1] = $cont; - $data[2] = date($config['date_format'], $row[0]); + $data[2] = date($config['date_format'], (int) $row[0]); $data[3] = $row[0]; $data[4] = $row[1]; $data[5] = ($row[0] * $row[1]); diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php index 670487081d..c5b75dcb4d 100644 --- a/pandora_console/include/lib/Dashboard/Manager.php +++ b/pandora_console/include/lib/Dashboard/Manager.php @@ -167,6 +167,20 @@ class Manager implements PublicLogin */ private $duplicateCellId; + /** + * Url + * + * @var string + */ + public $url; + + /** + * Widget + * + * @var Widget + */ + public $cWidget; + /** * Allowed methods to be called using AJAX request. * diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php index 5746bdb142..f8079571c4 100644 --- a/pandora_console/include/lib/Dashboard/Widget.php +++ b/pandora_console/include/lib/Dashboard/Widget.php @@ -65,6 +65,27 @@ class Widget */ private $dateTo; + /** + * Data cell + * + * @var array + */ + public $dataCell; + + /** + * Overflow scrollbar. + * + * @var boolean + */ + public $overflow_scrollbars; + + /** + * Position + * + * @var array + */ + public $position; + /** * Contructor widget. diff --git a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php index 0e426ed08a..b393f786ec 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php +++ b/pandora_console/include/lib/Dashboard/Widgets/AgentHive.php @@ -226,7 +226,7 @@ class AgentHive extends Widget 'name' => 'groups[]', 'returnAllGroup' => false, 'privilege' => 'AR', - 'selected' => explode(',', $values['groups'][0]), + 'selected' => (isset($values['groups'][0]) === true) ? explode(',', $values['groups'][0]) : [], 'return' => true, 'multiple' => true, 'required' => true, diff --git a/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php b/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php index 770a3152fe..337f33364e 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php +++ b/pandora_console/include/lib/Dashboard/Widgets/DataMatrix.php @@ -117,6 +117,13 @@ class DataMatrix extends Widget */ protected $cellId; + /** + * Position + * + * @var array + */ + public $size; + /** * Construct. diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php index e490135734..767410c25b 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php +++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php @@ -115,6 +115,13 @@ class ModulesByStatus extends Widget */ protected $cellId; + /** + * Size + * + * @var array + */ + public $size; + /** * Construct. diff --git a/pandora_console/include/lib/Dashboard/Widgets/agent_module.php b/pandora_console/include/lib/Dashboard/Widgets/agent_module.php index 56ab854375..f5c4ff5a96 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/agent_module.php +++ b/pandora_console/include/lib/Dashboard/Widgets/agent_module.php @@ -355,7 +355,7 @@ class AgentModuleWidget extends Widget */ public function getIdCacheAgent($id_agents) { - $target_agents = explode(',', $id_agents); + $target_agents = explode(',', ($id_agents ?? '')); $cache_id_agents = []; foreach ($target_agents as $agent_id) { if (str_contains($agent_id, '|') === false) { diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php index a50cab93e4..beb7a92b5f 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php +++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php @@ -111,6 +111,20 @@ class EventsListWidget extends Widget */ protected $publicLink; + /** + * Overflow scrollbar. + * + * @var boolean + */ + public $overflow_scrollbars; + + /** + * Position + * + * @var array + */ + public $position; + /** * Construct. diff --git a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php index e199a80ad8..ada804bedb 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/heatmap.php +++ b/pandora_console/include/lib/Dashboard/Widgets/heatmap.php @@ -271,7 +271,7 @@ class HeatmapWidget extends Widget 'name' => 'groups[]', 'returnAllGroup' => true, 'privilege' => 'AR', - 'selected' => explode(',', $values['groups'][0]), + 'selected' => (isset($values['groups'][0]) === true) ? explode(',', $values['groups'][0]) : [], 'return' => true, 'multiple' => true, ], @@ -305,7 +305,7 @@ class HeatmapWidget extends Widget 'type' => 'select', 'fields' => $tags, 'name' => 'tags[]', - 'selected' => explode(',', $values['tags'][0]), + 'selected' => (isset($values['tags'][0]) === true) ? explode(',', $values['tags'][0]) : [], 'return' => true, 'multiple' => true, ], @@ -332,7 +332,7 @@ class HeatmapWidget extends Widget 'type' => 'select', 'fields' => $module_groups, 'name' => 'module_groups[]', - 'selected' => explode(',', $values['module_groups'][0]), + 'selected' => (isset($values['module_groups'][0]) === true) ? explode(',', $values['module_groups'][0]) : [], 'return' => true, 'multiple' => true, 'nothing' => __('Not assigned'), diff --git a/pandora_console/views/dashboard/cell.php b/pandora_console/views/dashboard/cell.php index 5b4e7f311e..910e7a114b 100644 --- a/pandora_console/views/dashboard/cell.php +++ b/pandora_console/views/dashboard/cell.php @@ -34,7 +34,12 @@ if ($redraw === false) { $output .= '
'; $output .= '
'; -$options = json_decode($cellData['options'], true); +if (isset($cellData['options']) === true) { + $options = json_decode($cellData['options'], true); +} else { + $options = []; +} + if ($cellData['id_widget'] !== '0') { $output .= $options['title']; } else { From e07d89883f1ba7d667c7370bf2228c80d8e75ee9 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 29 Jan 2024 17:38:01 +0100 Subject: [PATCH 026/150] #12687 Added import/export prd 3 --- .../resources/resources_export_import.php | 36 +- pandora_console/include/class/Prd.class.php | 1278 ++++++++++++++++- 2 files changed, 1275 insertions(+), 39 deletions(-) diff --git a/pandora_console/godmode/resources/resources_export_import.php b/pandora_console/godmode/resources/resources_export_import.php index 146784f2e4..d1dcfc2123 100644 --- a/pandora_console/godmode/resources/resources_export_import.php +++ b/pandora_console/godmode/resources/resources_export_import.php @@ -43,6 +43,21 @@ if (check_acl($config['id_user'], 0, 'PM') === false) { require_once $config['homedir'].'/include/class/Prd.class.php'; +// Instance of the prd class. +$prd = new Prd(); + +$msg = ''; +if (isset($_FILES['resource_import']) === true) { + $data = parse_ini_file($_FILES['resource_import']['tmp_name'], true); + if ($data !== false) { + $msg[] = $prd->importPrd($data); + } else { + $msg[] = 'Esto es una prueba'; + } +} + +$msg = json_encode($msg); + $table = new stdClass(); $table->id = 'import_data_table'; $table->class = 'databox filter-table-adv'; @@ -56,12 +71,17 @@ $table->data[0][0] = html_print_label_input_block( html_print_input_file('resource_import', true) ); -$table->data[0][1] = html_print_label_input_block( - __('Group filter'), - html_print_select_groups(false, 'AW', true, 'group', '', '', __('All'), 0, true) +$table->data[0][0] .= html_print_submit_button( + __('Import resource'), + 'upload', + false, + [], + true ); +echo '
'; html_print_table($table); +echo '
'; $table = new stdClass(); $table->id = 'export_data_table'; @@ -73,9 +93,6 @@ $table->size = []; $table->size[0] = '50%'; $table->size[1] = '50%'; -// Instance of the prd class. -$prd = new Prd(); - $export_type = $prd->getTypesPrd(); $table->data[0][0] = html_print_label_input_block( @@ -109,6 +126,12 @@ html_print_table($table); ?>