Skip to content
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

Jump to bottom

Check and save the agent group when deliver the keep-alive #9088

Merged
merged 10 commits into from Aug 26, 2021
Merged

Check and save the agent group when deliver the keep-alive #9088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af5a883
Added lookfor_agent function
cborla Jun 18, 2021
28616ca
Changed some debug messages
cborla Jun 18, 2021
82bcc02
Fixed early return issue
cborla Jun 23, 2021
121227d
Fixed message error
cborla Jun 23, 2021
3897225
Dont calculate fsum in lookfor_group
TomasTurina Jun 24, 2021
b688cc9
First UT cases
cborla Jun 24, 2021
10e9bca
merged changes
cborla Jun 24, 2021
9b318f3
Added unit test
cborla Jun 24, 2021
af51ca0
Added shared_download_wrapper to Makefile
cborla Jun 25, 2021
09dfef3
Fixed UT and code cleanup
cborla Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Makefile
View file
Open in desktop
Expand Up @@ -1269,6 +1269,9 @@ wrappers_windows_lib_o := $(wrappers_windows_lib_c:.c=.o)
wrappers_windows_posix_c := $(wildcard unit_tests/wrappers/windows/posix/*.c)
wrappers_windows_posix_o := $(wrappers_windows_posix_c:.c=.o)

wrappers_wazuh_remoted_c := $(wildcard unit_tests/wrappers/wazuh/remoted/*.c)
wrappers_wazuh_remoted_o := $(wrappers_wazuh_remoted_c:.c=.o)

ifneq (,$(filter ${TEST},YES yes y Y 1))
OSSEC_CFLAGS+=${CFLAGS_TEST}
OSSEC_LDFLAGS+=${CFLAGS_TEST}
Expand Down Expand Up @@ -1299,6 +1302,7 @@ ifneq (,$(filter ${TEST},YES yes y Y 1))
UNIT_TEST_WRAPPERS+=${wrappers_wazuh_os_auth_o}
UNIT_TEST_WRAPPERS+=${wrappers_wazuh_addagent_o}
UNIT_TEST_WRAPPERS+=${wrappers_client_agent_o}
UNIT_TEST_WRAPPERS+=${wrappers_wazuh_remoted_o}

ifeq (${TARGET},winagent)
UNIT_TEST_WRAPPERS+=${wrappers_windows_o}
Expand Down Expand Up @@ -2098,6 +2102,9 @@ unit_tests/wrappers/windows/%.o: unit_tests/wrappers/windows/%.c
unit_tests/wrappers/windows/libc/%.o: unit_tests/wrappers/windows/libc/%.c
${OSSEC_CC} ${OSSEC_CFLAGS} ${DEFINES_EVENTCHANNEL} -c $^ -o $@

unit_tests/wrappers/wazuh/remoted/%.o: unit_tests/wrappers/wazuh/remoted/%.c
${OSSEC_CC} ${OSSEC_CFLAGS} ${DEFINES_EVENTCHANNEL} -c $^ -o $@

.PHONY: test

###################
Expand Down Expand Up @@ -2288,6 +2295,7 @@ clean-unit-tests:
rm -f ${wrappers_windows_lib_o}
rm -f ${wrappers_windows_posix_o}
rm -f ${wrappers_client_agent_o}
rm -f ${wrappers_wazuh_remoted_o}

clean-framework:
${MAKE} -C ../framework clean
Expand Down
188 changes: 134 additions & 54 deletions src/remoted/manager.c
View file
Open in desktop
Expand Up @@ -22,6 +22,13 @@
#define HOST_NAME_MAX 64
#endif

#ifdef WAZUH_UNIT_TESTING
// Remove STATIC qualifier from tests
#define STATIC
#else
#define STATIC static
#endif

/* Internal structures */
typedef struct _file_sum {
int mark;
Expand All @@ -37,7 +44,16 @@ typedef struct group_t {
static OSHash *invalid_files;

/* Internal functions prototypes */
static void read_controlmsg(const char *agent_id, char *msg);

/**
* @brief Get agent group
* @param agent_id. Agent id to assign a group
* @param msg. Message from agent to process and validate current configuration files
* @param group. Name of the found group, it will include the name of the group or 'default' group or NULL if it fails.
* @return OS_SUCCESS if it found or assigned a group, OS_INVALID otherwise
*/
STATIC int lookfor_agent_group(const char *agent_id, char *msg, char **group);
static void read_controlmsg(const char *agent_id, char *msg, char *group);
static int send_file_toagent(const char *agent_id, const char *group, const char *name, const char *sum,char *sharedcfg_dir);
static void c_group(const char *group, char ** files, file_sum ***_f_sum,char * sharedcfg_dir);
static void c_multi_group(char *multi_group,file_sum ***_f_sum,char *hash_multigroup);
Expand Down Expand Up @@ -221,12 +237,17 @@ void save_controlmsg(const keyentry * key, char *r_msg, size_t msg_length, int *
}
}
}
} else {
} else {
/* Update message */
mdebug2("save_controlmsg(): inserting '%s'", msg);
os_free(data->message);
os_strdup(msg, data->message);

os_free(data->group);
if (OS_SUCCESS != lookfor_agent_group(key->id, data->message, &data->group)) {
mdebug1("Error getting agent group for agent: '%s'", key->id);
}

/* Mark data as changed and insert into queue */
if (!data->changed) {
char *id;
Expand Down Expand Up @@ -1015,34 +1036,22 @@ int send_file_toagent(const char *agent_id, const char *group, const char *name,
return (0);
}

/* Read the available control message from the agent */
static void read_controlmsg(const char *agent_id, char *msg)
/* look for agent group */
STATIC int lookfor_agent_group(const char *agent_id, char *msg, char **r_group)
{
int i;
char group[OS_SIZE_65536];
file_sum **f_sum = NULL;
os_md5 tmp_sum;
char *end;
agent_group *agt_group;
int ret = OS_INVALID;
char *message;
char *fmsg;

if (!groups) {
/* Nothing to share with agent */
return;
mdebug2("Nothing to share with agent");
return OS_INVALID;
}

mdebug2("read_controlmsg(): reading '%s'", msg);
memset(&tmp_sum, 0, sizeof(os_md5));

// Skip agent-info and label data

if (msg = strchr(msg, '\n'), !msg) {
merror("Invalid message from agent ID '%s' (strchr \\n)", agent_id);
return;
}

for (msg++; (*msg == '\"' || *msg == '!') && (end = strchr(msg, '\n')); msg = end + 1);


// Get agent group
if (agt_group = w_parser_get_agent(agent_id), agt_group) {
strncpy(group, agt_group->group, OS_SIZE_65536);
Expand All @@ -1051,21 +1060,110 @@ static void read_controlmsg(const char *agent_id, char *msg)
} else if (get_agent_group(agent_id, group, OS_SIZE_65536) < 0) {
group[0] = '\0';
}
mdebug2("Agent '%s' group is '%s'",agent_id,group);
mdebug2("Agent '%s' group is '%s'", agent_id, group);

if (group[0]) {
os_strdup(group, *r_group);
return OS_SUCCESS;
}

/* Lock mutex */
w_mutex_lock(&files_mutex);

// If group was got, get file sum array
// make a copy to keep original msg for read_controlmsg
os_strdup(msg, message);
fmsg = message;

if (group[0]) {
if (f_sum = find_sum(group), !f_sum) {
/* Unlock mutex */
w_mutex_unlock(&files_mutex);
// Skip agent-info and label data
if (message = strchr(message, '\n'), !message) {
merror("Invalid message from agent ID '%s' (strchr \\n)", agent_id);
TomasTurina marked this conversation as resolved.
Show resolved Hide resolved
w_mutex_unlock(&files_mutex);
os_free(fmsg);
return OS_INVALID;
}

mdebug1("No such group '%s' for agent '%s'", group, agent_id);
return;
for (message++; (*message == '\"' || *message == '!' || *message == '#') && (end = strchr(message, '\n')); message = end + 1);

/* Parse message */
while (*message != '\0') {
char *md5;
char *file;

md5 = message;
file = message;

message = strchr(message, '\n');
if (!message) {
merror("Invalid message from agent ID '%s' (strchr \\n)", agent_id);
break;
}

*message = '\0';
message++;

// Skip labeled data
if (*md5 == '\"' || *md5 == '!' || *md5 == '#') {
continue;
}

file = strchr(file, ' ');
if (!file) {
merror("Invalid message from agent ID '%s' (strchr ' ')", agent_id);
break;
}

*file = '\0';
file++;

// If group was not got, guess it by matching sum
mdebug2("Agent '%s' with group '%s' file '%s' MD5 '%s'", agent_id, group, file, md5);
if (!guess_agent_group || (f_sum = find_group(file, md5, group), !f_sum)) {
// If the group could not be guessed, set to "default"
// or if the user requested not to guess the group, through the internal
// option 'guess_agent_group', set to "default"
strncpy(group, "default", OS_SIZE_65536);
}
set_agent_group(agent_id, group);
os_strdup(group, *r_group);
ret = OS_SUCCESS;
mdebug2("Group assigned: '%s'", group);
break;
}

/* Unlock mutex */
w_mutex_unlock(&files_mutex);
os_free(fmsg);
return ret;
}

/* Read the available control message from the agent */
static void read_controlmsg(const char *agent_id, char *msg, char *group)
{
int i;
file_sum **f_sum = NULL;
os_md5 tmp_sum;
char *end;

mdebug2("read_controlmsg(): reading '%s'", msg);
memset(&tmp_sum, 0, sizeof(os_md5));

// Skip agent-info and label data

if (msg = strchr(msg, '\n'), !msg) {
merror("Invalid message from agent ID '%s' (strchr \\n)", agent_id);
return;
}

for (msg++; (*msg == '\"' || *msg == '!' || *msg == '#') && (end = strchr(msg, '\n')); msg = end + 1);

/* Lock mutex */
w_mutex_lock(&files_mutex);

if (f_sum = find_sum(group), !f_sum) {
/* Unlock mutex */
w_mutex_unlock(&files_mutex);
merror("No such group '%s' for agent '%s'", group, agent_id);
return;
}

/* Parse message */
Expand All @@ -1087,7 +1185,7 @@ static void read_controlmsg(const char *agent_id, char *msg)

// Skip labeled data

if (*md5 == '\"' || *md5 == '!') {
if (*md5 == '\"' || *md5 == '!' || *md5 == '#') {
continue;
}

Expand All @@ -1100,28 +1198,6 @@ static void read_controlmsg(const char *agent_id, char *msg)
*file = '\0';
file++;

// If group was not got, guess it by matching sum

mdebug2("Agent '%s' with group '%s' file '%s' MD5 '%s'",agent_id,group,file,md5);
if (!f_sum) {
if (!guess_agent_group || (f_sum = find_group(file, md5, group), !f_sum)) {
// If the group could not be guessed, set to "default"
// or if the user requested not to guess the group, through the internal
// option 'guess_agent_group', set to "default"
strncpy(group, "default", OS_SIZE_65536);

if (f_sum = find_sum(group), !f_sum) {
/* Unlock mutex */
w_mutex_unlock(&files_mutex);

merror("No such group '%s' for agent '%s'", group, agent_id);
return;
}
}

set_agent_group(agent_id, group);
}

/* New agents only have merged.mg */
if (strcmp(file, SHAREDCFG_FILENAME) == 0) {
for (i = 0; f_sum[i]; i++) {
Expand Down Expand Up @@ -1216,6 +1292,7 @@ void *wait_for_msgs(__attribute__((unused)) void *none)
/* Should never leave this loop */
while (1) {
char * msg = NULL;
char * group = NULL;

/* Pop data from queue */
char *agent_id = linked_queue_pop_ex(pending_queue);
Expand All @@ -1225,6 +1302,7 @@ void *wait_for_msgs(__attribute__((unused)) void *none)

if (data = OSHash_Get(pending_data, agent_id), data) {
os_strdup(data->message, msg);
os_strdup(data->group, group);
} else {
merror("Couldn't get pending data from hash table for agent ID '%s'.", agent_id);
os_free(agent_id);
Expand All @@ -1235,11 +1313,12 @@ void *wait_for_msgs(__attribute__((unused)) void *none)
/* Unlock mutex */
w_mutex_unlock(&lastmsg_mutex);

if (msg && agent_id) {
read_controlmsg(agent_id, msg);
if (msg && agent_id && group) {
read_controlmsg(agent_id, msg, group);
}
os_free(agent_id);
os_free(msg);
os_free(group);

// Mark message as dispatched
w_mutex_lock(&lastmsg_mutex);
Expand Down Expand Up @@ -1300,6 +1379,7 @@ void *update_shared_files(__attribute__((unused)) void *none) {
void free_pending_data(pending_data_t *data) {
if (!data) return;
os_free(data->message);
os_free(data->group);
os_free(data);
}

Expand Down
1 change: 1 addition & 0 deletions src/remoted/remoted.h
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@

typedef struct pending_data_t {
char *message;
char *group;
int changed;
} pending_data_t;

Expand Down
3 changes: 2 additions & 1 deletion src/unit_tests/remoted/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -21,7 +21,8 @@ target_link_libraries(REMOTED_O ${WAZUHLIB} ${WAZUHEXT} -lpthread)

# Generate remoted tests
list(APPEND remoted_names "test_manager")
list(APPEND remoted_flags "-W")
list(APPEND remoted_flags "-Wl,--wrap,_mdebug2 -Wl,--wrap,_mdebug1 -Wl,--wrap,w_parser_get_agent \
-Wl,--wrap,get_agent_group -Wl,--wrap,set_agent_group -Wl,--wrap,_merror")

list(APPEND remoted_names "test_secure")
list(APPEND remoted_flags "-Wl,--wrap,fopen -Wl,--wrap,fread -Wl,--wrap,fwrite -Wl,--wrap,fclose -Wl,--wrap,remove \
Expand Down