feat: add Server::getIpBanList

EndstoneMC · Dec 22, 2024 · 2ac388f · 2ac388f
1 parent 17b255e
commit 2ac388f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/include/endstone/detail/server.h b/include/endstone/detail/server.h
@@ -21,6 +21,7 @@
 #include "bedrock/resources/resource_pack_repository_interface.h"
 #include "bedrock/server/server_instance.h"
 #include "endstone/command/console_command_sender.h"
+#include "endstone/detail/ban/ip_ban_list.h"
 #include "endstone/detail/ban/player_ban_list.h"
 #include "endstone/detail/command/command_map.h"
 #include "endstone/detail/lang/language.h"
@@ -105,6 +106,7 @@ class EndstoneServer : public Server {
     [[nodiscard]] Result<std::shared_ptr<BlockData>> createBlockData(std::string type,
                                                                      BlockStates block_states) const override;
     [[nodiscard]] PlayerBanList &getBanList() const override;
+    [[nodiscard]] IpBanList &getIpBanList() const override;
 
     [[nodiscard]] EndstoneScoreboard &getPlayerBoard(const EndstonePlayer &player) const;
     void setPlayerBoard(EndstonePlayer &player, Scoreboard &scoreboard);
@@ -122,6 +124,7 @@ class EndstoneServer : public Server {
     ServerInstance *server_instance_;
     Logger &logger_;
     std::unique_ptr<EndstonePlayerBanList> player_ban_list_;
+    std::unique_ptr<EndstoneIpBanList> ip_ban_list_;
     std::unique_ptr<EndstoneLanguage> language_;
     std::unique_ptr<EndstoneCommandMap> command_map_;
     std::unique_ptr<EndstonePluginManager> plugin_manager_;

diff --git a/include/endstone/server.h b/include/endstone/server.h
@@ -20,6 +20,7 @@
 #include <string_view>
 #include <vector>
 
+#include "endstone/ban/ip_ban_list.h"
 #include "endstone/ban/player_ban_list.h"
 #include "endstone/block/block_data.h"
 #include "endstone/boss/boss_bar.h"
@@ -340,6 +341,13 @@ class Server {
      */
     [[nodiscard]] virtual PlayerBanList &getBanList() const = 0;
 
+    /**
+     * Gets the IP ban list.
+     *
+     * @return The IP ban list
+     */
+    [[nodiscard]] virtual IpBanList &getIpBanList() const = 0;
+
     /**
      * @brief Used for all administrative messages, such as an operator using a command.
      */

diff --git a/src/endstone_core/server.cpp b/src/endstone_core/server.cpp
@@ -56,6 +56,7 @@ EndstoneServer::EndstoneServer() : logger_(LoggerFactory::getLogger("Server"))
     register_signal_handler();
 
     player_ban_list_ = std::make_unique<EndstonePlayerBanList>("banned-players.json");
+    ip_ban_list_ = std::make_unique<EndstoneIpBanList>("banned-ips.json");
     language_ = std::make_unique<EndstoneLanguage>();
     plugin_manager_ = std::make_unique<EndstonePluginManager>(*this);
     scheduler_ = std::make_unique<EndstoneScheduler>(*this);
@@ -70,6 +71,7 @@ void EndstoneServer::init(ServerInstance &server_instance)
                      getName(), getVersion(), getMinecraftVersion());
     command_sender_ = EndstoneConsoleCommandSender::create();
     player_ban_list_->load();
+    ip_ban_list_->load();
 }
 
 EndstonePackSource &EndstoneServer::createResourcePackSource(Bedrock::NotNullNonOwnerPtr<IResourcePackRepository> repo)
@@ -447,6 +449,10 @@ PlayerBanList &EndstoneServer::getBanList() const
 {
     return *player_ban_list_;
 }
+IpBanList &EndstoneServer::getIpBanList() const
+{
+    return *ip_ban_list_;
+}
 
 EndstoneScoreboard &EndstoneServer::getPlayerBoard(const EndstonePlayer &player) const
 {

diff --git a/tests/plugin/test_cpp_plugin_loader.cpp b/tests/plugin/test_cpp_plugin_loader.cpp
@@ -71,6 +71,7 @@ class MockServer : public endstone::Server {
     MOCK_METHOD(endstone::Result<std::shared_ptr<endstone::BlockData>>, createBlockData,
                 (std::string, endstone::BlockStates), (const, override));
     MOCK_METHOD(endstone::PlayerBanList &, getBanList, (), (const, override));
+    MOCK_METHOD(endstone::IpBanList &, getIpBanList, (), (const, override));
 
     MockServer()
     {

diff --git a/tests/scheduler/test_scheduler.cpp b/tests/scheduler/test_scheduler.cpp
@@ -67,6 +67,7 @@ class MockServer : public endstone::Server {
     MOCK_METHOD(endstone::Result<std::shared_ptr<endstone::BlockData>>, createBlockData,
                 (std::string, endstone::BlockStates), (const, override));
     MOCK_METHOD(endstone::PlayerBanList &, getBanList, (), (const, override));
+    MOCK_METHOD(endstone::IpBanList &, getIpBanList, (), (const, override));
 };
 
 class MockPlugin : public endstone::Plugin {