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

Replace g_file_test with gvm-libs file tests (20.08) #1391

Merged
merged 5 commits into from
Jan 20, 2021
Merged

Replace g_file_test with gvm-libs file tests (20.08) #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa59c11
Replace g_file_test with gvm-libs file tests
timopollmeier Jan 15, 2021
dfe7f09
Add CHANGELOG entry for file test changes
timopollmeier Jan 15, 2021
9f16ff5
Merge branch 'gvmd-20.08' of github.com:greenbone/gvmd into file-test…
timopollmeier Jan 15, 2021
fa79901
Clone gvm-libs-20.08 branch for CI
timopollmeier Jan 15, 2021
2ffceab
Remove spaces after ! operator
timopollmeier Jan 20, 2021
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
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone -b gvm-libs-20.08 --depth 1 https://github.com/greenbone/gvm-libs.git
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs (Release)
Expand All @@ -31,7 +31,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone -b gvm-libs-20.08 --depth 1 https://github.com/greenbone/gvm-libs.git
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs (Debug)
Expand All @@ -47,7 +47,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone -b gvm-libs-20.08 --depth 1 https://github.com/greenbone/gvm-libs.git
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs (Release)
Expand All @@ -63,7 +63,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone -b gvm-libs-20.08 --depth 1 https://github.com/greenbone/gvm-libs.git
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs (Release)
Expand All @@ -79,7 +79,7 @@ jobs:
- run:
working_directory: ~/gvm-libs
name: Checkout gvm-libs
command: git clone --depth 1 https://github.com/greenbone/gvm-libs.git
command: git clone -b gvm-libs-20.08 --depth 1 https://github.com/greenbone/gvm-libs.git
- run:
working_directory: ~/gvm-libs
name: Configure and compile gvm-libs (Release)
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- The xsltproc binary is now marked as mandatory [#1259](https://github.com/greenbone/gvmd/pull/1259)
- Check feed status without acquiring lock [#1266](https://github.com/greenbone/gvmd/pull/1266)
- Use timestamp in automatic sensor task names [#1390](https://github.com/greenbone/gvmd/pull/1390)
- Replace g_file_test with gvm-libs file tests [#1391](https://github.com/greenbone/gvmd/pull/1391)

### Fixed
- Add dummy functions to allow restoring old dumps [#1251](https://github.com/greenbone/gvmd/pull/1251)
Expand Down
15 changes: 11 additions & 4 deletions src/gvmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
#include <gvm/base/pwpolicy.h>
#include <gvm/base/logging.h>
#include <gvm/base/proctitle.h>
#include <gvm/util/fileutils.h>
#include <gvm/util/serverutils.h>

#include "manage.h"
Expand Down Expand Up @@ -2145,7 +2146,7 @@ gvmd (int argc, char** argv)
rc_name = g_build_filename (GVM_SYSCONF_DIR,
"gvmd_log.conf",
NULL);
if (g_file_test (rc_name, G_FILE_TEST_EXISTS))
if (gvm_file_is_readable (rc_name))
log_config = load_log_configuration (rc_name);
g_free (rc_name);
setup_log_handlers (log_config);
Expand All @@ -2164,9 +2165,11 @@ gvmd (int argc, char** argv)
{
if (strcmp (relay_mapper, ""))
{
if (g_file_test (relay_mapper, G_FILE_TEST_EXISTS) == 0)
if (gvm_file_exists (relay_mapper) == 0)
g_warning ("Relay mapper '%s' not found.", relay_mapper);
else if (g_file_test (relay_mapper, G_FILE_TEST_IS_EXECUTABLE) == 0)
else if (gvm_file_is_readable (relay_mapper) == 0)
g_warning ("Relay mapper '%s' is not readable.", relay_mapper);
else if (gvm_file_is_executable (relay_mapper) == 0)
g_warning ("Relay mapper '%s' is not executable.", relay_mapper);
else
{
Expand Down Expand Up @@ -2346,10 +2349,14 @@ gvmd (int argc, char** argv)
password_policy = g_build_filename (GVM_SYSCONF_DIR,
"pwpolicy.conf",
NULL);
if (g_file_test (password_policy, G_FILE_TEST_EXISTS) == FALSE)
if (gvm_file_exists (password_policy) == FALSE)
g_warning ("%s: password policy missing: %s",
__func__,
password_policy);
else if (gvm_file_is_readable (password_policy) == FALSE)
g_warning ("%s: password policy not readable: %s",
__func__,
password_policy);
g_free (password_policy);
}

Expand Down
2 changes: 1 addition & 1 deletion src/manage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8429,7 +8429,7 @@ sort_data_free (sort_data_t *sort_data)
gboolean
manage_gvmd_data_feed_dirs_exist ()
{
return g_file_test (GVMD_FEED_DIR, G_FILE_TEST_EXISTS)
return gvm_file_is_readable (GVMD_FEED_DIR)
&& configs_feed_dir_exists ()
&& port_lists_feed_dir_exists ()
&& report_formats_feed_dir_exists ();
Expand Down
4 changes: 2 additions & 2 deletions src/manage_configs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <errno.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <gvm/util/fileutils.h>
#include <stdlib.h>
#include <string.h>

Expand Down Expand Up @@ -456,7 +456,7 @@ sync_configs_with_feed ()
gboolean
configs_feed_dir_exists ()
{
return g_file_test (feed_dir_configs (), G_FILE_TEST_EXISTS);
return gvm_file_is_readable (feed_dir_configs ());
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/manage_port_lists.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "manage_sql_port_lists.h"
#include "utils.h"

#include <gvm/util/fileutils.h>
#include <string.h>

#undef G_LOG_DOMAIN
Expand Down Expand Up @@ -379,7 +380,7 @@ sync_port_lists_with_feed ()
gboolean
port_lists_feed_dir_exists ()
{
return g_file_test (feed_dir_port_lists (), G_FILE_TEST_EXISTS);
return gvm_file_is_readable (feed_dir_port_lists ());
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/manage_report_formats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <assert.h>
#include <errno.h>
#include <glib.h>
#include <gvm/util/fileutils.h>
#include <locale.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -740,7 +741,7 @@ sync_report_formats_with_feed ()
gboolean
report_formats_feed_dir_exists ()
{
return g_file_test (feed_dir_report_formats (), G_FILE_TEST_EXISTS);
return gvm_file_is_readable (feed_dir_report_formats ());
}

/**
Expand Down
8 changes: 4 additions & 4 deletions src/manage_sql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9297,7 +9297,7 @@ alert_script_exec (const char *alert_id, const char *command_args,

script = g_build_filename (script_dir, "alert", NULL);

if (!g_file_test (script, G_FILE_TEST_EXISTS))
if (!gvm_file_is_readable (script))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about the space, everywhere else uses !call.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed this in 2ffceab.

{
g_warning ("%s: Failed to find alert script: %s",
__func__,
Expand Down Expand Up @@ -10088,7 +10088,7 @@ send_to_sourcefire (const char *ip, const char *port, const char *pkcs12_64,

script = g_build_filename (script_dir, "alert", NULL);

if (!g_file_test (script, G_FILE_TEST_EXISTS))
if (!gvm_file_is_readable (script))
{
g_free (report_file);
g_free (pkcs12_file);
Expand Down Expand Up @@ -10408,7 +10408,7 @@ send_to_verinice (const char *url, const char *username, const char *password,

script = g_build_filename (script_dir, "alert", NULL);

if (!g_file_test (script, G_FILE_TEST_EXISTS))
if (!gvm_file_is_readable (script))
{
g_warning ("%s: Failed to find alert script: %s",
__func__,
Expand Down Expand Up @@ -46460,7 +46460,7 @@ manage_schema (gchar *format, gchar **output_return, gsize *output_length,

script = g_build_filename (script_dir, "generate", NULL);

if (!g_file_test (script, G_FILE_TEST_EXISTS))
if (!gvm_file_is_readable (script))
{
g_free (script);
g_free (script_dir);
Expand Down
23 changes: 10 additions & 13 deletions src/manage_sql_report_formats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ save_report_format_files (const gchar *report_id, array_t *files,
report_id,
NULL);

if (g_file_test (dir, G_FILE_TEST_EXISTS) && gvm_file_remove_recurse (dir))
if (gvm_file_exists (dir) && gvm_file_remove_recurse (dir))
{
g_warning ("%s: failed to remove dir %s", __func__, dir);
g_free (dir);
Expand Down Expand Up @@ -1293,7 +1293,7 @@ copy_report_format_dir (const gchar *source_dir, const gchar *copy_parent,

/* Check that the source directory exists. */

if (!g_file_test (source_dir, G_FILE_TEST_EXISTS))
if (!gvm_file_is_readable (source_dir))
{
g_warning ("%s: report format directory %s not found",
__func__, source_dir);
Expand All @@ -1304,7 +1304,7 @@ copy_report_format_dir (const gchar *source_dir, const gchar *copy_parent,

copy_dir = g_build_filename (copy_parent, copy_uuid, NULL);

if (g_file_test (copy_dir, G_FILE_TEST_EXISTS)
if (gvm_file_exists (copy_dir)
&& gvm_file_remove_recurse (copy_dir))
{
g_warning ("%s: failed to remove dir %s", __func__, copy_dir);
Expand Down Expand Up @@ -1591,7 +1591,7 @@ modify_report_format (const char *report_format_id, const char *name,
static int
move_report_format_dir (const char *dir, const char *new_dir)
{
if (g_file_test (dir, G_FILE_TEST_EXISTS)
if (gvm_file_is_readable (dir)
&& gvm_file_check_is_dir (dir))
{
gchar *new_dir_parent;
Expand Down Expand Up @@ -1793,7 +1793,7 @@ delete_report_format (const char *report_format_id, int ultimate)
report_format_string = g_strdup_printf ("%llu", report_format);
dir = report_format_trash_dir (report_format_string);
g_free (report_format_string);
if (g_file_test (dir, G_FILE_TEST_EXISTS) && gvm_file_remove_recurse (dir))
if (gvm_file_exists (dir) && gvm_file_remove_recurse (dir))
{
g_free (dir);
g_free (base);
Expand Down Expand Up @@ -1849,7 +1849,7 @@ delete_report_format (const char *report_format_id, int ultimate)

/* Remove directory. */

if (g_file_test (dir, G_FILE_TEST_EXISTS) && gvm_file_remove_recurse (dir))
if (gvm_file_exists (dir) && gvm_file_remove_recurse (dir))
{
g_free (dir);
sql_rollback ();
Expand Down Expand Up @@ -3341,17 +3341,15 @@ run_report_format_script (gchar *report_format_id,

script = g_build_filename (script_dir, "generate", NULL);

if (!g_file_test (script,
G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
if (!gvm_file_is_readable (script))
{
g_warning ("%s: No generate script found at %s",
__func__, script);
g_free (script);
g_free (script_dir);
return -1;
}
else if (!g_file_test (script,
G_FILE_TEST_IS_EXECUTABLE))
else if (!gvm_file_is_executable (script))
{
g_warning ("%s: script %s is not executable",
__func__, script);
Expand Down Expand Up @@ -3935,7 +3933,7 @@ empty_trashcan_report_formats ()
dir = report_format_trash_dir (name);
g_free (name);

if (g_file_test (dir, G_FILE_TEST_EXISTS) && gvm_file_remove_recurse (dir))
if (gvm_file_exists (dir) && gvm_file_remove_recurse (dir))
{
g_warning ("%s: failed to remove trash dir %s", __func__, dir);
g_free (dir);
Expand Down Expand Up @@ -4105,8 +4103,7 @@ delete_report_format_dirs_user (const gchar *user_id, iterator_t *rows)
user_id,
NULL);

if (g_file_test (dir, G_FILE_TEST_EXISTS)
&& gvm_file_remove_recurse (dir))
if (gvm_file_exists (dir) && gvm_file_remove_recurse (dir))
g_warning ("%s: failed to remove dir %s, continuing anyway",
__func__, dir);
g_free (dir);
Expand Down
12 changes: 6 additions & 6 deletions src/manage_sql_secinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4791,12 +4791,12 @@ try_load_csv ()
"table-affected-ovaldefs.csv",
NULL);

if (g_file_test (file_cves, G_FILE_TEST_EXISTS)
&& g_file_test (file_cpes, G_FILE_TEST_EXISTS)
&& g_file_test (file_affected_products, G_FILE_TEST_EXISTS)
&& g_file_test (file_ovaldefs, G_FILE_TEST_EXISTS)
&& g_file_test (file_ovalfiles, G_FILE_TEST_EXISTS)
&& g_file_test (file_affected_ovaldefs, G_FILE_TEST_EXISTS))
if (gvm_file_is_readable (file_cves)
&& gvm_file_is_readable (file_cpes)
&& gvm_file_is_readable (file_affected_products)
&& gvm_file_is_readable (file_ovaldefs)
&& gvm_file_is_readable (file_ovalfiles)
&& gvm_file_is_readable (file_affected_ovaldefs))
{
/* Create a new schema, "scap2". */

Expand Down