jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-10 03:53:26 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[Server] Serve password reset from the database interface (#7842)

Browse source 
cmdForgotPasswordRequest, continuePasswordRequest, cmdForgotPasswordReset,
cmdForgotPasswordChallenge, cmdRequestPasswordSalt and cmdSubmitPasswordVerifier
still called Servatrice_DatabaseInterface, and two of them validated the account
token and email through the generic validateTableColumnStringData helper. Add
doesForgotPasswordExist, addForgotPassword and getUsableLegacyBackup to
Server_DatabaseInterface with fail-closed defaults, replace the table/column
probes with userTokenMatches and userEmailMatches using the same statement and
case-insensitive comparison, and let the commands ask the injected interface.
Audit records, check order and every response code are unchanged.
This commit is contained in:
BruebachL 2026-11-10 12:16:26 +01:00 • committed by GitHub
parent d05198101d
commit 9b00972b4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
servatrice/src/servatrice_database_interface.cpp
View file

@ -3552,6 +3552,16 @@ bool Servatrice_DatabaseInterface::validateTableColumnStringData(const QString &
return false;
}
bool Servatrice_DatabaseInterface::userTokenMatches(const QString &userName, const QString &token)
{
return validateTableColumnStringData("{prefix}_users", "token", userName, token);
}
bool Servatrice_DatabaseInterface::userEmailMatches(const QString &userName, const QString &email)
{
return validateTableColumnStringData("{prefix}_users", "email", userName, email);
}
void Servatrice_DatabaseInterface::addAuditRecord(const QString &user,
const QString &ipaddress,
const QString &clientid,

8
servatrice/src/servatrice_database_interface.h
View file

@ -87,7 +87,7 @@ public:
/** @brief Decrypt the account's legacy password backup when it exists, is decryptable
* with the configured key and has not aged out; purges it when it has. Returns the
* legacy credential in the stored "salt + hash" format, or an empty string. */
QString getUsableLegacyBackup(const QString &user);
QString getUsableLegacyBackup(const QString &user) override;
/** @brief Refresh the age window of the account's legacy password backup. */
void touchLegacyBackup(const QString &user);
/** @brief Drop the account's legacy password backup. */
@ -273,9 +273,11 @@ public:
RemoveUserBannerResult removeUserBanner(const QString &userName);
int clearBlacklistedBanners();
bool isCardArtAllowed(const QString &cardName, const QString &cardProviderId) override;
bool addForgotPassword(const QString &user);
bool addForgotPassword(const QString &user) override;
bool removeForgotPassword(const QString &user) override;
bool doesForgotPasswordExist(const QString &user);
bool doesForgotPasswordExist(const QString &user) override;
bool userTokenMatches(const QString &userName, const QString &token) override;
bool userEmailMatches(const QString &userName, const QString &email) override;
bool updateUserToken(const QString &token, const QString &user);
bool validateTableColumnStringData(const QString &table,
const QString &column,

29
servatrice/src/serversocketinterface.cpp
View file

@ -3637,7 +3637,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordRequest(c
return Response::RespOk;
}
if (!sqlInterface->userExists(userName)) {
if (!databaseInterface->userExists(userName)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET_REQUEST", "User does not exist", false);
@ -3654,7 +3654,7 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co
ResponseContainer &rc,
bool challenged)
{
if (sqlInterface->doesForgotPasswordExist(userName)) {
if (databaseInterface->doesForgotPasswordExist(userName)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
@ -3669,7 +3669,7 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co
QString banReason;
int banTimeRemaining;
if (sqlInterface->checkUserIsBanned(this->getAddress(), userName, clientId, banReason, banTimeRemaining)) {
if (databaseInterface->checkUserIsBanned(this->getAddress(), userName, clientId, banReason, banTimeRemaining)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET_REQUEST", "User is banned", false);
@ -3678,7 +3678,7 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co
return Response::RespFunctionNotAllowed;
}
if (!sqlInterface->addForgotPassword(userName)) {
if (!databaseInterface->addForgotPassword(userName)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET_REQUEST", "Failed to create password reset", false);
@ -3707,7 +3707,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
QString clientId = nameFromStdString(cmd.clientid());
qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password reset from user:" << userName;
if (!sqlInterface->doesForgotPasswordExist(userName)) {
if (!databaseInterface->doesForgotPasswordExist(userName)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET", "Request does not exist for user", false);
@ -3716,8 +3716,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
return Response::RespFunctionNotAllowed;
}
if (!sqlInterface->validateTableColumnStringData("{prefix}_users", "token", userName,
nameFromStdString(cmd.token()))) {
if (!databaseInterface->userTokenMatches(userName, nameFromStdString(cmd.token()))) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), userName.simplified(),
"PASSWORD_RESET", "Failed token validation", false);
@ -3745,14 +3744,14 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
return Response::RespClientUpdateRequired;
}
if (sqlInterface->changeUserPassword(nameFromStdString(cmd.user_name()), password, passwordNeedsHash)) {
if (databaseInterface->changeUserPassword(nameFromStdString(cmd.user_name()), password, passwordNeedsHash)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET", "", true);
}
sqlInterface->setForcePasswordChange(nameFromStdString(cmd.user_name()), false);
sqlInterface->removeForgotPassword(nameFromStdString(cmd.user_name()));
databaseInterface->setForcePasswordChange(nameFromStdString(cmd.user_name()), false);
databaseInterface->removeForgotPassword(nameFromStdString(cmd.user_name()));
return Response::RespOk;
}
@ -3785,7 +3784,7 @@ AbstractServerSocketInterface::cmdForgotPasswordChallenge(const Command_ForgotPa
return Response::RespFunctionNotAllowed;
}
if (!sqlInterface->userExists(userName)) {
if (!databaseInterface->userExists(userName)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET_CHALLENGE", "User does not exist", false);
@ -3794,7 +3793,7 @@ AbstractServerSocketInterface::cmdForgotPasswordChallenge(const Command_ForgotPa
}
const auto parsedEmailAddress = EmailParser::getParsedEmailAddress(nameFromStdString(cmd.email()));
if (!sqlInterface->validateTableColumnStringData("{prefix}_users", "email", userName, parsedEmailAddress)) {
if (!databaseInterface->userEmailMatches(userName, parsedEmailAddress)) {
if (servatrice->getEnableForgotPasswordAudit()) {
databaseInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
"PASSWORD_RESET_CHALLENGE", "Failed to answer email challenge question",
@ -3816,7 +3815,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRequestPasswordSalt(con
// Simplified exactly like cmdLogin, so the nonce bound to userName here validates
// against the same normalized name during the login's challenge-response check.
const QString userName = nameFromStdString(cmd.user_name()).simplified();
const QString storedPasswordData = sqlInterface->getUserPasswordData(userName);
const QString storedPasswordData = databaseInterface->getUserPasswordData(userName);
if (storedPasswordData.isEmpty()) {
if (server->getRegOnlyServerEnabled()) {
return Response::RespRegistrationRequired;
@ -3855,7 +3854,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRequestPasswordSalt(con
// encrypted legacy backup exists, serve its salt there so they can still log in;
// challenge-response clients must use scrypt_salt, which always carries the
// verifier salt.
const QString legacyBackup = sqlInterface->getUsableLegacyBackup(userName);
const QString legacyBackup = databaseInterface->getUsableLegacyBackup(userName);
if (!legacyBackup.isEmpty()) {
re->set_password_salt(legacyBackup.left(16).toStdString());
}
@ -3986,7 +3985,7 @@ AbstractServerSocketInterface::cmdSubmitPasswordVerifier(const Command_SubmitPas
return Response::RespContextError;
}
if (!sqlInterface->submitPasswordVerifier(QString::fromStdString(userInfo->name()), passwordVerifier)) {
if (!databaseInterface->submitPasswordVerifier(QString::fromStdString(userInfo->name()), passwordVerifier)) {
return Response::RespContextError;
}