Skip to content

Change: Update openvasd to use the generic http scanner library #2532

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
greenbonebot merged 2 commits into from
Sep 4, 2025
Merged

Change: Update openvasd to use the generic http scanner library #2532

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
b45883b
Change: Update openvasd to use the generic http scanner library
a-h-abdelsalam Aug 28, 2025
4429cdc
Increase gvm-libs versions
a-h-abdelsalam Sep 4, 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
25 changes: 17 additions & 8 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,25 @@ find_package(Threads)
## might occur.

pkg_check_modules(CJSON REQUIRED libcjson>=1.7.14)
pkg_check_modules(LIBGVM_BASE REQUIRED libgvm_base>=22.23)
pkg_check_modules(LIBGVM_UTIL REQUIRED libgvm_util>=22.23)
pkg_check_modules(LIBGVM_OSP REQUIRED libgvm_osp>=22.23)
pkg_check_modules(LIBGVM_GMP REQUIRED libgvm_gmp>=22.23)
pkg_check_modules(LIBGVM_BASE REQUIRED libgvm_base>=22.28)
pkg_check_modules(LIBGVM_UTIL REQUIRED libgvm_util>=22.28)
pkg_check_modules(LIBGVM_OSP REQUIRED libgvm_osp>=22.28)
pkg_check_modules(LIBGVM_GMP REQUIRED libgvm_gmp>=22.28)
if(OPENVASD)
pkg_check_modules(LIBGVM_HTTP REQUIRED libgvm_http>=22.23)
pkg_check_modules(LIBGVM_OPENVASD REQUIRED libgvm_openvasd>=22.23)
pkg_check_modules(LIBGVM_HTTP REQUIRED libgvm_http>=22.28)
pkg_check_modules(LIBGVM_HTTP_SCANNER REQUIRED libgvm_http_scanner>=22.28)
pkg_check_modules(LIBGVM_OPENVASD REQUIRED libgvm_openvasd>=22.28)
else(OPENVASD)
message(STATUS "OPENVASD flag is not enabled")
endif(OPENVASD)
if(ENABLE_AGENTS)
if(NOT OPENVASD)
pkg_check_modules(LIBGVM_HTTP REQUIRED libgvm_http>=22.23)
pkg_check_modules(LIBGVM_HTTP REQUIRED libgvm_http>=22.28)
endif(NOT OPENVASD)
pkg_check_modules(
LIBGVM_AGENT_CONTROLLER
REQUIRED
libgvm_agent_controller>=22.27
libgvm_agent_controller>=22.28
)
else(ENABLE_AGENTS)
message(STATUS "ENABLE_AGENTS flag is not enabled")
Expand Down Expand Up @@ -472,6 +473,7 @@ target_link_libraries(
${LIBGVM_OPENVASD_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -497,6 +499,7 @@ target_link_libraries(
${LIBGVM_OSP_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -523,6 +526,7 @@ if(ENABLE_AGENTS)
${LIBGVM_OSP_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -549,6 +553,7 @@ target_link_libraries(
${LIBGVM_OSP_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -574,6 +579,7 @@ target_link_libraries(
${LIBGVM_OPENVASD_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -599,6 +605,7 @@ target_link_libraries(
${LIBGVM_OPENVASD_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -624,6 +631,7 @@ target_link_libraries(
${LIBGVM_OPENVASD_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand All @@ -649,6 +657,7 @@ target_link_libraries(
${LIBGVM_OPENVASD_LDFLAGS}
${LIBGVM_GMP_LDFLAGS}
${LIBGVM_HTTP_LDFLAGS}
${LIBGVM_HTTP_SCANNER_LDFLAGS}
${LIBICAL_LDFLAGS}
${LINKER_HARDENING_FLAGS}
${OPT_THEIA_TGT}
Expand Down
16 changes: 8 additions & 8 deletions src/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17300,22 +17300,22 @@ send_scanner_info (iterator_t *scanners, gmp_parser_t *gmp_parser,
nodes = params;
while (nodes)
{
openvasd_param_t *param = nodes->data;
http_scanner_param_t *param = nodes->data;
g_warning("<param><id>%s</id><name>%s</name>"
"<default>%s</default><description>%s</description>"
"<type>osp_%s</type><mandatory>%d</mandatory></param>",
openvasd_param_id (param), openvasd_param_name(param),
openvasd_param_default (param), openvasd_param_desc (param),
openvasd_param_type (param), openvasd_param_mandatory (param));
http_scanner_param_id (param), http_scanner_param_name (param),
http_scanner_param_default (param), http_scanner_param_desc (param),
http_scanner_param_type (param), http_scanner_param_mandatory (param));
SENDF_TO_CLIENT_OR_FAIL
("<param><id>%s</id><name>%s</name>"
"<default>%s</default><description>%s</description>"
"<type>osp_%s</type><mandatory>%d</mandatory></param>",
openvasd_param_id (param), openvasd_param_name(param),
openvasd_param_default (param), openvasd_param_desc (param),
openvasd_param_type (param), 1);
http_scanner_param_id (param), http_scanner_param_name (param),
http_scanner_param_default (param), http_scanner_param_desc (param),
http_scanner_param_type (param), 1);

osp_param_free (nodes->data);
http_scanner_param_free (nodes->data);
nodes = nodes->next;
}
SENDF_TO_CLIENT_OR_FAIL ("</params></info>");
Expand Down
Loading
Loading