Martchus
/
passwordfile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a separate write() method to handle file opening manually 

Opening the file manually can be useful, eg. when dealing with
Androids storage access framework.
This commit is contained in:
Martchus 2018-09-07 00:58:40 +02:00
parent e265bbe733
commit 30a95e2ffc
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
io/passwordfile.cpp
View File

@ -275,7 +275,7 @@ void PasswordFile::load()
}
/*!
* \brief Writes the current root entry to the file.
* \brief Writes the current root entry to the file under path() replacing its previous contents.
* \param useEncryption Specifies whether encryption should be used.
* \param useCompression Specifies whether compression should be used.
* \throws Throws ios_base::failure when an IO error occurs.
@ -287,14 +287,37 @@ void PasswordFile::save(bool useEncryption, bool useCompression)
if (!m_rootEntry) {
throw runtime_error("Root entry has not been created.");
}
// open file
if (m_file.is_open()) {
// use already opened and writable file; otherwise re-open the file
if (m_file.good() && m_file.is_open() && (m_file.flags() & ios_base::out)) {
m_file.seekp(0);
} else {
m_file.close();
m_file.clear();
m_file.open(m_path, ios_base::in | ios_base::out | ios_base::trunc | ios_base::binary);
}
m_file.open(m_path, ios_base::in | ios_base::out | ios_base::trunc | ios_base::binary);
// write header
m_fwriter.writeUInt32LE(0x7770616DU); // write magic number
write(useEncryption, useCompression);
m_file.flush();
}
/*!
* \brief Writes the current root entry to the file which is assumed to be opened and writeable.
* \param useEncryption Specifies whether encryption should be used.
* \param useCompression Specifies whether compression should 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 Io::CryptoException when an encryption error occurs.
*/
void PasswordFile::write(bool useEncryption, bool useCompression)
{
if (!m_rootEntry) {
throw runtime_error("Root entry has not been created.");
}
// write magic number
m_fwriter.writeUInt32LE(0x7770616DU);
// write version, extended header requires version 4, encrypted extended header required version 5
m_fwriter.writeUInt32LE(m_extendedHeader.empty() && m_encryptedExtendedHeader.empty() ? 0x3U : (m_encryptedExtendedHeader.empty() ? 0x4U : 0x5U));
byte flags = 0x00;

1
io/passwordfile.h
View File

@ -32,6 +32,7 @@ public:
void load();
// FIXME: use flags in v4
void save(bool useEncryption = true, bool useCompression = true);
void write(bool useEncryption = true, bool useCompression = true);
void clearEntries();
void clear();
void exportToTextfile(const std::string &targetPath) const;