added mutex
Prepare Build and Testing executable binary / Prepare-Build-Testing-With-Make (push) Has been cancelled
Prepare Build and Testing executable binary / Prepare-Build-Testing-With-CMake (push) Has been cancelled
Prepare Build and Testing executable binary / Prepare-Build-Testing-With-Meson (push) Has been cancelled

This commit is contained in:
wt
2025-04-18 15:47:36 +07:00
parent e74ab7a560
commit e6ec1527da
8 changed files with 36 additions and 18 deletions
+1
View File
@@ -31,6 +31,7 @@ void auth(const httplib::Request& request, httplib::Response& response)
const std::string request_username = json_body["username"];
const std::string request_password = json_body["password"];
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();
+1
View File
@@ -11,5 +11,6 @@
#define CHANGE_USER_REQUIRED_STRING R"({"required":"[token] or if you superuser [token,userid]","optional":"[username,password,is_superuser,group]"})"
#define DELETE_USER_REQUIRED_STRING R"({"required":"[token] or if you superuser [token,userid]"})"
#define USERS_FILE "users.json"
static std::mutex usersfilemutex;
#endif // INCLUDES_HPP
+8 -4
View File
@@ -61,10 +61,13 @@ void add_user(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "access reject in add user request");
return;
}
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();
nlohmann::json all_users;
{
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
all_users = nlohmann::json::parse(usersfile);
usersfile.close();
}
nlohmann::json response_user_data = nullptr;
for (nlohmann::json& user : all_users) {
@@ -102,6 +105,7 @@ void add_user(const httplib::Request& request, httplib::Response& response)
new_user_data += "}";
all_users.push_back(nlohmann::json::parse(new_user_data));
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ofstream usersfilew(USERS_FILE);
usersfilew << all_users.dump(4);
usersfilew.close();
+8 -4
View File
@@ -58,10 +58,13 @@ void change_password(const httplib::Request& request, httplib::Response& respons
syslog(LOG_ERR, "access reject in change password request");
return;
}
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();
nlohmann::json all_users;
{
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
all_users = nlohmann::json::parse(usersfile);
usersfile.close();
}
std::string changepassuserid = userid;
if (json_body["userid"] != nullptr) {
@@ -112,6 +115,7 @@ void change_password(const httplib::Request& request, httplib::Response& respons
syslog(LOG_ERR, "can't find this user in change password request");
return;
}
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ofstream usersfilew(USERS_FILE);
usersfilew << all_users.dump(4);
usersfilew.close();
+8 -5
View File
@@ -46,11 +46,13 @@ void change_user(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "access reject in change user request");
return;
}
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();
nlohmann::json all_users;
{
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
all_users = nlohmann::json::parse(usersfile);
usersfile.close();
}
std::string changeusruserid = userid;
if (json_body["userid"] != nullptr) {
changeusruserid = json_body["userid"];
@@ -103,6 +105,7 @@ void change_user(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "can't find this user in change user request");
return;
}
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ofstream usersfilew(USERS_FILE);
usersfilew << all_users.dump(4);
usersfilew.close();
+8 -5
View File
@@ -38,11 +38,13 @@ void delete_user(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "access reject in delete user request");
return;
}
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();
nlohmann::json all_users;
{
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
all_users = nlohmann::json::parse(usersfile);
usersfile.close();
}
std::string deluserid = userid;
if (json_body["userid"] != nullptr) {
deluserid = json_body["userid"];
@@ -79,6 +81,7 @@ void delete_user(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "can't find this user in delete user request");
return;
}
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ofstream usersfilew(USERS_FILE);
usersfilew << all_users.dump(4);
usersfilew.close();
+1
View File
@@ -33,6 +33,7 @@ void get_all_users(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "access reject in get all user request");
return;
}
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();
+1
View File
@@ -33,6 +33,7 @@ void get_user(const httplib::Request& request, httplib::Response& response)
syslog(LOG_ERR, "access reject in get user request");
return;
}
std::lock_guard<std::mutex> lock(usersfilemutex);
std::ifstream usersfile(USERS_FILE);
nlohmann::json all_users = nlohmann::json::parse(usersfile);
usersfile.close();