Skip to content

Json update 02.2 #1602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddpbsd merged 2 commits into from
Dec 19, 2018
Merged

Json update 02.2 #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
398e897
Breaking this down into 2 or 3 commits
atomicturtle Dec 18, 2018
a5b2a02
sub 2
atomicturtle Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,8 +973,8 @@ list_agents: util/list_agents.o ${ossec_libs} ${ZLIB_LIB}
verify-agent-conf: util/verify-agent-conf.o ${ossec_libs} ${ZLIB_LIB}
${OSSEC_CCBIN} ${OSSEC_CFLAGS} ${ZLIB_INCLUDE} $^ ${OSSEC_LDFLAGS} -o $@

agent_control: util/agent_control.o addagent/validate.o ${ossec_libs} ${ZLIB_LIB}
${OSSEC_CCBIN} ${OSSEC_CFLAGS} ${ZLIB_INCLUDE} $^ ${OSSEC_LDFLAGS} -o $@
agent_control: util/agent_control.o addagent/validate.o ${ossec_libs} ${ZLIB_LIB} ${JSON_LIB}
${OSSEC_CCBIN} ${OSSEC_CFLAGS} ${ZLIB_INCLUDE} ${JSON_INCLUDE} $^ -lm ${OSSEC_LDFLAGS} -o $@

syscheck_control: util/syscheck_control.o addagent/validate.o ${ossec_libs} ${ZLIB_LIB}
${OSSEC_CCBIN} ${OSSEC_CFLAGS} ${ZLIB_INCLUDE} $^ ${OSSEC_LDFLAGS} -o $@
Expand Down
4 changes: 2 additions & 2 deletions src/analysisd/format/json_extended.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*
*/

#ifndef __WAZUH_EXTERNAL_FUNCTIONS_H__
#define __WAZUH_EXTERNAL_FUNCTIONS_H__
#ifndef __JSON_EXTENDED_H__
#define __JSON_EXTENDED_H__

#include "eventinfo.h"
#include "cJSON.h"
Expand Down
52 changes: 45 additions & 7 deletions src/util/agent_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include "addagent/manage_agents.h"
#include "sec.h"
#include "external/cJSON/cJSON.h"

#undef ARGV0
#define ARGV0 "agent_control"
Expand Down Expand Up @@ -252,8 +253,18 @@ int main(int argc, char **argv)

agt_id = OS_IsAllowedID(&keys, agent_id);
if (agt_id < 0) {
printf("\n** Invalid agent id '%s'.\n", agent_id);
helpmsg();
if(json_output){
cJSON *root;
root = cJSON_CreateObject();
cJSON_AddNumberToObject(root, "error", 1);
cJSON_AddStringToObject(root, "description", "Invalid agent id");
printf("%s",cJSON_PrintUnformatted(root));
cJSON_Delete(root);
exit(1);
}else{
printf("\n** Invalid agent id '%s'.\n", agent_id);
helpmsg();
}
}
} else {
/* server */
Expand All @@ -269,7 +280,14 @@ int main(int argc, char **argv)

final_ip[(sizeof final_ip) - 1] = '\0';

if (!csv_output) {
cJSON *root;
cJSON *response;

if(json_output){
root = cJSON_CreateObject();
cJSON_AddItemToObject(root, "response", response = cJSON_CreateObject());
}
if (!csv_output && !json_output) {
printf("\nOSSEC HIDS %s. Agent information:", ARGV0);
}

Expand All @@ -285,11 +303,16 @@ int main(int argc, char **argv)
keys.keyentries[agt_id]->ip->ip,
keys.keyentries[agt_id]->ip->prefixlength);

if (!csv_output) {
if (!csv_output && !json_output) {
printf("\n Agent ID: %s\n", keys.keyentries[agt_id]->id);
printf(" Agent Name: %s\n", keys.keyentries[agt_id]->name);
printf(" IP address: %s\n", final_ip);
printf(" Status: %s\n\n", print_agent_status(agt_status));
}else if(json_output){
cJSON_AddStringToObject(response, "id", keys.keyentries[agt_id]->id);
cJSON_AddStringToObject(response, "name", keys.keyentries[agt_id]->name);
cJSON_AddStringToObject(response, "ip", final_ip);
cJSON_AddStringToObject(response, "status", print_agent_status(agt_status));
} else {
printf("%s,%s,%s,%s,",
keys.keyentries[agt_id]->id,
Expand All @@ -301,19 +324,24 @@ int main(int argc, char **argv)
agt_status = get_agent_status(NULL, NULL);
agt_info = get_agent_info(NULL, "127.0.0.1");

if (!csv_output) {
if (!csv_output && !json_output) {
printf("\n Agent ID: 000 (local instance)\n");
printf(" Agent Name: %s\n", shost);
printf(" IP address: 127.0.0.1\n");
printf(" Status: %s/Local\n\n", print_agent_status(agt_status));
}else if(json_output){
cJSON_AddStringToObject(response, "id", "000 (local instance)");
cJSON_AddStringToObject(response, "name", shost);
cJSON_AddStringToObject(response, "ip", "127.0.0.1");
cJSON_AddStringToObject(response, "status", print_agent_status(agt_status));
} else {
printf("000,%s,127.0.0.1,%s/Local,",
shost,
print_agent_status(agt_status));
}
}

if (!csv_output) {
if (!csv_output && !json_output) {
printf(" Operating system: %s\n", agt_info->os);
printf(" Client version: %s\n", agt_info->version);
printf(" Last keep alive: %s\n\n", agt_info->last_keepalive);
Expand All @@ -327,6 +355,12 @@ int main(int argc, char **argv)
printf(" Syscheck last started at: %s\n", agt_info->syscheck_time);
printf(" Rootcheck last started at: %s\n", agt_info->rootcheck_time);
}
}else if(json_output){
cJSON_AddStringToObject(response, "operating_system", agt_info->os);
cJSON_AddStringToObject(response, "client_version", agt_info->version);
cJSON_AddStringToObject(response, "last_keepalive", agt_info->last_keepalive);
cJSON_AddStringToObject(response, "syscheck_last", agt_info->syscheck_time);
cJSON_AddStringToObject(response, "rootcheck_last", agt_info->rootcheck_time);
} else {
printf("%s,%s,%s,%s,%s,\n",
agt_info->os,
Expand All @@ -335,7 +369,11 @@ int main(int argc, char **argv)
agt_info->syscheck_time,
agt_info->rootcheck_time);
}

if(json_output){
cJSON_AddNumberToObject(root, "error", 0);
printf("%s",cJSON_PrintUnformatted(root));
cJSON_Delete(root);
}
exit(0);
}

Expand Down