mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-03-23 01:07:02 +05:00
* add: Dedicated Server implementation - Introduced `ServerMain.cpp` for the dedicated server logic, handling command-line arguments, server initialization, and network management. - Created `postbuild_server.ps1` script for post-build tasks, including copying necessary resources and DLLs for the dedicated server. - Added `CopyServerAssets.cmake` to manage the copying of server assets during the build process, ensuring required files are available for the dedicated server. - Defined project filters in `Minecraft.Server.vcxproj.filters` for better organization of server-related files. * add: refactor world loader & add server properties - Introduced ServerLogger for logging startup steps and world I/O operations. - Implemented ServerProperties for loading and saving server configuration from `server.properties`. - Added WorldManager to handle world loading and creation based on server properties. - Updated ServerMain to integrate server properties loading and world management. - Enhanced project files to include new source and header files for the server components. * update: implement enhanced logging functionality with configurable log levels * update: update keyboard and mouse input initialization1dc8a005ed* fix: change virtual screen resolution to 1920x1080(HD) Since 31881af56936aeef38ff322b975fd0 , `skinHud.swf` for 720 is not included in `MediaWindows64.arc`, the app crashes unless the virtual screen is set to HD. * fix: dedicated server build settings for miniaudio migration and missing sources - remove stale Windows64 Miles (mss64) link/copy references from server build - add Common/Filesystem/Filesystem.cpp to Minecraft.Server.vcxproj - add Windows64/PostProcesser.cpp to Minecraft.Server.vcxproj - fix unresolved externals (PostProcesser::*, FileExists) in dedicated server build * update: changed the virtual screen to 720p Since the crash caused by the 720p `skinHud.swf` not being included in `MediaWindows64.arc` has been resolved, switching back to 720p to reduce resource usage. * add: add Docker support for Dedicated Server add with entrypoint and build scripts * fix: add initial save for newly created worlds in dedicated server on the server side, I fixed the behavior introduced after commitaadb511, where newly created worlds are intentionally not saved to disk immediately. * update: add basically all configuration options that are implemented in the classes to `server.properties` * update: add LAN advertising configuration for server.properties LAN-Discovery, which isn’t needed in server mode and could potentially be a security risk, has also been disabled(only server mode). * add: add implementing interactive command line using linenoise - Integrated linenoise library for line editing and completion in the server console. - Updated ServerLogger to handle external writes safely during logging. - Modified ServerMain to initialize and manage the ServerCli for command input. - The implementation is separate from everything else, so it doesn't affect anything else. - The command input section and execution section are separated into threads. * update: enhance command line completion with predictive hints Like most command line tools, it highlights predictions in gray. * add: implement `StringUtils` for string manipulation and refactor usages Unified the scattered utility functions. * fix: send DisconnectPacket on shutdown and fix Win64 recv-thread teardown race Before this change, server/host shutdown closed sockets directly in ServerConnection::stop(), which bypassed the normal disconnect flow. As a result, clients could be dropped without receiving a proper DisconnectPacket during stop/kill/world-close paths. Also, WinsockNetLayer::Shutdown() could destroy synchronization objects while host-side recv threads were still exiting, causing a crash in RecvThreadProc (access violation on world close in host mode). * fix: return client to menus when Win64 host connection drops - Add client-side host disconnect handling in CPlatformNetworkManagerStub::DoWork() for _WINDOWS64. - When in QNET_STATE_GAME_PLAY as a non-host and WinsockNetLayer::IsConnected() becomes false, trigger g_NetworkManager.HandleDisconnect(false) to enter the normal disconnect/UI flow. - Use m_bLeaveGameOnTick as a one-shot guard to prevent repeated disconnect handling while the link remains down. - Reset m_bLeaveGameOnTick on LeaveGame(), HostGame(), and JoinGame() to avoid stale state across sessions. * update: converted Japanese comments to English * add: create `Minecraft.Server` developer guide in English and Japanese * update: add note about issue * add: add `nlohmann/json` json lib * add: add FileUtils Moved file operations to `utils`. * add: Dedicated Server BAN access manager with persistent player and IP bans - add Access frontend that publishes thread-safe ban manager snapshots for dedicated server use - add BanManager storage for banned-players.json and banned-ips.json with load/save/update flows - add persistent player and IP ban checks during dedicated server connection handling - add UTF-8 BOM-safe JSON parsing and shared file helpers backed by nlohmann/json - add Unicode-safe ban file read/write and safer atomic replacement behavior on Windows - add active-ban snapshot APIs and expiry-aware filtering for expires metadata - add RAII-based dedicated access shutdown handling during server startup and teardown * update: changed file read/write operations to use `FileUtils`. - As a side effect, saving has become faster! * fix: Re-added the source that had somehow disappeared. * add: significantly improved the dedicated server logging system - add ServerLogManager to Minecraft.Server as the single entry point for dedicated-server log output - forward CMinecraftApp logger output to the server logger when running with g_Win64DedicatedServer - add named network logs for incoming, accepted, rejected, and disconnected connections - cache connection metadata by smallId so player name and remote IP remain available for disconnect logs - keep Minecraft.Client changes minimal by using lightweight hook points and handling log orchestration on the server side * fix: added the updated library source * add: add `ban` and `pardon` commands for Player and IP * fix: fix stop command shutdown process add dedicated server shutdown request handling * fix: fixed the save logic during server shutdown Removed redundant repeated saves and eliminated the risks of async writes. * update: added new sever files to Docker entrypoint * fix: replace shutdown flag with atomic variable for thread safety * update: update Dedicated Server developer guide English is machine translated. Please forgive me. * update: check for the existence of `GameHDD` and create * add: add Whitelist to Dedicated Server * refactor: clean up and refactor the code - unify duplicated implementations that were copied repeatedly - update outdated patterns to more modern ones * fix: include UI header (new update fix) * fix: fix the detection range for excessive logging `getHighestNonEmptyY()` returning `-1` occurs normally when the chunk is entirely air. The caller (`Minecraft.World/LevelChunk.cpp:2400`) normalizes `-1` to `0`. * update: add world size config to dedicated server properties * update: update README add explanation of `server.properties` & launch arguments * update: add nightly release workflow for dedicated server and client builds to Actions * fix: update name for workflow * add random seed generation * add: add Docker nightly workflow for Dedicated Server publish to GitHub Container Registry * fix: ghost player when clients disconnect out of order #4 * fix: fix 7zip option * fix: fix Docker workflow for Dedicated Server artifact handling * add: add no build Dedicated Server startup scripts and Docker Compose * update: add README for Docker Dedicated Server setup with no local build * refactor: refactor command path structure As the number of commands has increased and become harder to navigate, each command has been organized into separate folders. * update: support stream(file stdin) input mode for server CLI Support for the stream (file stdin) required when attaching a tty to a Docker container on Linux. * add: add new CLI Console Commands for Dedicated Server Most of these commands are executed using the command dispatcher implemented on the `Minecraft.World` side. When registering them with the dispatcher, the sender uses a permission-enabled configuration that treats the CLI as a player. - default game. - enchant - experience. - give - kill(currently, getting a permission error for some reason) - time - weather. - update tp & gamemode command * fix: change player map icon to random select * update: increase the player limit * add: restore the basic anti-cheat implementation and add spawn protection Added the following anti-cheat measures and add spawn protection to `server.properties`. - instant break - speed - reach * fix: fix Docker image tag --------- Co-authored-by: sylvessa <225480449+sylvessa@users.noreply.github.com>
461 lines
12 KiB
C++
461 lines
12 KiB
C++
#include "stdafx.h"
|
|
|
|
#include "Access.h"
|
|
|
|
#include "..\Common\StringUtils.h"
|
|
#include "..\ServerLogger.h"
|
|
|
|
#include <memory>
|
|
#include <mutex>
|
|
|
|
namespace ServerRuntime
|
|
{
|
|
namespace Access
|
|
{
|
|
namespace
|
|
{
|
|
/**
|
|
* **Access State**
|
|
*
|
|
* These features are used extensively from various parts of the code, so safe read/write handling is implemented
|
|
* Stores the published BAN manager snapshot plus a writer gate for clone-and-publish updates
|
|
* 公開中のBanManagerスナップショットと更新直列化用ロックを保持する
|
|
*/
|
|
struct AccessState
|
|
{
|
|
std::mutex stateLock;
|
|
std::mutex writeLock;
|
|
std::shared_ptr<BanManager> banManager;
|
|
std::shared_ptr<WhitelistManager> whitelistManager;
|
|
bool whitelistEnabled = false;
|
|
};
|
|
|
|
AccessState g_accessState;
|
|
|
|
/**
|
|
* Copies the currently published manager pointer so readers can work without holding the publish mutex
|
|
* 公開中のBanManager共有ポインタを複製取得する
|
|
*/
|
|
static std::shared_ptr<BanManager> GetBanManagerSnapshot()
|
|
{
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
return g_accessState.banManager;
|
|
}
|
|
|
|
/**
|
|
* Replaces the shared manager pointer with a fully prepared snapshot in one short critical section
|
|
* 準備完了したBanManagerスナップショットを短いロックで公開する
|
|
*/
|
|
static void PublishBanManagerSnapshot(const std::shared_ptr<BanManager> &banManager)
|
|
{
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
g_accessState.banManager = banManager;
|
|
}
|
|
|
|
static std::shared_ptr<WhitelistManager> GetWhitelistManagerSnapshot()
|
|
{
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
return g_accessState.whitelistManager;
|
|
}
|
|
|
|
static void PublishWhitelistManagerSnapshot(const std::shared_ptr<WhitelistManager> &whitelistManager)
|
|
{
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
g_accessState.whitelistManager = whitelistManager;
|
|
}
|
|
}
|
|
|
|
std::string FormatXuid(PlayerUID xuid)
|
|
{
|
|
if (xuid == INVALID_XUID)
|
|
{
|
|
return "";
|
|
}
|
|
|
|
char buffer[32] = {};
|
|
sprintf_s(buffer, sizeof(buffer), "0x%016llx", (unsigned long long)xuid);
|
|
return buffer;
|
|
}
|
|
|
|
bool TryParseXuid(const std::string &text, PlayerUID *outXuid)
|
|
{
|
|
if (outXuid == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
unsigned long long parsed = 0;
|
|
if (!StringUtils::TryParseUnsignedLongLong(text, &parsed) || parsed == 0ULL)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
*outXuid = (PlayerUID)parsed;
|
|
return true;
|
|
}
|
|
|
|
bool Initialize(const std::string &baseDirectory, bool whitelistEnabled)
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
|
|
// Build the replacement manager privately so readers keep using the last published snapshot during disk I/O.
|
|
std::shared_ptr<BanManager> banManager = std::make_shared<BanManager>(baseDirectory);
|
|
std::shared_ptr<WhitelistManager> whitelistManager = std::make_shared<WhitelistManager>(baseDirectory);
|
|
if (!banManager->EnsureBanFilesExist())
|
|
{
|
|
LogError("access", "failed to ensure dedicated server ban files exist");
|
|
return false;
|
|
}
|
|
if (!whitelistManager->EnsureWhitelistFileExists())
|
|
{
|
|
LogError("access", "failed to ensure dedicated server whitelist file exists");
|
|
return false;
|
|
}
|
|
|
|
if (!banManager->Reload())
|
|
{
|
|
LogError("access", "failed to load dedicated server ban files");
|
|
return false;
|
|
}
|
|
if (!whitelistManager->Reload())
|
|
{
|
|
LogError("access", "failed to load dedicated server whitelist file");
|
|
return false;
|
|
}
|
|
|
|
std::vector<BannedPlayerEntry> playerEntries;
|
|
std::vector<BannedIpEntry> ipEntries;
|
|
std::vector<WhitelistedPlayerEntry> whitelistEntries;
|
|
banManager->SnapshotBannedPlayers(&playerEntries);
|
|
banManager->SnapshotBannedIps(&ipEntries);
|
|
whitelistManager->SnapshotWhitelistedPlayers(&whitelistEntries);
|
|
PublishBanManagerSnapshot(banManager);
|
|
PublishWhitelistManagerSnapshot(whitelistManager);
|
|
{
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
g_accessState.whitelistEnabled = whitelistEnabled;
|
|
}
|
|
|
|
LogInfof(
|
|
"access",
|
|
"loaded %u player bans, %u ip bans, and %u whitelist entries (whitelist=%s)",
|
|
(unsigned)playerEntries.size(),
|
|
(unsigned)ipEntries.size(),
|
|
(unsigned)whitelistEntries.size(),
|
|
whitelistEnabled ? "enabled" : "disabled");
|
|
return true;
|
|
}
|
|
|
|
void Shutdown()
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
PublishBanManagerSnapshot(std::shared_ptr<BanManager>{});
|
|
PublishWhitelistManagerSnapshot(std::shared_ptr<WhitelistManager>{});
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
g_accessState.whitelistEnabled = false;
|
|
}
|
|
|
|
bool Reload()
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
std::shared_ptr<BanManager> current = GetBanManagerSnapshot();
|
|
std::shared_ptr<WhitelistManager> currentWhitelist = GetWhitelistManagerSnapshot();
|
|
if (current == nullptr || currentWhitelist == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = std::make_shared<BanManager>(*current);
|
|
std::shared_ptr<WhitelistManager> whitelistManager = std::make_shared<WhitelistManager>(*currentWhitelist);
|
|
if (!banManager->EnsureBanFilesExist())
|
|
{
|
|
return false;
|
|
}
|
|
if (!whitelistManager->EnsureWhitelistFileExists())
|
|
{
|
|
return false;
|
|
}
|
|
if (!banManager->Reload())
|
|
{
|
|
return false;
|
|
}
|
|
if (!whitelistManager->Reload())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishBanManagerSnapshot(banManager);
|
|
PublishWhitelistManagerSnapshot(whitelistManager);
|
|
return true;
|
|
}
|
|
|
|
bool ReloadWhitelist()
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
const auto current = GetWhitelistManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
auto whitelistManager = std::make_shared<WhitelistManager>(*current);
|
|
if (!whitelistManager->EnsureWhitelistFileExists())
|
|
{
|
|
return false;
|
|
}
|
|
if (!whitelistManager->Reload())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishWhitelistManagerSnapshot(whitelistManager);
|
|
return true;
|
|
}
|
|
|
|
bool IsInitialized()
|
|
{
|
|
return GetBanManagerSnapshot() != nullptr && GetWhitelistManagerSnapshot() != nullptr;
|
|
}
|
|
|
|
bool IsWhitelistEnabled()
|
|
{
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
return g_accessState.whitelistEnabled;
|
|
}
|
|
|
|
void SetWhitelistEnabled(bool enabled)
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
std::lock_guard<std::mutex> stateLock(g_accessState.stateLock);
|
|
g_accessState.whitelistEnabled = enabled;
|
|
}
|
|
|
|
bool IsPlayerBanned(PlayerUID xuid)
|
|
{
|
|
const std::string formatted = FormatXuid(xuid);
|
|
if (formatted.empty())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = GetBanManagerSnapshot();
|
|
return (banManager != nullptr) ? banManager->IsPlayerBannedByXuid(formatted) : false;
|
|
}
|
|
|
|
bool IsIpBanned(const std::string &ip)
|
|
{
|
|
std::shared_ptr<BanManager> banManager = GetBanManagerSnapshot();
|
|
return (banManager != nullptr) ? banManager->IsIpBanned(ip) : false;
|
|
}
|
|
|
|
bool IsPlayerWhitelisted(PlayerUID xuid)
|
|
{
|
|
const std::string formatted = FormatXuid(xuid);
|
|
if (formatted.empty())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<WhitelistManager> whitelistManager = GetWhitelistManagerSnapshot();
|
|
return (whitelistManager != nullptr) ? whitelistManager->IsPlayerWhitelistedByXuid(formatted) : false;
|
|
}
|
|
|
|
bool AddPlayerBan(PlayerUID xuid, const std::string &name, const BanMetadata &metadata)
|
|
{
|
|
const std::string formatted = FormatXuid(xuid);
|
|
if (formatted.empty())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
std::shared_ptr<BanManager> current = GetBanManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = std::make_shared<BanManager>(*current);
|
|
BannedPlayerEntry entry;
|
|
entry.xuid = formatted;
|
|
entry.name = name;
|
|
entry.metadata = metadata;
|
|
if (!banManager->AddPlayerBan(entry))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishBanManagerSnapshot(banManager);
|
|
return true;
|
|
}
|
|
|
|
bool AddIpBan(const std::string &ip, const BanMetadata &metadata)
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
std::shared_ptr<BanManager> current = GetBanManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = std::make_shared<BanManager>(*current);
|
|
BannedIpEntry entry;
|
|
entry.ip = ip;
|
|
entry.metadata = metadata;
|
|
if (!banManager->AddIpBan(entry))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishBanManagerSnapshot(banManager);
|
|
return true;
|
|
}
|
|
|
|
bool RemovePlayerBan(PlayerUID xuid)
|
|
{
|
|
const std::string formatted = FormatXuid(xuid);
|
|
if (formatted.empty())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
std::shared_ptr<BanManager> current = GetBanManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = std::make_shared<BanManager>(*current);
|
|
if (!banManager->RemovePlayerBanByXuid(formatted))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishBanManagerSnapshot(banManager);
|
|
return true;
|
|
}
|
|
|
|
bool RemoveIpBan(const std::string &ip)
|
|
{
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
std::shared_ptr<BanManager> current = GetBanManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = std::make_shared<BanManager>(*current);
|
|
if (!banManager->RemoveIpBan(ip))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishBanManagerSnapshot(banManager);
|
|
return true;
|
|
}
|
|
|
|
bool AddWhitelistedPlayer(PlayerUID xuid, const std::string &name, const WhitelistMetadata &metadata)
|
|
{
|
|
const auto formatted = FormatXuid(xuid);
|
|
if (formatted.empty())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
const auto current = GetWhitelistManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
auto whitelistManager = std::make_shared<WhitelistManager>(*current);
|
|
const WhitelistedPlayerEntry entry = { formatted, name, metadata };
|
|
if (!whitelistManager->AddPlayer(entry))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishWhitelistManagerSnapshot(whitelistManager);
|
|
return true;
|
|
}
|
|
|
|
bool RemoveWhitelistedPlayer(PlayerUID xuid)
|
|
{
|
|
const auto formatted = FormatXuid(xuid);
|
|
if (formatted.empty())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::lock_guard<std::mutex> writeLock(g_accessState.writeLock);
|
|
const auto current = GetWhitelistManagerSnapshot();
|
|
if (current == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
auto whitelistManager = std::make_shared<WhitelistManager>(*current);
|
|
if (!whitelistManager->RemovePlayerByXuid(formatted))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
PublishWhitelistManagerSnapshot(whitelistManager);
|
|
return true;
|
|
}
|
|
|
|
bool SnapshotBannedPlayers(std::vector<BannedPlayerEntry> *outEntries)
|
|
{
|
|
if (outEntries == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = GetBanManagerSnapshot();
|
|
if (banManager == nullptr)
|
|
{
|
|
outEntries->clear();
|
|
return false;
|
|
}
|
|
|
|
return banManager->SnapshotBannedPlayers(outEntries);
|
|
}
|
|
|
|
bool SnapshotBannedIps(std::vector<BannedIpEntry> *outEntries)
|
|
{
|
|
if (outEntries == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::shared_ptr<BanManager> banManager = GetBanManagerSnapshot();
|
|
if (banManager == nullptr)
|
|
{
|
|
outEntries->clear();
|
|
return false;
|
|
}
|
|
|
|
return banManager->SnapshotBannedIps(outEntries);
|
|
}
|
|
|
|
bool SnapshotWhitelistedPlayers(std::vector<WhitelistedPlayerEntry> *outEntries)
|
|
{
|
|
if (outEntries == nullptr)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
const auto whitelistManager = GetWhitelistManagerSnapshot();
|
|
if (whitelistManager == nullptr)
|
|
{
|
|
outEntries->clear();
|
|
return false;
|
|
}
|
|
|
|
return whitelistManager->SnapshotWhitelistedPlayers(outEntries);
|
|
}
|
|
}
|
|
}
|