izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix state file corruption when saving user credentials

Browse Source 
Replace Boost property_tree with nlohmann::json in save_user_creds().

Boost property_tree does not preserve JSON types - it converts all values
to strings when writing JSON. This caused boolean and integer fields in
sunshine_state.json to become strings (e.g., true -> "true", 119480064 ->
"119480064") after changing the password, leading to crashes on restart.

nlohmann::json preserves the original types, matching the rest of the
codebase which already uses it for JSON operations.

Fixes #835
This commit is contained in:
Piotr Niełacny
2025-12-16 22:24:41 +01:00
parent 8d5341b255
commit 7ec7566ad7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/httpcommon.cpp
View File

@@ -6,6 +6,7 @@
// standard includes
#include <filesystem>
#include <fstream>
#include <utility>
// lib includes
@@ -68,11 +69,12 @@ namespace http {
}
int save_user_creds(const std::string &file, const std::string &username, const std::string &password, bool run_our_mouth) {
pt::ptree outputTree;
nlohmann::json outputTree;
if (fs::exists(file)) {
try {
pt::read_json(file, outputTree);
std::ifstream in(file);
in >> outputTree;
} catch (std::exception &e) {
BOOST_LOG(error) << "Couldn't read user credentials: "sv << e.what();
return -1;
@@ -80,11 +82,12 @@ namespace http {
}
auto salt = crypto::rand_alphabet(16);
outputTree.put("username", username);
outputTree.put("salt", salt);
outputTree.put("password", util::hex(crypto::hash(password + salt)).to_string());
outputTree["username"] = username;
outputTree["salt"] = salt;
outputTree["password"] = util::hex(crypto::hash(password + salt)).to_string();
try {
pt::write_json(file, outputTree);
std::ofstream out(file);
out << outputTree.dump(4); // Pretty-print with an indent of 4 spaces.
} catch (std::exception &e) {
BOOST_LOG(error) << "error writing to the credentials file, perhaps try this again as an administrator? Details: "sv << e.what();
return -1;