Apply change of `global.h` template

Ensure all formatting overloads are always included before CppUnit's
headers

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
 
 # set meta data
 project(passwordfile)
@@ -10,7 +10,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
 set(META_APP_DESCRIPTION "C++ library to read/write passwords from/to encrypted files")
 set(META_VERSION_MAJOR 5)
 set(META_VERSION_MINOR 0)
-set(META_VERSION_PATCH 8)
+set(META_VERSION_PATCH 11)
 set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON)
 
 # add project files
@@ -46,13 +46,14 @@ endif ()
 set(CONFIGURATION_PACKAGE_SUFFIX
     ""
     CACHE STRING "sets the suffix for find_package() calls to packages configured via c++utilities")
-find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.0.0 REQUIRED)
+find_package(c++utilities${CONFIGURATION_PACKAGE_SUFFIX} 5.14.0 REQUIRED)
 use_cpp_utilities(VISIBILITY PUBLIC)
 
 # find 3rd party libraries
 include(3rdParty)
 use_zlib()
 use_crypto()
+use_standard_filesystem()
 
 # include modules to apply configuration
 include(BasicConfig)

README.md

@@ -9,6 +9,6 @@ The passwordfile library depends on c++utilities and is built in the same way.
 It also depends on OpenSSL and zlib.
 
 ## Copyright notice and license
-Copyright © 2015-2023 Marius Kittler
+Copyright © 2015-2024 Marius Kittler
 
 All code is licensed under [GPL-2-or-later](LICENSE).

global.h

@@ -4,6 +4,7 @@
 #ifndef PASSWORD_FILE_GLOBAL
 #define PASSWORD_FILE_GLOBAL
 
+#include "passwordfile-definitions.h"
 #include <c++utilities/application/global.h>
 
 #ifdef PASSWORD_FILE_STATIC

io/passwordfile.cpp

@@ -8,6 +8,7 @@
 
 #include <c++utilities/conversion/stringbuilder.h>
 #include <c++utilities/conversion/stringconversion.h>
+#include <c++utilities/io/path.h>
 
 #include <openssl/conf.h>
 #include <openssl/err.h>
@@ -17,6 +18,7 @@
 #include <zlib.h>
 
 #include <cstring>
+#include <filesystem>
 #include <functional>
 #include <limits>
 #include <memory>
@@ -389,9 +391,10 @@ std::uint32_t PasswordFile::mininumVersion(PasswordFileSaveFlags options) const
 /*!
  * \brief Writes the current root entry to the file under path() replacing its previous contents.
  * \param options Specify the features (like encryption and compression) to be used.
- * \throws Throws ios_base::failure when an IO error occurs.
- * \throws Throws runtime_error when no root entry is present or a compression error occurs.
+ * \throws Throws std::ios_base::failure when an IO error occurs.
+ * \throws Throws std::filesystem::filesystem_error when a filesystem error occurs.
  * \throws Throws Io::CryptoException when an encryption error occurs.
+ * \throws Throws std::runtime_error when no root entry is present or a compression error occurs.
  */
 void PasswordFile::save(PasswordFileSaveFlags options)
 {
@@ -400,7 +403,9 @@ void PasswordFile::save(PasswordFileSaveFlags options)
     }
 
     // use already opened and writable file; otherwise re-open the file
+    auto fileSize = std::size_t();
     if (m_file.good() && m_file.is_open() && !(m_openOptions & PasswordFileOpenFlags::ReadOnly)) {
+        fileSize = size();
         m_file.seekp(0);
     } else {
         m_file.clear();
@@ -418,16 +423,24 @@ void PasswordFile::save(PasswordFileSaveFlags options)
         }
     }
 
+    // write entries
     write(options);
     m_file.flush();
+
+    // truncate file if it became smaller
+    const auto newSize = static_cast<std::size_t>(m_file.tellp());
+    if (fileSize && newSize < fileSize) {
+        m_file.close();
+        std::filesystem::resize_file(makeNativePath(m_path), newSize);
+    }
 }
 
 /*!
  * \brief Writes the current root entry to the file which is assumed to be opened and writeable.
  * \param options Specify the features (like encryption and compression) to be used.
- * \throws Throws ios_base::failure when an IO error occurs.
- * \throws Throws runtime_error when no root entry is present or a compression error occurs.
+ * \throws Throws std::ios_base::failure when an IO error occurs.
  * \throws Throws Io::CryptoException when an encryption error occurs.
+ * \throws Throws std::runtime_error when no root entry is present, a compression error occurs.
  */
 void PasswordFile::write(PasswordFileSaveFlags options)
 {

tests/entrytests.cpp

@@ -2,9 +2,6 @@
 
 #include "./utils.h"
 
-#include <c++utilities/tests/testutils.h>
-using namespace CppUtilities;
-
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 

tests/fieldtests.cpp

@@ -3,9 +3,6 @@
 
 #include "./utils.h"
 
-#include <c++utilities/tests/testutils.h>
-using namespace CppUtilities;
-
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 

tests/opensslrandomdevice.cpp

@@ -1,6 +1,6 @@
 #include "../util/opensslrandomdevice.h"
 
-#include <c++utilities/tests/testutils.h>
+#include "./utils.h"
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>

tests/passwordfiletests.cpp

@@ -2,7 +2,7 @@
 #include "../io/entry.h"
 #include "../io/passwordfile.h"
 
-#include <c++utilities/tests/testutils.h>
+#include "./utils.h"
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -208,7 +208,7 @@ void PasswordFileTests::testExtendedWriting()
     CPPUNIT_ASSERT_EQUAL(""s, file.extendedHeader());
     CPPUNIT_ASSERT_EQUAL(""s, file.encryptedExtendedHeader());
     file.rootEntry()->setLabel("testfile2 - modified");
-    new AccountEntry("newAccount", file.rootEntry());
+    auto *const newAccount = new AccountEntry("newAccount", file.rootEntry());
     file.setPassword("654321");
     file.extendedHeader() = "foo";
     file.encryptedExtendedHeader() = "bar";
@@ -220,4 +220,18 @@ void PasswordFileTests::testExtendedWriting()
 
     // check backup files
     testReading("extended writing", testfile1 + ".backup", "123456", testfile2 + ".backup", string(), false, false);
+
+    // remove newAccount again to check what happens if the file size decreases
+    const auto fileSize = file.size();
+    delete newAccount;
+    file.save(PasswordFileSaveFlags::Encryption | PasswordFileSaveFlags::PasswordHashing);
+    file.close();
+    file.clearEntries();
+    file.open();
+    CPPUNIT_ASSERT_LESS(fileSize, file.size());
+    file.load();
+
+    auto path = std::list<std::string>{ "newAccount" };
+    CPPUNIT_ASSERT(file.rootEntry());
+    CPPUNIT_ASSERT(!file.rootEntry()->entryByPath(path));
 }

tests/utils.h

@@ -23,4 +23,8 @@ inline std::ostream &operator<<(std::ostream &out, const Io::Field *field)
 
 } // namespace CppUtilities
 
+#include <c++utilities/tests/testutils.h>
+
+using namespace CppUtilities;
+
 #endif // PASSWORDFILE_TESTS_UTILS_H