#include "stdafx.h" #include "CliCommandPardonIp.h" #include "..\ServerCliEngine.h" #include "..\ServerCliParser.h" #include "..\..\Access\Access.h" #include "..\..\Common\StringUtils.h" #include namespace ServerRuntime { namespace { // Keep validation shared with ban-ip so both commands agree on what counts as a literal address. static bool IsIpLiteral(const std::string &text) { const std::string trimmed = StringUtils::TrimAscii(text); if (trimmed.empty()) { return false; } IN_ADDR ipv4 = {}; IN6_ADDR ipv6 = {}; return InetPtonA(AF_INET, trimmed.c_str(), &ipv4) == 1 || InetPtonA(AF_INET6, trimmed.c_str(), &ipv6) == 1; } } const char *CliCommandPardonIp::Name() const { return "pardon-ip"; } const char *CliCommandPardonIp::Usage() const { return "pardon-ip
"; } const char *CliCommandPardonIp::Description() const { return "Remove an IP ban."; } /** * Validates the literal IP argument and removes the matching Access IP ban entry * リテラルIPを検証して一致するIP BANを解除する */ bool CliCommandPardonIp::Execute(const ServerCliParsedLine &line, ServerCliEngine *engine) { if (line.tokens.size() != 2) { engine->LogWarn("Usage: pardon-ip
"); return false; } if (!ServerRuntime::Access::IsInitialized()) { engine->LogWarn("Access manager is not initialized."); return false; } // Java Edition pardon-ip only operates on a literal address, so do not resolve player names here. const std::string ip = StringUtils::TrimAscii(line.tokens[1]); if (!IsIpLiteral(ip)) { engine->LogWarn("Invalid IP address: " + line.tokens[1]); return false; } // Distinguish invalid input from a valid but currently unbanned address for clearer operator feedback. if (!ServerRuntime::Access::IsIpBanned(ip)) { engine->LogWarn("That IP address is not banned."); return false; } if (!ServerRuntime::Access::RemoveIpBan(ip)) { engine->LogError("Failed to remove IP ban."); return false; } engine->LogInfo("Unbanned IP address " + ip + "."); return true; } /** * Suggests currently banned IP addresses for the Java Edition literal-IP argument * BAN済みIPの補完候補を返す */ void CliCommandPardonIp::Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const { (void)engine; // Complete from the persisted IP-ban snapshot because this command only accepts already-banned literals. if (context.currentTokenIndex != 1 || out == NULL) { return; } std::vector entries; if (!ServerRuntime::Access::SnapshotBannedIps(&entries)) { return; } // Reuse the normalized prefix match used by other commands so completion stays case-insensitive. const std::string loweredPrefix = StringUtils::ToLowerAscii(context.prefix); for (size_t i = 0; i < entries.size(); ++i) { const std::string candidate = entries[i].ip; if (StringUtils::ToLowerAscii(candidate).compare(0, loweredPrefix.size(), loweredPrefix) == 0) { out->push_back(context.linePrefix + candidate); } } } }