--- config.c.orig 2009-05-15 16:02:47.000000000 +0200 +++ config.c 2010-08-31 15:40:37.000000000 +0200 @@ -65,6 +65,7 @@ #define DISPLAY_HOSTDEPENDENCIES 11 #define DISPLAY_HOSTESCALATIONS 12 #define DISPLAY_SERVICEGROUPS 15 +#define DISPLAY_COMMAND_EXPANSION 16211 void document_header(int); void document_footer(void); @@ -84,6 +85,7 @@ void display_serviceescalations(void); void display_hostdependencies(void); void display_hostescalations(void); +void display_command_expansion(void); void unauthorized_message(void); @@ -91,9 +93,24 @@ authdata current_authdata; int display_type=DISPLAY_NONE; +char to_expand[MAX_COMMAND_BUFFER]; +char hashed_color[8]; int embedded=FALSE; +void print_expand_input(int type){ + char *seldesc=""; + + if (type==DISPLAY_COMMAND_EXPANSION) return; /* Has its own form, w/ larger */ + else if (type==DISPLAY_SERVICES){ seldesc=" Services Named or on Host"; } + else if (type==DISPLAY_SERVICEDEPENDENCIES){ seldesc=" Dependencies with Host"; } + else if (type==DISPLAY_SERVICEESCALATIONS){ seldesc=" Escalations on Host"; } + else if (type==DISPLAY_HOSTDEPENDENCIES){ seldesc=" Dependencies on/of Host"; } + else if (type==DISPLAY_HOSTESCALATIONS){ seldesc=" Escalations for Host"; } + printf("Show Only%s:\n",seldesc); + printf("",html_encode(to_expand,FALSE)); + } int main(void){ int result=OK; @@ -153,8 +170,8 @@ if(display_type!=DISPLAY_NONE){ - printf("
\n",CONFIG_CGI); printf("\n"); + printf("\n",CONFIG_CGI); printf("\n"); printf("\n"); + print_expand_input(display_type); + printf("\n"); - printf("
Object Type:
"); @@ -171,12 +188,16 @@ printf("
\n"); printf("
\n"); + + printf("\n"); } /* display context-sensitive help */ @@ -217,6 +238,10 @@ case DISPLAY_HOSTESCALATIONS: display_context_help(CONTEXTHELP_CONFIG_HOSTESCALATIONS); break; + case DISPLAY_COMMAND_EXPANSION: + /* Reusing DISPLAY_COMMANDS help until further notice */ + display_context_help(CONTEXTHELP_CONFIG_COMMANDS); + break; default: display_context_help(CONTEXTHELP_CONFIG_MENU); break; @@ -266,6 +291,9 @@ case DISPLAY_HOSTESCALATIONS: display_hostescalations(); break; + case DISPLAY_COMMAND_EXPANSION: + display_command_expansion(); + break; default: display_options(); break; @@ -340,6 +368,7 @@ int x; variables=getcgivars(); + to_expand[0]='\0'; for(x=0;variables[x]!=NULL;x++){ @@ -382,12 +411,26 @@ display_type=DISPLAY_HOSTDEPENDENCIES; else if(!strcmp(variables[x],"hostescalations")) display_type=DISPLAY_HOSTESCALATIONS; + else if(!strcmp(variables[x],"command")) + display_type=DISPLAY_COMMAND_EXPANSION; /* we found the embed option */ else if(!strcmp(variables[x],"embedded")) embedded=TRUE; } + /* we found the string-to-expand argument */ + else if(!strcmp(variables[x],"expand")){ + x++; + if(variables[x]==NULL){ + error=TRUE; + break; + } + strncpy(to_expand,variables[x],MAX_COMMAND_BUFFER); + to_expand[MAX_COMMAND_BUFFER-1]='\0'; + } + + /* we received an invalid argument */ else error=TRUE; @@ -420,7 +463,8 @@ return; } - printf("

Hosts

\n"); + printf("

