Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-17 18:22:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(db): permission_grants, permissions and commands given to one account or character

Browse Source 
A new table, permission_grants (MySQL migration 96, SQLite 79), and the IPermissionGrants interface with MySQL, SQLite
and TestSQL implementations. A row grants (or with deny, takes away) a dashboard permission, a slash command, a
permission category or every command up to a GM level, for one account or one character, with an optional expiry, who
granted it and when, and a note. Rows are never deleted: removing one sets revoked_at/revoked_by, so the table is also
the history. Nothing reads it yet.

Check: both migrations run on a fresh and an existing database; DatabaseParityTests PermissionGrants passes against
MariaDB (DLU_TEST_MYSQL_HOST) and SQLite gives the same results.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-29 00:53:19 -05:00
parent dc1c5fb36b
commit c575eba4e7
12 changed files with 262 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dDatabase/GameDatabase/SQLite/SQLiteDatabase.h
View File

@@ -211,6 +211,13 @@ public:
std::vector<UgcPlacement> GetUgcPlacements(const std::vector<LWOOBJID>& ugcIds) override;
std::vector<UgcMail> GetUgcMail(const std::vector<LWOOBJID>& subkeys, const LOT modelItemLot) override;
// IPermissionGrants
uint64_t InsertPermissionGrant(const Grant& grant) override;
std::optional<Grant> GetPermissionGrant(uint64_t id) override;
std::vector<Grant> GetPermissionGrants(const std::string& targetType, int64_t targetId) override;
std::vector<Grant> GetActivePermissionGrants(uint32_t accountId, int64_t characterId, int64_t now) override;
std::vector<Grant> GetRecentPermissionGrants(bool activeOnly, int64_t now, uint32_t limit) override;
bool RevokePermissionGrant(uint64_t id, const std::string& revokedBy, int64_t time) override;
// IApiKeys
uint64_t InsertApiKey(const ApiKey& key) override;
std::optional<ApiKey> GetApiKey(uint64_t id) override;

1
dDatabase/GameDatabase/SQLite/Tables/CMakeLists.txt
View File

@@ -12,6 +12,7 @@ set(DDATABASES_DATABASES_SQLITE_TABLES_SOURCES
"AccountNotes.cpp"
"AccountStrikes.cpp"
"ApiKeys.cpp"
"PermissionGrants.cpp"
"Moderation.cpp"
"ServerHealth.cpp"
"PlayerPositions.cpp"

64
dDatabase/GameDatabase/SQLite/Tables/PermissionGrants.cpp Normal file
View File

@@ -0,0 +1,64 @@
#include "SQLiteDatabase.h"
namespace {
IPermissionGrants::Grant ReadGrant(CppSQLite3Query& result) {
IPermissionGrants::Grant grant;
grant.id = static_cast<uint64_t>(result.getInt64Field("id"));
grant.targetType = result.getStringField("target_type");
grant.targetId = result.getInt64Field("target_id");
grant.kind = result.getStringField("kind");
grant.name = result.getStringField("name");
grant.deny = result.getIntField("deny") != 0;
grant.expiresAt = result.getInt64Field("expires_at");
grant.note = result.getStringField("note");
grant.grantedAt = result.getInt64Field("granted_at");
grant.grantedById = static_cast<uint32_t>(result.getInt64Field("granted_by_id"));
grant.grantedBy = result.getStringField("granted_by");
grant.revokedAt = result.getInt64Field("revoked_at");
grant.revokedBy = result.getStringField("revoked_by");
return grant;
}
}
uint64_t SQLiteDatabase::InsertPermissionGrant(const Grant& grant) {
ExecuteInsert("INSERT INTO permission_grants (target_type, target_id, kind, name, deny, expires_at, note, granted_at, granted_by_id, granted_by) "
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);",
grant.targetType, grant.targetId, grant.kind, grant.name, grant.deny, grant.expiresAt, grant.note, grant.grantedAt, grant.grantedById, grant.grantedBy);
auto [_, result] = ExecuteSelect("SELECT last_insert_rowid() AS id;");
return result.eof() ? 0 : static_cast<uint64_t>(result.getInt64Field("id"));
}
std::optional<IPermissionGrants::Grant> SQLiteDatabase::GetPermissionGrant(uint64_t id) {
auto [_, result] = ExecuteSelect("SELECT * FROM permission_grants WHERE id = ?;", static_cast<int64_t>(id));
if (result.eof()) return std::nullopt;
return ReadGrant(result);
}
std::vector<IPermissionGrants::Grant> SQLiteDatabase::GetPermissionGrants(const std::string& targetType, int64_t targetId) {
std::vector<Grant> grants;
auto [_, result] = ExecuteSelect("SELECT * FROM permission_grants WHERE target_type = ? AND target_id = ? ORDER BY id DESC;", targetType, targetId);
for (; !result.eof(); result.nextRow()) grants.push_back(ReadGrant(result));
return grants;
}
std::vector<IPermissionGrants::Grant> SQLiteDatabase::GetActivePermissionGrants(uint32_t accountId, int64_t characterId, int64_t now) {
std::vector<Grant> grants;
auto [_, result] = ExecuteSelect("SELECT * FROM permission_grants WHERE revoked_at = 0 AND (expires_at = 0 OR expires_at > ?) AND "
"((target_type = 'account' AND target_id = ?) OR (? <> 0 AND target_type = 'character' AND target_id = ?)) ORDER BY id DESC;",
now, static_cast<int64_t>(accountId), characterId, characterId);
for (; !result.eof(); result.nextRow()) grants.push_back(ReadGrant(result));
return grants;
}
std::vector<IPermissionGrants::Grant> SQLiteDatabase::GetRecentPermissionGrants(bool activeOnly, int64_t now, uint32_t limit) {
std::vector<Grant> grants;
auto [_, result] = activeOnly
? ExecuteSelect("SELECT * FROM permission_grants WHERE revoked_at = 0 AND (expires_at = 0 OR expires_at > ?) ORDER BY id DESC LIMIT ?;", now, limit)
: ExecuteSelect("SELECT * FROM permission_grants ORDER BY id DESC LIMIT ?;", limit);
for (; !result.eof(); result.nextRow()) grants.push_back(ReadGrant(result));
return grants;
}
bool SQLiteDatabase::RevokePermissionGrant(uint64_t id, const std::string& revokedBy, int64_t time) {
return ExecuteUpdate("UPDATE permission_grants SET revoked_at = ?, revoked_by = ? WHERE id = ? AND revoked_at = 0;", time, revokedBy, static_cast<int64_t>(id)) > 0;
}