Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions agent_controller/agent_controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,19 @@ agent_controller_parse_agent (cJSON *item)
/* Versions / platform */
const gchar *upd_ver = gvm_json_obj_str (item, "updater_version");
const gchar *agt_ver = gvm_json_obj_str (item, "agent_version");
const gchar *latest_agt_ver = gvm_json_obj_str (item, "latest_agent_version");
const gchar *latest_updater_ver =
gvm_json_obj_str (item, "latest_updater_version");
const gchar *os_str = gvm_json_obj_str (item, "operating_system");
const gchar *arch = gvm_json_obj_str (item, "architecture");

agent->updater_version = upd_ver ? g_strdup (upd_ver) : NULL;
agent->agent_version = agt_ver ? g_strdup (agt_ver) : NULL;
agent->latest_agent_version =
latest_agt_ver ? g_strdup (latest_agt_ver) : NULL;
agent->latest_updater_version =
latest_updater_ver ? g_strdup (latest_updater_ver) : NULL;
agent->agent_version = agt_ver ? g_strdup (agt_ver) : NULL;
agent->operating_system = os_str ? g_strdup (os_str) : NULL;
agent->architecture = arch ? g_strdup (arch) : NULL;
agent->update_to_latest =
Expand Down
9 changes: 6 additions & 3 deletions agent_controller/agent_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,12 @@ struct agent_controller_agent
/// (seconds since epoch)
agent_controller_scan_agent_config_t config; ///< agent scan config

gchar *updater_version; ///< Updater version string (may be empty)
gchar *agent_version; ///< Agent version string (may be empty)
gchar *operating_system; ///< OS string (may be empty)
gchar *updater_version; ///< Updater version string (may be empty)
gchar *agent_version; ///< Agent version string (may be empty)
gchar *latest_agent_version; ///< Latest agent version string (may be empty)
gchar
*latest_updater_version; ///< Latest updater version string (may be empty)
gchar *operating_system; ///< OS string (may be empty)
gchar *architecture; ///< Architecture string (e.g., "amd64", may be empty)

int update_to_latest; ///< 1: update to latest, 0: do not
Expand Down
5 changes: 5 additions & 0 deletions agent_controller/agent_controller_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,8 @@ Ensure (agent_controller, parse_agent_with_minimal_fields)
"\"last_update\": \"2025-04-29T13:06:00.34994Z\","
"\"last_updater_heartbeat\": \"2025-04-29T13:06:00.34994Z\","
"\"ip_addresses\": [\"192.168.1.1\"],"
"\"latest_agent_version\": \"v.1.agent\","
"\"latest_updater_version\": \"v.1.updater\","
"\"agent_update_available\": true,"
"\"updater_update_available\": true"
"}";
Expand All @@ -583,6 +585,9 @@ Ensure (agent_controller, parse_agent_with_minimal_fields)
assert_that (agent->last_updater_heartbeat, is_not_equal_to ((time_t) 0));
assert_that (agent->agent_update_available, is_equal_to (1));
assert_that (agent->updater_update_available, is_equal_to (1));
assert_that (agent->latest_agent_version, is_equal_to_string ("v.1.agent"));
assert_that (agent->latest_updater_version,
is_equal_to_string ("v.1.updater"));

agent_controller_agent_free (agent);
cJSON_Delete (obj);
Expand Down
Loading