Host%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("\n"); @@ -468,7 +512,7 @@ printf("\n"); /* check all the hosts... */ - for(temp_host=host_list;temp_host!=NULL;temp_host=temp_host->next){ + for(temp_host=host_list;temp_host!=NULL;temp_host=temp_host->next) if (((*to_expand)=='\0')||!strcmp(to_expand,temp_host->name)){ /* grab macros */ grab_host_macros(temp_host); @@ -484,9 +528,10 @@ printf("\n",bg_class); - printf("\n",bg_class,url_encode(temp_host->name),temp_host->name); - printf("\n",bg_class,temp_host->alias); - printf("\n",bg_class,temp_host->address); + printf("\n",bg_class, + url_encode(temp_host->name),CONFIG_CGI,url_encode(temp_host->name),html_encode(temp_host->name,FALSE)); + printf("\n",bg_class,html_encode(temp_host->alias,FALSE)); + printf("\n",bg_class,html_encode(temp_host->address,FALSE)); printf("\n",CONFIG_CGI,url_encode(temp_host->host_check_command),html_encode(temp_host->host_check_command,FALSE)); + /* printf("%s\n",CONFIG_CGI,url_encode(strtok(temp_host->host_check_command,"!")),html_encode(temp_host->host_check_command,FALSE)); */ + printf("%s\n",CONFIG_CGI,url_encode(temp_host->host_check_command),html_encode(temp_host->host_check_command,FALSE)); printf("\n"); printf("\n"); printf("\n",bg_class,(temp_host->obsess_over_host==TRUE)?"Yes":"No"); @@ -546,20 +592,20 @@ if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),html_encode(temp_contactsmember->contact_name,FALSE)); } for(temp_contactgroupsmember=temp_host->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){ contact++; if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),html_encode(temp_contactgroupsmember->group_name,FALSE)); } if(contact==0) printf(" "); printf("\n"); get_interval_time_string(temp_host->notification_interval,time_string,sizeof(time_string)); - printf("\n",bg_class,(temp_host->notification_interval==0)?"No Re-notification":time_string); + printf("\n",bg_class,(temp_host->notification_interval==0)?"No Re-notification":html_encode(time_string,FALSE)); get_interval_time_string(temp_host->first_notification_delay,time_string,sizeof(time_string)); printf("\n",bg_class,time_string); @@ -594,14 +640,15 @@ if(temp_host->notification_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_host->notification_period),temp_host->notification_period); + printf("%s",CONFIG_CGI,url_encode(temp_host->notification_period),html_encode(temp_host->notification_period,FALSE)); printf("\n"); printf("\n",CONFIG_CGI,url_encode(temp_host->event_handler),temp_host->event_handler); + /* printf("%s\n",CONFIG_CGI,url_encode(strtok(temp_host->event_handler,"!")),html_encode(temp_host->event_handler,FALSE)); */ + printf("%s\n",CONFIG_CGI,url_encode(temp_host->event_handler),html_encode(temp_host->event_handler,FALSE)); printf("\n"); printf("\n"); - printf("\n",bg_class,(temp_host->failure_prediction_options==NULL)?" ":temp_host->failure_prediction_options); + printf("\n",bg_class,(temp_host->failure_prediction_options==NULL)?" ":html_encode(temp_host->failure_prediction_options,FALSE)); - printf("",bg_class,(temp_host->notes==NULL)?" ":temp_host->notes); + printf("",bg_class,(temp_host->notes==NULL)?" ":html_encode(temp_host->notes,FALSE)); - printf("",bg_class,(temp_host->notes_url==NULL)?" ":temp_host->notes_url); + printf("",bg_class,(temp_host->notes_url==NULL)?" ":html_encode(temp_host->notes_url,FALSE)); - printf("",bg_class,(temp_host->action_url==NULL)?" ":temp_host->action_url); + printf("",bg_class,(temp_host->action_url==NULL)?" ":html_encode(temp_host->action_url,FALSE)); if(temp_host->have_2d_coords==FALSE) printf("",bg_class); @@ -691,22 +738,22 @@ if(temp_host->statusmap_image==NULL) printf("",bg_class); else - printf("",bg_class,url_logo_images_path,temp_host->statusmap_image,temp_host->statusmap_image); + printf("",bg_class,url_logo_images_path,temp_host->statusmap_image,html_encode(temp_host->statusmap_image,FALSE)); if(temp_host->vrml_image==NULL) printf("",bg_class); else - printf("",bg_class,url_logo_images_path,temp_host->vrml_image,temp_host->vrml_image); + printf("",bg_class,url_logo_images_path,temp_host->vrml_image,html_encode(temp_host->vrml_image,FALSE)); if(temp_host->icon_image==NULL) printf("",bg_class); else{ process_macros(temp_host->icon_image,&processed_string,0); - printf("",bg_class,url_logo_images_path,processed_string,temp_host->icon_image); + printf("",bg_class,url_logo_images_path,processed_string,html_encode(temp_host->icon_image,FALSE)); free(processed_string); } - printf("",bg_class,(temp_host->icon_image_alt==NULL)?" ":temp_host->icon_image_alt); + printf("",bg_class,(temp_host->icon_image_alt==NULL)?" ":html_encode(temp_host->icon_image_alt,FALSE)); printf("\n"); /* check all the hostgroups... */ - for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next){ + for(temp_hostgroup=hostgroup_list;temp_hostgroup!=NULL;temp_hostgroup=temp_hostgroup->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_hostgroup->group_name))){ if(odd){ odd=0; @@ -775,9 +823,9 @@ printf("\n",bg_class); - printf("",bg_class,temp_hostgroup->group_name); + printf("",bg_class,html_encode(temp_hostgroup->group_name,FALSE)); - printf("\n",bg_class,temp_hostgroup->alias); + printf("\n",bg_class,html_encode(temp_hostgroup->alias,FALSE)); printf("\n"); - printf("",bg_class,(temp_hostgroup->notes==NULL)?" ":temp_hostgroup->notes); + printf("",bg_class,(temp_hostgroup->notes==NULL)?" ":html_encode(temp_hostgroup->notes,FALSE)); - printf("",bg_class,(temp_hostgroup->notes_url==NULL)?" ":temp_hostgroup->notes_url); + printf("",bg_class,(temp_hostgroup->notes_url==NULL)?" ":html_encode(temp_hostgroup->notes_url,FALSE)); - printf("",bg_class,(temp_hostgroup->action_url==NULL)?" ":temp_hostgroup->action_url); + printf("",bg_class,(temp_hostgroup->action_url==NULL)?" ":html_encode(temp_hostgroup->action_url,FALSE)); printf("\n"); } @@ -820,7 +868,8 @@ return; } - printf("

Service Groups

\n"); + printf("

Service Group%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -836,7 +885,7 @@ printf("\n"); /* check all the servicegroups... */ - for(temp_servicegroup=servicegroup_list;temp_servicegroup!=NULL;temp_servicegroup=temp_servicegroup->next){ + for(temp_servicegroup=servicegroup_list;temp_servicegroup!=NULL;temp_servicegroup=temp_servicegroup->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_servicegroup->group_name))){ if(odd){ odd=0; @@ -849,28 +898,28 @@ printf("
\n",bg_class); - printf("",bg_class,temp_servicegroup->group_name); + printf("",bg_class,html_encode(temp_servicegroup->group_name,FALSE)); - printf("\n",bg_class,temp_servicegroup->alias); + printf("\n",bg_class,html_encode(temp_servicegroup->alias,FALSE)); printf("\n"); - printf("",bg_class,(temp_servicegroup->notes==NULL)?" ":temp_servicegroup->notes); + printf("",bg_class,(temp_servicegroup->notes==NULL)?" ":html_encode(temp_servicegroup->notes,FALSE)); - printf("",bg_class,(temp_servicegroup->notes_url==NULL)?" ":temp_servicegroup->notes_url); + printf("",bg_class,(temp_servicegroup->notes_url==NULL)?" ":html_encode(temp_servicegroup->notes_url,FALSE)); - printf("",bg_class,(temp_servicegroup->action_url==NULL)?" ":temp_servicegroup->action_url); + printf("",bg_class,(temp_servicegroup->action_url==NULL)?" ":html_encode(temp_servicegroup->action_url,FALSE)); printf("\n"); } @@ -898,7 +947,8 @@ return; } - printf("

Contacts

\n"); + printf("

Contact%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -920,7 +970,7 @@ printf("\n"); /* check all contacts... */ - for(temp_contact=contact_list;temp_contact!=NULL;temp_contact=temp_contact->next){ + for(temp_contact=contact_list;temp_contact!=NULL;temp_contact=temp_contact->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_contact->name))){ if(odd){ odd=0; @@ -933,10 +983,10 @@ printf("
\n",bg_class); - printf("\n",bg_class,url_encode(temp_contact->name),temp_contact->name); - printf("\n",bg_class,temp_contact->alias); - printf("\n",bg_class,(temp_contact->email==NULL)?" ":temp_contact->email,(temp_contact->email==NULL)?" ":temp_contact->email); - printf("\n",bg_class,(temp_contact->pager==NULL)?" ":temp_contact->pager); + printf("\n",bg_class,url_encode(temp_contact->name),html_encode(temp_contact->name,FALSE)); + printf("\n",bg_class,html_encode(temp_contact->alias,FALSE)); + printf("\n",bg_class,(temp_contact->email==NULL)?" ":url_encode(temp_contact->email),(temp_contact->email==NULL)?" ":html_encode(temp_contact->email,FALSE)); + printf("\n",bg_class,(temp_contact->pager==NULL)?" ":html_encode(temp_contact->pager,FALSE)); printf("\n"); printf("\n"); printf("\n"); /* check all the contact groups... */ - for(temp_contactgroup=contactgroup_list;temp_contactgroup!=NULL;temp_contactgroup=temp_contactgroup->next){ + for(temp_contactgroup=contactgroup_list;temp_contactgroup!=NULL;temp_contactgroup=temp_contactgroup->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_contactgroup->group_name))){ if(odd){ odd=0; @@ -1104,8 +1157,8 @@ printf("\n",bg_class); - printf("\n",bg_class,url_encode(temp_contactgroup->group_name),temp_contactgroup->group_name); - printf("\n",bg_class,temp_contactgroup->alias); + printf("\n",bg_class,url_encode(temp_contactgroup->group_name),html_encode(temp_contactgroup->group_name,FALSE)); + printf("\n",bg_class,html_encode(temp_contactgroup->alias,FALSE)); /* find all the contact who are members of this contact group... */ printf("\n"); @@ -1150,7 +1203,8 @@ return; } - printf("

Services

\n"); + printf("

Service%s%s

\n", + (*to_expand=='\0'?"s":"s Named or on Host "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -1199,7 +1253,8 @@ printf("
\n"); /* check all the services... */ - for(temp_service=service_list;temp_service!=NULL;temp_service=temp_service->next){ + for(temp_service=service_list;temp_service!=NULL;temp_service=temp_service->next) + if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_service->host_name))||(!strcmp(to_expand,temp_service->description))){ /* grab macros */ grab_service_macros(temp_service); @@ -1217,9 +1272,9 @@ printf("\n",CONFIG_CGI,url_encode(temp_service->host_name),temp_service->host_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_service->host_name),html_encode(temp_service->host_name,FALSE)); - printf("\n",bg_class,temp_service->description); + printf("\n",bg_class,html_encode(temp_service->description,FALSE)); printf("\n",bg_class,temp_service->max_attempts); @@ -1230,14 +1285,16 @@ strncpy(command_line,temp_service->service_check_command,sizeof(command_line)); command_line[sizeof(command_line)-1]='\x0'; - command_name=strtok(command_line,"!"); + command_name=strtok(strdup(command_line),"!"); - printf("\n",bg_class,CONFIG_CGI,url_encode(command_name),html_encode(temp_service->service_check_command,FALSE)); + /* printf("\n",bg_class,CONFIG_CGI,url_encode(command_name),html_encode(command_line,FALSE)); */ + printf("\n",bg_class,CONFIG_CGI,url_encode(command_line),html_encode(command_line,FALSE)); + free(command_name); printf("\n"); printf("\n",bg_class,(temp_service->parallelize==TRUE)?"Yes":"No"); @@ -1265,13 +1322,13 @@ contact++; if(contact>1) printf(", "); - printf("%s",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name); + printf("%s",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),html_encode(temp_contactsmember->contact_name,FALSE)); } for(temp_contactgroupsmember=temp_service->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){ contact++; if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),html_encode(temp_contactgroupsmember->group_name,FALSE)); } if(contact==0) printf(" "); @@ -1282,7 +1339,7 @@ printf("\n"); get_interval_time_string(temp_service->notification_interval,time_string,sizeof(time_string)); - printf("\n",bg_class,(temp_service->notification_interval==0)?"No Re-notification":time_string); + printf("\n",bg_class,(temp_service->notification_interval==0)?"No Re-notification":html_encode(time_string,FALSE)); get_interval_time_string(temp_service->first_notification_delay,time_string,sizeof(time_string)); printf("\n",bg_class,time_string); @@ -1320,13 +1377,14 @@ if(temp_service->notification_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_service->notification_period),temp_service->notification_period); + printf("%s",CONFIG_CGI,url_encode(temp_service->notification_period),html_encode(temp_service->notification_period,FALSE)); printf("\n"); printf("\n"); printf("\n"); - printf("\n",bg_class,(temp_service->failure_prediction_options==NULL)?" ":temp_service->failure_prediction_options); + printf("\n",bg_class,(temp_service->failure_prediction_options==NULL)?" ":html_encode(temp_service->failure_prediction_options,FALSE)); - printf("",bg_class,(temp_service->notes==NULL)?" ":temp_service->notes); + printf("",bg_class,(temp_service->notes==NULL)?" ":html_encode(temp_service->notes,FALSE)); - printf("",bg_class,(temp_service->notes_url==NULL)?" ":temp_service->notes_url); + printf("",bg_class,(temp_service->notes_url==NULL)?" ":html_encode(temp_service->notes_url,FALSE)); - printf("",bg_class,(temp_service->action_url==NULL)?" ":temp_service->action_url); + printf("",bg_class,(temp_service->action_url==NULL)?" ":html_encode(temp_service->action_url,FALSE)); if(temp_service->icon_image==NULL) printf("",bg_class); else{ process_macros(temp_service->icon_image,&processed_string,0); - printf("",bg_class,url_logo_images_path,processed_string,temp_service->icon_image); + printf("",bg_class,url_logo_images_path,processed_string,html_encode(temp_service->icon_image,FALSE)); free(processed_string); } - printf("",bg_class,(temp_service->icon_image_alt==NULL)?" ":temp_service->icon_image_alt); + printf("",bg_class,(temp_service->icon_image_alt==NULL)?" ":html_encode(temp_service->icon_image_alt,FALSE)); printf("\n"); /* check all the time periods... */ - for(temp_timeperiod=timeperiod_list;temp_timeperiod!=NULL;temp_timeperiod=temp_timeperiod->next){ + for(temp_timeperiod=timeperiod_list;temp_timeperiod!=NULL;temp_timeperiod=temp_timeperiod->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_timeperiod->name))){ if(odd){ odd=0; @@ -1499,14 +1558,14 @@ printf("\n",bg_class); - printf("\n",bg_class,url_encode(temp_timeperiod->name),temp_timeperiod->name); - printf("\n",bg_class,temp_timeperiod->alias); + printf("\n",bg_class,url_encode(temp_timeperiod->name),html_encode(temp_timeperiod->name,FALSE)); + printf("\n",bg_class,html_encode(temp_timeperiod->alias,FALSE)); printf(""); @@ -1655,14 +1714,15 @@ return; } - printf("

Commands

\n"); + printf("

Command%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("
%s%s%s%s%s%s",bg_class); for(temp_hostsmember=temp_host->parent_hosts;temp_hostsmember!=NULL;temp_hostsmember=temp_hostsmember->next){ @@ -494,7 +539,7 @@ if(temp_hostsmember!=temp_host->parent_hosts) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_hostsmember->host_name),temp_hostsmember->host_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_hostsmember->host_name),html_encode(temp_hostsmember->host_name,FALSE)); } if(temp_host->parent_hosts==NULL) printf(" "); @@ -512,14 +557,15 @@ if(temp_host->host_check_command==NULL) printf(" "); else - printf("%s",bg_class); if(temp_host->check_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_host->check_period),temp_host->check_period); + printf("%s",CONFIG_CGI,url_encode(temp_host->check_period),html_encode(temp_host->check_period,FALSE)); printf("%s%s%s%s",bg_class); if(temp_host->event_handler==NULL) printf(" "); else - printf("%s",bg_class); @@ -670,13 +717,13 @@ printf("%s\n",(temp_host->failure_prediction_enabled==TRUE)?"Yes":"No"); printf("%s%s%s%s%s%s%s%s   %s %s  %s %s  %s %s%s%s",bg_class); options=0; @@ -746,7 +793,8 @@ return; } - printf("

Host Groups

\n"); + printf("

Host Group%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -762,7 +810,7 @@ printf("
%s%s%s%s",bg_class); @@ -786,15 +834,15 @@ if(temp_hostsmember!=temp_hostgroup->members) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_hostsmember->host_name),temp_hostsmember->host_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_hostsmember->host_name),html_encode(temp_hostsmember->host_name,FALSE)); } printf("%s%s%s%s%s%s
%s%s%s%s",bg_class); /* find all the services that are members of this servicegroup... */ for(temp_servicesmember=temp_servicegroup->members;temp_servicesmember!=NULL;temp_servicesmember=temp_servicesmember->next){ - printf("%s%s / ",(temp_servicesmember==temp_servicegroup->members)?"":", ",CONFIG_CGI,url_encode(temp_servicesmember->host_name),temp_servicesmember->host_name); + printf("%s%s / ",(temp_servicesmember==temp_servicegroup->members)?"":", ",CONFIG_CGI,url_encode(temp_servicesmember->host_name),html_encode(temp_servicesmember->host_name,FALSE)); - printf("%s\n",url_encode(temp_servicesmember->service_description),temp_servicesmember->service_description); + printf("%s\n",url_encode(temp_servicesmember->service_description),html_encode(temp_servicesmember->service_description,FALSE)); } printf("%s%s%s%s%s%s
%s%s%s%s%s%s%s%s",bg_class); options=0; @@ -998,14 +1048,14 @@ if(temp_contact->service_notification_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_contact->service_notification_period),temp_contact->service_notification_period); + printf("%s",CONFIG_CGI,url_encode(temp_contact->service_notification_period),html_encode(temp_contact->service_notification_period,FALSE)); printf("\n",bg_class); if(temp_contact->host_notification_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_contact->host_notification_period),temp_contact->host_notification_period); + printf("%s",CONFIG_CGI,url_encode(temp_contact->host_notification_period),html_encode(temp_contact->host_notification_period,FALSE)); printf("",bg_class); @@ -1015,7 +1065,8 @@ if(temp_commandsmember!=temp_contact->service_notification_commands) printf(", "); - printf("%s",CONFIG_CGI,url_encode(temp_commandsmember->command),temp_commandsmember->command); + /* printf("%s",CONFIG_CGI,url_encode(strtok(temp_commandsmember->command,"!")),html_encode(temp_commandsmember->command,FALSE)); */ + printf("%s",CONFIG_CGI,url_encode(temp_commandsmember->command),html_encode(temp_commandsmember->command,FALSE)); found=TRUE; } @@ -1030,7 +1081,8 @@ if(temp_commandsmember!=temp_contact->host_notification_commands) printf(", "); - printf("%s",CONFIG_CGI,url_encode(temp_commandsmember->command),temp_commandsmember->command); + /* printf("%s",CONFIG_CGI,url_encode(strtok(temp_commandsmember->command,"!")),html_encode(temp_commandsmember->command,FALSE)); */ + printf("%s",CONFIG_CGI,url_encode(temp_commandsmember->command),html_encode(temp_commandsmember->command,FALSE)); found=TRUE; } @@ -1077,7 +1129,8 @@ } - printf("

Contact Groups

\n"); + printf("

Contact Group%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -1091,7 +1144,7 @@ printf("
%s%s%s%s",bg_class); @@ -1114,7 +1167,7 @@ if(temp_contactsmember!=temp_contactgroup->members) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),html_encode(temp_contactsmember->contact_name,FALSE)); } printf("
",url_encode(temp_service->description)); - printf("%s%s%s%d%s%s%s",bg_class); if(temp_service->check_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_service->check_period),temp_service->check_period); + printf("%s",CONFIG_CGI,url_encode(temp_service->check_period),html_encode(temp_service->check_period,FALSE)); printf("%s%s%s%s",bg_class); if(temp_service->event_handler==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_service->event_handler),temp_service->event_handler); + /* printf("%s",CONFIG_CGI,url_encode(strtok(temp_service->event_handler,"!")),html_encode(temp_service->event_handler,FALSE)); */ + printf("%s",CONFIG_CGI,url_encode(temp_service->event_handler),html_encode(temp_service->event_handler,FALSE)); printf("",bg_class); @@ -1403,23 +1461,23 @@ printf("%s\n",(temp_service->failure_prediction_enabled==TRUE)?"Yes":"No"); printf("%s%s%s%s%s%s%s%s  %s %s%s%s",bg_class); options=0; @@ -1471,7 +1529,8 @@ return; } - printf("

Time Periods

\n"); + printf("

Time Period%s%s

\n", + (*to_expand=='\0'?"s":" "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -1486,7 +1545,7 @@ printf("
%s%s%s%s",bg_class); item=0; for(temp_timeperiodexclusion=temp_timeperiod->exclusions;temp_timeperiodexclusion!=NULL;temp_timeperiodexclusion=temp_timeperiodexclusion->next){ item++; - printf("%s%s",(item==1)?"":", ",url_encode(temp_timeperiodexclusion->timeperiod_name),temp_timeperiodexclusion->timeperiod_name); + printf("%s%s",(item==1)?"":", ",url_encode(temp_timeperiodexclusion->timeperiod_name),html_encode(temp_timeperiodexclusion->timeperiod_name,FALSE)); } printf("
\n"); printf("\n"); /* check all commands */ - for(temp_command=command_list;temp_command!=NULL;temp_command=temp_command->next){ + for(temp_command=command_list;temp_command!=NULL;temp_command=temp_command->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_command->name))){ if(odd){ odd=0; @@ -1675,7 +1735,7 @@ printf("\n",bg_class); - printf("\n",bg_class,url_encode(temp_command->name),temp_command->name); + printf("\n",bg_class,url_encode(temp_command->name),html_encode(temp_command->name,FALSE)); printf("\n",bg_class,html_encode(temp_command->command_line,FALSE)); printf("\n"); @@ -1701,7 +1761,8 @@ return; } - printf("

Service Dependencies

\n"); + printf("

Service Dependencie%s%s

\n", + (*to_expand=='\0'?"s":"s Involving Host "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -1717,12 +1778,13 @@ printf("
"); printf(""); printf(""); - printf(""); + printf(""); printf(""); printf("\n"); /* check all the service dependencies... */ - for(temp_sd=servicedependency_list;temp_sd!=NULL;temp_sd=temp_sd->next){ + for(temp_sd=servicedependency_list;temp_sd!=NULL;temp_sd=temp_sd->next) + if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_sd->dependent_host_name))||(!strcmp(to_expand,temp_sd->host_name))){ if(odd){ odd=0; @@ -1735,15 +1797,15 @@ printf("\n",bg_class); - printf("",bg_class,CONFIG_CGI,url_encode(temp_sd->dependent_host_name),temp_sd->dependent_host_name); + printf("",bg_class,CONFIG_CGI,url_encode(temp_sd->dependent_host_name),html_encode(temp_sd->dependent_host_name,FALSE)); - printf("\n",url_encode(temp_sd->dependent_service_description),temp_sd->dependent_service_description); + printf("\n",url_encode(temp_sd->dependent_service_description),html_encode(temp_sd->dependent_service_description,FALSE)); - printf("",bg_class,CONFIG_CGI,url_encode(temp_sd->host_name),temp_sd->host_name); + printf("",bg_class,CONFIG_CGI,url_encode(temp_sd->host_name),html_encode(temp_sd->host_name,FALSE)); - printf("\n",url_encode(temp_sd->service_description),temp_sd->service_description); + printf("\n",url_encode(temp_sd->service_description),html_encode(temp_sd->service_description,FALSE)); printf("",bg_class,(temp_sd->dependency_type==NOTIFICATION_DEPENDENCY)?"Notification":"Check Execution"); @@ -1751,7 +1813,7 @@ if(temp_sd->dependency_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_sd->dependency_period),temp_sd->dependency_period); + printf("%s",CONFIG_CGI,url_encode(temp_sd->dependency_period),html_encode(temp_sd->dependency_period,FALSE)); printf("\n"); printf("\n"); /* check all the service escalations... */ - for(temp_se=serviceescalation_list;temp_se!=NULL;temp_se=temp_se->next){ + for(temp_se=serviceescalation_list;temp_se!=NULL;temp_se=temp_se->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_se->host_name))){ if(odd){ odd=0; @@ -1840,10 +1903,10 @@ printf("\n",bg_class); - printf("",bg_class,CONFIG_CGI,url_encode(temp_se->host_name),temp_se->host_name); + printf("",bg_class,CONFIG_CGI,url_encode(temp_se->host_name),html_encode(temp_se->host_name,FALSE)); - printf("\n",url_encode(temp_se->description),temp_se->description); + printf("\n",url_encode(temp_se->description),html_encode(temp_se->description,FALSE)); printf("\n"); printf("\n"); /* check all the host dependencies... */ - for(temp_hd=hostdependency_list;temp_hd!=NULL;temp_hd=temp_hd->next){ + for(temp_hd=hostdependency_list;temp_hd!=NULL;temp_hd=temp_hd->next) + if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_hd->dependent_host_name))||(!strcmp(to_expand,temp_hd->host_name))){ if(odd){ odd=0; @@ -1961,9 +2026,9 @@ printf("\n",bg_class); - printf("",bg_class,CONFIG_CGI,url_encode(temp_hd->dependent_host_name),temp_hd->dependent_host_name); + printf("",bg_class,CONFIG_CGI,url_encode(temp_hd->dependent_host_name),html_encode(temp_hd->dependent_host_name,FALSE)); - printf("",bg_class,CONFIG_CGI,url_encode(temp_hd->host_name),temp_hd->host_name); + printf("",bg_class,CONFIG_CGI,url_encode(temp_hd->host_name),html_encode(temp_hd->host_name,FALSE)); printf("",bg_class,(temp_hd->dependency_type==NOTIFICATION_DEPENDENCY)?"Notification":"Check Execution"); @@ -1971,7 +2036,7 @@ if(temp_hd->dependency_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_hd->dependency_period),temp_hd->dependency_period); + printf("%s",CONFIG_CGI,url_encode(temp_hd->dependency_period),html_encode(temp_hd->dependency_period,FALSE)); printf("\n"); printf("\n"); /* check all the host escalations... */ - for(temp_he=hostescalation_list;temp_he!=NULL;temp_he=temp_he->next){ + for(temp_he=hostescalation_list;temp_he!=NULL;temp_he=temp_he->next) if (((*to_expand)=='\0')||(!strcmp(to_expand,temp_he->host_name))){ if(odd){ odd=0; @@ -2052,7 +2118,7 @@ printf("\n",bg_class); - printf("",bg_class,CONFIG_CGI,url_encode(temp_he->host_name),temp_he->host_name); + printf("",bg_class,CONFIG_CGI,url_encode(temp_he->host_name),html_encode(temp_he->host_name,FALSE)); printf("\n"); printf("\n");
Command NameCommand Line
%s%s%s
HostServiceDependency TypeDependency PerodDependency PeriodDependency Failure Options
%s%s%s%s%s%s%s%s%s",bg_class); @@ -1806,7 +1868,8 @@ return; } - printf("

Service Escalations

\n"); + printf("

Service Escalation%s%s

\n", + (*to_expand=='\0'?"s":"s on Host "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -1827,7 +1890,7 @@ printf("
%s%s%s%s",bg_class); contact=0; @@ -1851,13 +1914,13 @@ contact++; if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),html_encode(temp_contactsmember->contact_name,FALSE)); } for(temp_contactgroupsmember=temp_se->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){ contact++; if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),html_encode(temp_contactgroupsmember->group_name,FALSE)); } if(contact==0) printf(" "); @@ -1884,7 +1947,7 @@ if(temp_se->escalation_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_se->escalation_period),temp_se->escalation_period); + printf("%s",CONFIG_CGI,url_encode(temp_se->escalation_period),html_encode(temp_se->escalation_period,FALSE)); printf("",bg_class); @@ -1933,7 +1996,8 @@ return; } - printf("

Host Dependencies

\n"); + printf("

Host Dependencie%s%s

\n", + (*to_expand=='\0'?"s":"s Involving Host "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -1948,7 +2012,8 @@ printf("
%s%s%s%s%s",bg_class); @@ -2022,7 +2087,8 @@ return; } - printf("

Host Escalations

\n"); + printf("

Host Escalation%s%s

\n", + (*to_expand=='\0'?"s":"s for Host "),(*to_expand=='\0'?"":html_encode(to_expand,FALSE))); printf("

\n"); printf("

\n"); @@ -2039,7 +2105,7 @@ printf("
%s%s",bg_class); contact=0; @@ -2060,13 +2126,13 @@ contact++; if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),temp_contactsmember->contact_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactsmember->contact_name),html_encode(temp_contactsmember->contact_name,FALSE)); } for(temp_contactgroupsmember=temp_he->contact_groups;temp_contactgroupsmember!=NULL;temp_contactgroupsmember=temp_contactgroupsmember->next){ contact++; if(contact>1) printf(", "); - printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),temp_contactgroupsmember->group_name); + printf("%s\n",CONFIG_CGI,url_encode(temp_contactgroupsmember->group_name),html_encode(temp_contactgroupsmember->group_name,FALSE)); } if(contact==0) printf(" "); @@ -2093,7 +2159,7 @@ if(temp_he->escalation_period==NULL) printf(" "); else - printf("%s",CONFIG_CGI,url_encode(temp_he->escalation_period),temp_he->escalation_period); + printf("%s",CONFIG_CGI,url_encode(temp_he->escalation_period),html_encode(temp_he->escalation_period,FALSE)); printf("",bg_class); @@ -2138,6 +2204,226 @@ +char *hash_color(int i){ + char c; + + /* This is actually optimized for MAX_COMMAND_ARGUMENTS==32 ... */ + + if ((i%32)<16){ + if ((i%32)<8) c='7'; else c='4'; + } else { + if ((i%32)<24) c='6'; else c='5'; + } + + /* Computation for standard case */ + hashed_color[0]='#'; + hashed_color[1]=hashed_color[2]=((i%2)?c:'0'); + hashed_color[3]=hashed_color[4]=(((i/2)%2)?c:'0'); + hashed_color[5]=hashed_color[6]=(((i/4)%2)?c:'0'); + hashed_color[7]='\0'; + + /* Override shades of grey */ + if ((i%8)==7) hashed_color[1]=hashed_color[3]='0'; + if ((i%8)==0) hashed_color[2]=hashed_color[3]=hashed_color[4]=hashed_color[6]=c; + + return(hashed_color); + } + +void display_command_expansion(void){ + command *temp_command; + int odd=0; + char *bg_class=""; + int i, j; + char *c, *cc; + char commandline[MAX_COMMAND_BUFFER]; + char *command_args[MAX_COMMAND_ARGUMENTS]; + int arg_count[MAX_COMMAND_ARGUMENTS], + lead_space[MAX_COMMAND_ARGUMENTS], + trail_space[MAX_COMMAND_ARGUMENTS]; + + /* see if user is authorized to view command information... */ + if(is_authorized_for_configuration_information(¤t_authdata)==FALSE){ + unauthorized_message(); + return; + } + + printf("

Command Expansion

\n"); + + /* Parse to_expand into parts */ + for (i=0;i
\n"); + printf("\n"); + printf("\n"); + + if ((*to_expand)!='\0'){ + arg_count[0]=0; + + printf("\n"); + + /* check all commands */ + for(temp_command=command_list;temp_command!=NULL;temp_command=temp_command->next){ + + if (!strcmp(temp_command->name,command_args[0])){ + + arg_count[0]++; + + if(odd){ + odd=0; + bg_class="dataEven"; + } + else{ + odd=1; + bg_class="dataOdd"; + } + + printf("\n",bg_class); + + printf("\n",bg_class,url_encode(temp_command->name),html_encode(temp_command->name,FALSE)); + printf("\n",bg_class,html_encode(temp_command->command_line,FALSE)); + + printf("\n\n",bg_class); + + for (i=1;i->\n",bg_class); + printf("\n"); + + for (i=1;(i\n",bg_class,bg_class); + printf("\n",bg_class,i,hash_color(i), + ((lead_space[i]>0)||(trail_space[i]>0)?"‍":""),html_encode(command_args[i],FALSE), + ((lead_space[i]>0)||(trail_space[i]>0)?"‍":"")); + } + else if (arg_count[i]>1){ + printf("\n",bg_class,bg_class,i); + printf("\n",bg_class,i,hash_color(i), + ((lead_space[i]>0)||(trail_space[i]>0)?"‍":""),html_encode(command_args[i],FALSE), + ((lead_space[i]>0)||(trail_space[i]>0)?"‍":"")); + } + if ((lead_space[i]>0)||(trail_space[i]>0)){ + printf("\n",bg_class,bg_class); + printf("\n"); + } + } + } + + } + + if (!arg_count[0]){ + printf("\n",html_encode(command_args[0],FALSE)); + } + } + + printf("\n"); + + printf("
Command NameCommand Line
To expand:%s",command_args[0]); + for (i=1;(i%s",hash_color(i),command_args[i]); + printf("\n
%s%s
",bg_class); + strncpy(commandline,temp_command->command_line,MAX_COMMAND_BUFFER); + commandline[MAX_COMMAND_BUFFER-1]='\0'; + for (c=commandline;c&&(cc=strstr(c,"$"));){ + (*(cc++))='\0'; + printf("%s",html_encode(c,FALSE)); + if ((*cc)=='$'){ + /* Escaped '$' */ + printf("$"); + c=(++cc); + } + else if (strncmp("ARG",cc,3)){ + /* Non-$ARGn$ macro */ + c=strstr(cc,"$"); + if (c) (*(c++))='\0'; + printf("$%s%s",html_encode(cc,FALSE),(c?"$":"")); + if (!c) printf(" (not properly terminated)"); + } + else{ + /* $ARGn$ macro */ + for (c=(cc+=3);isdigit(*c);c++) ; + if (((*c)=='\0')||((*c)=='$')){ + /* Index is numeric */ + i=atoi(cc); + if ((i>0)&&(i<=MAX_COMMAND_ARGUMENTS)){ + arg_count[i]++; + if (command_args[i]){ + if (*(command_args[i])!='\0') printf("%s%s%s", + hash_color(i),((lead_space[i]>0)||(trail_space[i]>0)?"‍":""), + html_encode(command_args[i],FALSE),((lead_space[i]>0)||(trail_space[i]>0)?"‍":"")); + else printf("(empty)"); + } + else printf("(undefined)"); + } + else printf("(not a valid $ARGn$ index: %u)",i); + if ((*c)!='\0') c++; + else printf(" (not properly terminated)"); + } + else{ + /* Syntax err in index */ + c=strstr(cc,"$"); + printf("(not an $ARGn$ index: "%s")",html_encode(strtok(cc,"$"),FALSE)); + if (c) c++; + } + } + } + if (c) printf("%s",html_encode(c,FALSE)); + + printf("
unused:$ARG%u$=%s%s%s
used %u x:$ARG%u$=%s%s%s
dangling whitespace:$ARG%u$=",bg_class,i); + for (c=command_args[i],j=0;c&&isspace(*c);c++,j++) + /* TODO: As long as the hyperlinks change all whitespace into actual spaces, + we'll output "[WS]" (whitespace) instead of "[SP]"(ace). */ + /* if ((*c)==' ') printf("[SP]"); */ + if ((*c)==' ') printf("[WS]"); + else if ((*c)=='\f') printf("[FF]"); + else if ((*c)=='\n') printf("[LF]"); + else if ((*c)=='\r') printf("[CR]"); + else if ((*c)=='\t') printf("[HT]"); + else if ((*c)=='\v') printf("[VT]"); + else printf("[0x%x]",*c); + printf("",hash_color(i)); + for (;c&&((*c)!='\0')&&(j"); + for (;c&&((*c)!='\0');c++) + /* TODO: As long as the hyperlinks change all whitespace into actual spaces, + we'll output "[WS]" (whitespace) instead of "[SP]"(ace). */ + /* if ((*c)==' ') printf("[SP]"); */ + if ((*c)==' ') printf("[WS]"); + else if ((*c)=='\f') printf("[FF]"); + else if ((*c)=='\n') printf("[LF]"); + else if ((*c)=='\r') printf("[CR]"); + else if ((*c)=='\t') printf("[HT]"); + else if ((*c)=='\v') printf("[VT]"); + else printf("[0x%x]",*c); + printf("
Error:No\n"); + printf("command "%s" found
To expand:\n",html_encode(to_expand,FALSE)); + printf("
\n"); + printf("

\n"); + + return; + } + + + void display_options(void){ printf("

\n"); @@ -2166,6 +2452,7 @@ printf("