jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-01 11:03:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use {prefix}, bound card name, return errors.

Browse source 
Took 27 seconds
This commit is contained in:
Lukas Brübach 2026-06-14 08:45:28 +02:00
parent fcddb93545
commit bba5b775ec
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
servatrice/src/serversocketinterface.cpp
View file

@ -1579,13 +1579,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountImage(const Comm
bool AbstractServerSocketInterface::isCardNameAllowed(const QString &cardName) bool AbstractServerSocketInterface::isCardNameAllowed(const QString &cardName)
{ {
QSqlQuery *q = QSqlQuery *q = sqlInterface->prepareQuery("SELECT mode FROM {prefix}_card_art_name_rules WHERE card_name = :name");
sqlInterface->prepareQuery("SELECT mode FROM cockatrice_card_art_name_rules WHERE card_name = :name");
q->bindValue(":name", cardName); q->bindValue(":name", cardName);
if (!sqlInterface->execSqlQuery(q)) { if (!sqlInterface->execSqlQuery(q)) {
return true; // fail-open to avoid breaking server qWarning() << "Card art rule lookup failed; failing open for" << cardName;
return true;
} }
if (!q->next()) { if (!q->next()) {
@ -1604,6 +1604,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdSetCardArtParams(const
const QString cardName = QString::fromStdString(cmd.card_name()); const QString cardName = QString::fromStdString(cmd.card_name());
if (cardName.length() > MAX_NAME_LENGTH) {
return Response::RespInvalidData;
}
if (cardName.isEmpty()) { if (cardName.isEmpty()) {
// Removal path // Removal path
QSqlQuery *q = sqlInterface->prepareQuery("UPDATE {prefix}_users SET card_art_params = NULL WHERE id = :id"); QSqlQuery *q = sqlInterface->prepareQuery("UPDATE {prefix}_users SET card_art_params = NULL WHERE id = :id");
@ -1662,7 +1666,14 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAddCardArtRule(const Co
const QString cardName = QString::fromStdString(cmd.card_name()); const QString cardName = QString::fromStdString(cmd.card_name());
const QString mode = QString::fromStdString(cmd.mode()); const QString mode = QString::fromStdString(cmd.mode());
QSqlQuery *q = sqlInterface->prepareQuery("INSERT INTO cockatrice_card_art_name_rules " if (mode != "ALLOW" && mode != "DENY") {
return Response::RespInvalidData;
}
if (cardName.isEmpty() || cardName.length() > MAX_NAME_LENGTH) {
return Response::RespInvalidData;
}
QSqlQuery *q = sqlInterface->prepareQuery("INSERT INTO {prefix}_card_art_name_rules "
"(card_name, mode, reason, created_by) " "(card_name, mode, reason, created_by) "
"VALUES (:name, :mode, :reason, :uid) " "VALUES (:name, :mode, :reason, :uid) "
"ON DUPLICATE KEY UPDATE mode=:mode2, reason=:reason2"); "ON DUPLICATE KEY UPDATE mode=:mode2, reason=:reason2");
@ -1684,9 +1695,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAddCardArtRule(const Co
Response::ResponseCode AbstractServerSocketInterface::cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd, Response::ResponseCode AbstractServerSocketInterface::cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd,
ResponseContainer &) ResponseContainer &)
{ {
QSqlQuery *q = sqlInterface->prepareQuery("DELETE FROM cockatrice_card_art_name_rules WHERE card_name=:name"); auto cardName = QString::fromStdString(cmd.card_name());
if (cardName.length() > MAX_NAME_LENGTH) {
return Response::RespInvalidData;
}
QSqlQuery *q = sqlInterface->prepareQuery("DELETE FROM {prefix}_card_art_name_rules WHERE card_name=:name");
q->bindValue(":name", QString::fromStdString(cmd.card_name())); q->bindValue(":name", cardName);
if (!sqlInterface->execSqlQuery(q)) { if (!sqlInterface->execSqlQuery(q)) {
return Response::RespInternalError; return Response::RespInternalError;
@ -1698,7 +1713,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRemoveCardArtRule(const
Response::ResponseCode AbstractServerSocketInterface::cmdListCardArtRules(const Command_ListCardArtRules &, Response::ResponseCode AbstractServerSocketInterface::cmdListCardArtRules(const Command_ListCardArtRules &,
ResponseContainer &rc) ResponseContainer &rc)
{ {
QSqlQuery *q = sqlInterface->prepareQuery("SELECT card_name, mode, reason FROM cockatrice_card_art_name_rules"); QSqlQuery *q = sqlInterface->prepareQuery("SELECT card_name, mode, reason FROM {prefix}_card_art_name_rules");
if (!sqlInterface->execSqlQuery(q)) { if (!sqlInterface->execSqlQuery(q)) {
return Response::RespInternalError; return Response::RespInternalError;