mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-23 01:55:10 -07:00
[Server/Client/Protocol] Reporting users + moderation queue functionality (#7091)
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Fedora 43 (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Docker Image / amd64 & arm64 (push) Waiting to run
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Fedora 43 (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Docker Image / amd64 & arm64 (push) Waiting to run
* [Server/Client/Protocol] Reporting users + moderation queue functionality Took 6 minutes Took 3 minutes Took 8 seconds Took 11 minutes Took 12 minutes Took 7 minutes Took 15 seconds Took 2 minutes Took 1 minute Took 30 seconds Took 16 seconds * CI Fix Took 6 minutes * CI Fix Took 6 minutes * [Protocol] Add moderation investigation commands Adds the protocol layer for the moderation investigation suite: - Command_GetUserSessions/GetUserAlts/GetModeratorLastLogins/ResetUserPassword/RemoveUserAvatar (1013-1017) - Response extensions 1215-1219 with ServerInfo messages for sessions, alts, and staff logins - last_login on Response_ReportUserInfo and warning_il on Response_WarnList Took 2 minutes * [Utility] Add warning categories parser with infraction levels Parses the server's 'officialwarnings' setting (comma-separated, optional '|IL' suffix) into WarningCategory structs so the client can display the infraction level of each warning category. Includes GTest coverage. * [Server] Add moderation investigation tools Implements the server side of the moderation suite: - getUserSessions/getUserAlts/getModeratorLastLogins/removeUserAvatar DB methods - Handlers for all five new commands with audit records (PASSWORD_RESET, REMOVE_USER_AVATAR); password resets return a generated temporary password - cmdGetWarnList now reports per-category infraction levels from the officialwarnings setting; cmdReportUserInfo reports last_login - Update servatrice.ini.example with the warning taxonomy - Password/avatar mutations report RespNameNotFound when the user does not exist * [Client] Add moderation tab with investigate, password reset, and avatar removal - New Moderation tab: search a user to show account info, alternate accounts, login sessions, and staff last logins; actions to reset the user's password (shows the generated temporary password) and remove the user's avatar - 'Investigate user' entry in the user context menu opens the tab pre-loaded for that user - Warning dialog shows the infraction level of each warning category - Tab wired into TabSupervisor with a moderator-gated menu action, shortcut, and tabs.ini persistence (default closed) * [Server/Client/Protocol] Address PR #7091 review: security, bug, and perf fixes Security: - Promote RESET_USER_PASSWORD to admin-only dispatch (was moderator-accessible) - Reject password reset on users with equal/higher privilege than caller - Notify affected user via Event_NotifyUser::CUSTOM when password is reset - Add server-side category whitelist for reports - Drop reporter name fallback in comment/details authorization (ID-only) - Force password change: new DB column + login enforcement + client disconnect Bugs: - XSS via QTextEdit::append() → insertPlainText() in report tab and utils - allNotified initialized to true even with empty recipients list - Warning combo box: use currentData() instead of baked-in display text - Report resolution now records who resolved (resolved_by column + audit) Performance: - IP-correlation subquery: add 6-month window + LIMIT 200 - getUserSessions: clamp limit to 500 Non-blocking: - Palette-aware colors in report_utils.cpp (dark/light mode) - Report list pagination: offset/limit fields + total_count in response - SessionCommand enum gap comment for reserved values 1201-1203 Schema: 36→37 (force_password_change), 37→38 (resolved_by) Took 12 minutes Took 16 seconds * Fix macOs pedantry Took 5 minutes --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
parent
9eafd90a91
commit
ed4eb1cb31
83 changed files with 4768 additions and 43 deletions
|
|
@ -11,6 +11,7 @@ add_test(NAME playmat_resolver_test COMMAND playmat_resolver_test)
|
|||
add_test(NAME server_card_counter_test COMMAND server_card_counter_test)
|
||||
add_test(NAME server_counter_test COMMAND server_counter_test)
|
||||
add_test(NAME server_rate_limiter_test COMMAND server_rate_limiter_test)
|
||||
add_test(NAME warning_categories_test COMMAND warning_categories_test)
|
||||
|
||||
add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test)
|
||||
set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5)
|
||||
|
|
@ -27,6 +28,7 @@ add_executable(deck_hash_performance_test deck_hash_performance_test.cpp)
|
|||
add_executable(server_card_counter_test server_card_counter_test.cpp)
|
||||
add_executable(server_counter_test server_counter_test.cpp)
|
||||
add_executable(server_rate_limiter_test server_rate_limiter_test.cpp)
|
||||
add_executable(warning_categories_test warning_categories_test.cpp)
|
||||
|
||||
find_package(GTest)
|
||||
|
||||
|
|
@ -63,6 +65,7 @@ if(NOT GTEST_FOUND)
|
|||
add_dependencies(server_card_counter_test gtest)
|
||||
add_dependencies(server_counter_test gtest)
|
||||
add_dependencies(server_rate_limiter_test gtest)
|
||||
add_dependencies(warning_categories_test gtest)
|
||||
endif()
|
||||
|
||||
include_directories(${GTEST_INCLUDE_DIRS})
|
||||
|
|
@ -94,6 +97,9 @@ target_link_libraries(
|
|||
target_link_libraries(
|
||||
server_rate_limiter_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
|
||||
)
|
||||
target_link_libraries(
|
||||
warning_categories_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
|
||||
)
|
||||
|
||||
add_subdirectory(card_zone_algorithms)
|
||||
add_subdirectory(carddatabase)
|
||||
|
|
|
|||
|
|
@ -232,6 +232,12 @@ TEST_F(SettingsDefaultsTest, Tabs_AllTabsOpen_Default)
|
|||
ASSERT_EQ(s.getTabLogOpen(), true);
|
||||
}
|
||||
|
||||
TEST_F(SettingsDefaultsTest, Tabs_ModerationOpen_Default)
|
||||
{
|
||||
TabsSettings s(settingsPath, nullptr);
|
||||
ASSERT_EQ(s.getTabModerationOpen(), false);
|
||||
}
|
||||
|
||||
// --- ChatSettings ---
|
||||
|
||||
TEST_F(SettingsDefaultsTest, Chat_Mention_Default)
|
||||
|
|
|
|||
89
tests/warning_categories_test.cpp
Normal file
89
tests/warning_categories_test.cpp
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
#include "gtest/gtest.h"
|
||||
#include <QString>
|
||||
#include <libcockatrice/utility/warning_categories.h>
|
||||
|
||||
TEST(WarningCategoriesTest, EmptyValueYieldsNoCategories)
|
||||
{
|
||||
EXPECT_TRUE(parseWarningCategories(QString()).isEmpty());
|
||||
EXPECT_TRUE(parseWarningCategories(QString("")).isEmpty());
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, PlainNamesDefaultToInterventionLevelOne)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories("Flaming,Spamming,Causing Drama");
|
||||
|
||||
ASSERT_EQ(3, categories.size());
|
||||
EXPECT_EQ("Flaming", categories.at(0).name);
|
||||
EXPECT_EQ(1, categories.at(0).startingIl);
|
||||
EXPECT_EQ("Spamming", categories.at(1).name);
|
||||
EXPECT_EQ(1, categories.at(1).startingIl);
|
||||
EXPECT_EQ("Causing Drama", categories.at(2).name);
|
||||
EXPECT_EQ(1, categories.at(2).startingIl);
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, ExplicitInterventionLevelsAreParsed)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories("Cheating|2,Inappropriate Avatar|3");
|
||||
|
||||
ASSERT_EQ(2, categories.size());
|
||||
EXPECT_EQ("Cheating", categories.at(0).name);
|
||||
EXPECT_EQ(2, categories.at(0).startingIl);
|
||||
EXPECT_EQ("Inappropriate Avatar", categories.at(1).name);
|
||||
EXPECT_EQ(3, categories.at(1).startingIl);
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, MixedEntriesKeepDefaultsForThoseWithoutLevels)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories("Abusive Language|1,Cheating|2,Spamming");
|
||||
|
||||
ASSERT_EQ(3, categories.size());
|
||||
EXPECT_EQ(1, categories.at(0).startingIl);
|
||||
EXPECT_EQ(2, categories.at(1).startingIl);
|
||||
EXPECT_EQ("Spamming", categories.at(2).name);
|
||||
EXPECT_EQ(1, categories.at(2).startingIl);
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, EmptyEntriesAreSkipped)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories("Spamming,,Cheating|2,");
|
||||
|
||||
ASSERT_EQ(2, categories.size());
|
||||
EXPECT_EQ("Spamming", categories.at(0).name);
|
||||
EXPECT_EQ("Cheating", categories.at(1).name);
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, WhitespaceIsTrimmed)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories(" Abusive Language , Cheating | 2 ");
|
||||
|
||||
ASSERT_EQ(2, categories.size());
|
||||
EXPECT_EQ("Abusive Language", categories.at(0).name);
|
||||
EXPECT_EQ(1, categories.at(0).startingIl);
|
||||
EXPECT_EQ("Cheating", categories.at(1).name);
|
||||
EXPECT_EQ(2, categories.at(1).startingIl);
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, InvalidInterventionLevelsFallBackToOne)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories("Spamming|abc,Cheating|0,Targeted Harassment|-3");
|
||||
|
||||
ASSERT_EQ(3, categories.size());
|
||||
EXPECT_EQ(1, categories.at(0).startingIl);
|
||||
EXPECT_EQ(1, categories.at(1).startingIl);
|
||||
EXPECT_EQ(1, categories.at(2).startingIl);
|
||||
}
|
||||
|
||||
TEST(WarningCategoriesTest, EntryWithOnlyLevelIsSkipped)
|
||||
{
|
||||
const QList<WarningCategory> categories = parseWarningCategories("|2,Spamming|2");
|
||||
|
||||
ASSERT_EQ(1, categories.size());
|
||||
EXPECT_EQ("Spamming", categories.at(0).name);
|
||||
EXPECT_EQ(2, categories.at(0).startingIl);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue