Skip to content

Add: Ability to get, modify and verify scanners of type 'container-image' #2525

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
timopollmeier merged 3 commits into from
Aug 28, 2025
Merged

Add: Ability to get, modify and verify scanners of type 'container-image' #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edfe91a
Add: Ability to get, modify and verify scanners of type 'container-im…
robindittmar Aug 25, 2025
173651e
Merge branch 'main' into GEA-1228_container_image_scanner_type
robindittmar Aug 25, 2025
f96bc5d
Merge branch 'main' into GEA-1228_container_image_scanner_type
robindittmar Aug 26, 2025
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: 4 additions & 0 deletions src/gvmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3216,6 +3216,10 @@ gvmd (int argc, char** argv, char *env[])
type = SCANNER_TYPE_OPENVASD;
else if (!strcasecmp (scanner_type, "openvasd-sensor"))
type = SCANNER_TYPE_OPENVASD_SENSOR;
#ifdef ENABLE_CONTAINER_SCANNING
else if (!strcasecmp (scanner_type, "container-image"))
type = SCANNER_TYPE_CONTAINER_IMAGE;
#endif
else
{
type = atoi (scanner_type);
Expand Down
29 changes: 29 additions & 0 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6446,6 +6446,20 @@ check_db_scanners ()
}
#endif

#if ENABLE_CONTAINER_SCANNING
if (sql_int ("SELECT count(*) FROM scanners WHERE uuid = '%s';",
SCANNER_UUID_CONTAINER_IMAGE_DEFAULT) == 0)
{
sql ("INSERT INTO scanners"
" (uuid, owner, name, host, port, type, ca_pub, credential,"
" creation_time, modification_time)"
" VALUES ('" SCANNER_UUID_CONTAINER_IMAGE_DEFAULT "', NULL, "
" 'Container Image', '', 0, %d, NULL, NULL, m_now (),"
" m_now ());",
SCANNER_TYPE_CONTAINER_IMAGE);
}
#endif

if (sql_int ("SELECT count(*) FROM scanners WHERE uuid = '%s';",
SCANNER_UUID_CVE) == 0)
sql ("INSERT INTO scanners"
Expand Down Expand Up @@ -33698,6 +33712,18 @@ verify_scanner (const char *scanner_id, char **version)
return 2;
return 0;
}
#endif
#if ENABLE_CONTAINER_SCANNING
else if (scanner_iterator_type (&scanner) == SCANNER_TYPE_CONTAINER_IMAGE)
{
// Once container scanner is availabe and has version endpoint, replace
// this
if (version)
*version = g_strdup ("TestVersion");

cleanup_iterator (&scanner);
return 0;
}
#endif
else if (scanner_iterator_type (&scanner) == SCANNER_TYPE_CVE)
{
Expand Down Expand Up @@ -33768,6 +33794,9 @@ manage_get_scanners (GSList *log_config, const db_conn_info_t *database)
case SCANNER_TYPE_AGENT_CONTROLLER_SENSOR:
scanner_type_str = "agent-controller-sensor";
break;
case SCANNER_TYPE_CONTAINER_IMAGE:
scanner_type_str = "container-image";
break;
default:
scanner_type_str = NULL;
}
Expand Down
2 changes: 2 additions & 0 deletions src/manage_sql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@
*/
#define SCANNER_UUID_OPENVASD_DEFAULT "8154d8e3-30ee-4959-9151-1863c89a8e62"

#define SCANNER_UUID_CONTAINER_IMAGE_DEFAULT "1facb485-10e8-4520-9110-66f929d9ac2e"

/**
* @brief UUID of 'CVE' scanner.
*/
Expand Down
Loading