packages/lcr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
lcr/0015-289-close-fd-if-fdopen-failed-and-add-ut.patch
jikai 3b4b08f18a sync from upstream 
Signed-off-by: jikai <jikai11@huawei.com>
(cherry picked from commit 0a5748543c47e895a44afbc57de2d1ad6f9063d9)
2024-06-11 19:20:37 +08:00

213 lines
6.1 KiB
Diff
Raw Permalink Blame History

From a83ebe1639b4fa33177254883477ed025fc024c2 Mon Sep 17 00:00:00 2001
From: jake <jikai11@huawei.com>
Date: Tue, 21 Nov 2023 07:17:51 +0000
Subject: [PATCH 15/22] !289 close fd if fdopen failed and add ut * close fd if
fdopen failed * add ut for atomic write
---
src/lcrcontainer_extend.c | 1 +
src/utils.c | 4 +-
tests/CMakeLists.txt | 3 +-
tests/utils_ut.cpp | 140 ++++++++++++++++++++++++++++++++++++++
4 files changed, 145 insertions(+), 3 deletions(-)
create mode 100644 tests/utils_ut.cpp
diff --git a/src/lcrcontainer_extend.c b/src/lcrcontainer_extend.c
index b3202a7..9136613 100644
--- a/src/lcrcontainer_extend.c
+++ b/src/lcrcontainer_extend.c
@@ -632,6 +632,7 @@ static FILE *lcr_open_tmp_config_file(const char *bundle, char **config_file, ch
fp = fdopen(fd, "w");
if (fp == NULL) {
+ close(fd);
ERROR("FILE open failed");
goto out;
}
diff --git a/src/utils.c b/src/utils.c
index 68e9bc4..59d0cea 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1376,9 +1376,9 @@ static int lcr_util_generate_random_str(char *id, size_t len)
}
len = len / 2;
- fd = open("/dev/urandom", O_RDONLY);
+ fd = open("/dev/random", O_RDONLY);
if (fd == -1) {
- ERROR("Failed to open /dev/urandom");
+ ERROR("Failed to open /dev/random");
return -1;
}
for (i = 0; i < len; i++) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index fada476..af267d7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,6 +69,7 @@ endif()
_DEFINE_NEW_TEST(log_ut log_testcase)
_DEFINE_NEW_TEST(libocispec_ut libocispec_testcase)
_DEFINE_NEW_TEST(go_crc64_ut go_crc64_testcase)
+_DEFINE_NEW_TEST(utils_ut utils_testcase)
# mock test for run lcov to generate html
@@ -81,7 +82,7 @@ target_link_libraries(mock_ut
${GTEST_LIBRARY}
pthread
)
-add_dependencies(mock_ut log_ut libocispec_ut go_crc64_ut)
+add_dependencies(mock_ut log_ut libocispec_ut go_crc64_ut utils_ut)
IF(ENABLE_GCOV)
add_custom_target(coverage
diff --git a/tests/utils_ut.cpp b/tests/utils_ut.cpp
new file mode 100644
index 0000000..8acba29
--- /dev/null
+++ b/tests/utils_ut.cpp
@@ -0,0 +1,140 @@
+/******************************************************************************
+ * iSula-libutils: utils library for iSula
+ *
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved.
+ *
+ * Authors:
+ * jikai <jikai11@huawei.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ********************************************************************************/
+
+#include <gtest/gtest.h>
+
+#include <limits.h>
+#include <fcntl.h>
+
+#include "utils.h"
+
+char *test_read_text_file(const char *path)
+{
+ char *buf = NULL;
+ long len = 0;
+ int f_fd = -1;
+ size_t readlen = 0;
+ FILE *filp = NULL;
+ char *rpath = NULL;
+ const long max_size = 10 * 1024 * 1024; /* 10M */
+
+ if (path == NULL) {
+ return NULL;
+ }
+
+ if (lcr_util_ensure_path(&rpath, path) != 0) {
+ return NULL;
+ }
+
+ f_fd = open(rpath, O_RDONLY | O_CLOEXEC, 0666);
+ if (f_fd < 0) {
+ goto err_out;
+ }
+
+ filp = fdopen(f_fd, "r");
+ if (filp == NULL) {
+ close(f_fd);
+ goto err_out;
+ }
+
+ if (fseek(filp, 0, SEEK_END)) {
+ goto err_out;
+ }
+
+ len = ftell(filp);
+ if (len > max_size) {
+ goto err_out;
+ }
+
+ if (fseek(filp, 0, SEEK_SET)) {
+ goto err_out;
+ }
+
+ buf = (char *)lcr_util_common_calloc_s((size_t)(len + 1));
+ if (buf == NULL) {
+ goto err_out;
+ }
+
+ readlen = fread(buf, 1, (size_t)len, filp);
+ if (((readlen < (size_t)len) && (!feof(filp))) || (readlen > (size_t)len)) {
+ free(buf);
+ buf = NULL;
+ goto err_out;
+ }
+
+ buf[(size_t)len] = 0;
+
+err_out:
+
+ if (filp != NULL) {
+ fclose(filp);
+ }
+
+ free(rpath);
+
+ return buf;
+}
+
+TEST(utils_testcase, test_get_random_tmp_file)
+{
+#define RANDOM_TMP_PATH 10
+ const char *fname = "/tmp/lcr-test/test";
+ char *tmp_file = lcr_util_get_random_tmp_file(nullptr);
+ const char *prefix = "/tmp/lcr-test/.tmp-test-";
+ ASSERT_EQ(tmp_file, nullptr);
+
+ tmp_file = lcr_util_get_random_tmp_file(fname);
+ ASSERT_NE(tmp_file, nullptr);
+
+ ASSERT_EQ(strlen(tmp_file), strlen("/tmp/lcr-test/.tmp-test-") + RANDOM_TMP_PATH);
+ ASSERT_EQ(memcmp(tmp_file, prefix, strlen(prefix)), 0);
+ free(tmp_file);
+}
+
+TEST(utils_testcase, test_atomic_write_file)
+{
+ const char *fname = "/tmp/lcr-test/test";
+ const char *content = "line1\nline2\n";
+ const char *new_content = "line1\nline2\nline3\n";
+ char *readcontent = nullptr;
+
+ ASSERT_EQ(lcr_util_atomic_write_file(NULL, content, strlen(content), 0644, false), -1);
+ ASSERT_EQ(lcr_util_atomic_write_file(fname, NULL, 0, 0644, false), 0);
+
+ ASSERT_EQ(lcr_util_build_dir(fname), 0);
+
+ ASSERT_EQ(lcr_util_atomic_write_file(fname, content, strlen(content), 0644, false), 0);
+
+ readcontent = test_read_text_file(fname);
+ ASSERT_NE(readcontent, nullptr);
+ ASSERT_STREQ(readcontent, content);
+ free(readcontent);
+
+ ASSERT_EQ(lcr_util_atomic_write_file(fname, new_content, strlen(new_content), 0644, false), 0);
+ readcontent = test_read_text_file(fname);
+ ASSERT_NE(readcontent, nullptr);
+ ASSERT_STREQ(readcontent, new_content);
+ free(readcontent);
+
+ ASSERT_EQ(lcr_util_recursive_rmdir("/tmp/lcr-test/", 1), 0);
+}
--
2.34.1
Reference in New Issue View Git Blame Copy Permalink