From fce5827c7d8ef2a4ce5c6d08aef16b64f823c90e Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Thu, 9 May 2019 13:09:50 +0800
Subject: [PATCH] Allow using empty ban table name to disable its functionality

---
 src/network/protocols/server_lobby.cpp | 100 +++++++++++++------------
 src/network/server_config.hpp          |   4 +-
 2 files changed, 56 insertions(+), 48 deletions(-)

diff --git a/src/network/protocols/server_lobby.cpp b/src/network/protocols/server_lobby.cpp
index c9161f882..4492d080c 100644
--- a/src/network/protocols/server_lobby.cpp
+++ b/src/network/protocols/server_lobby.cpp
@@ -186,71 +186,79 @@ void ServerLobby::initDatabase()
         return;
     }
 
-    std::string query = StringUtils::insertValues(
-        "SELECT count(type) FROM sqlite_master "
-        "WHERE type='table' AND name='%s';",
-        ServerConfig::m_ip_ban_table.c_str());
-
-    ret = sqlite3_prepare_v2(m_db, query.c_str(), -1, &stmt, 0);
-    if (ret == SQLITE_OK)
+    const std::string ip_ban_table = ServerConfig::m_ip_ban_table;
+    if (!ip_ban_table.empty())
     {
-        ret = sqlite3_step(stmt);
-        if (ret == SQLITE_ROW)
+        std::string query = StringUtils::insertValues(
+            "SELECT count(type) FROM sqlite_master "
+            "WHERE type='table' AND name='%s';", ip_ban_table.c_str());
+
+        ret = sqlite3_prepare_v2(m_db, query.c_str(), -1, &stmt, 0);
+        if (ret == SQLITE_OK)
         {
-            int number = sqlite3_column_int(stmt, 0);
-            if (number == 1)
+            ret = sqlite3_step(stmt);
+            if (ret == SQLITE_ROW)
             {
-                Log::info("ServerLobby", "%s ip ban table will used.",
-                    ServerConfig::m_ip_ban_table.c_str());
-                m_ip_ban_table_exists = true;
+                int number = sqlite3_column_int(stmt, 0);
+                if (number == 1)
+                {
+                    Log::info("ServerLobby", "%s ip ban table will used.",
+                        ip_ban_table.c_str());
+                    m_ip_ban_table_exists = true;
+                }
+            }
+            ret = sqlite3_finalize(stmt);
+            if (ret != SQLITE_OK)
+            {
+                Log::error("ServerLobby",
+                    "Error finalize database for query %s: %s", query.c_str(),
+                    sqlite3_errmsg(m_db));
             }
         }
-        ret = sqlite3_finalize(stmt);
-        if (ret != SQLITE_OK)
-        {
-            Log::error("ServerLobby",
-                "Error finalize database for query %s: %s", query.c_str(),
-                sqlite3_errmsg(m_db));
-        }
     }
-    if (!m_ip_ban_table_exists)
+    if (!m_ip_ban_table_exists && !ip_ban_table.empty())
     {
         Log::warn("ServerLobby", "%s ip ban table not found in database.",
-            ServerConfig::m_ip_ban_table.c_str());
+            ip_ban_table.c_str());
     }
 
-    query = StringUtils::insertValues(
-        "SELECT count(type) FROM sqlite_master "
-        "WHERE type='table' AND name='%s';",
-        ServerConfig::m_online_id_ban_table.c_str());
-
-    ret = sqlite3_prepare_v2(m_db, query.c_str(), -1, &stmt, 0);
-    if (ret == SQLITE_OK)
+    const std::string online_id_ban_table =
+        ServerConfig::m_online_id_ban_table;
+    if (!online_id_ban_table.empty())
     {
-        ret = sqlite3_step(stmt);
-        if (ret == SQLITE_ROW)
+        std::string query = StringUtils::insertValues(
+            "SELECT count(type) FROM sqlite_master "
+            "WHERE type='table' AND name='%s';", online_id_ban_table.c_str());
+
+        int ret = sqlite3_prepare_v2(m_db, query.c_str(), -1, &stmt, 0);
+        if (ret == SQLITE_OK)
         {
-            int number = sqlite3_column_int(stmt, 0);
-            if (number == 1)
+            ret = sqlite3_step(stmt);
+            if (ret == SQLITE_ROW)
             {
-                Log::info("ServerLobby", "%s online id ban table will used.",
-                    ServerConfig::m_online_id_ban_table.c_str());
-                m_online_id_ban_table_exists = true;
+                int number = sqlite3_column_int(stmt, 0);
+                if (number == 1)
+                {
+                    Log::info("ServerLobby",
+                        "%s online id ban table will used.",
+                        online_id_ban_table.c_str());
+                    m_online_id_ban_table_exists = true;
+                }
+            }
+            ret = sqlite3_finalize(stmt);
+            if (ret != SQLITE_OK)
+            {
+                Log::error("ServerLobby",
+                    "Error finalize database for query %s: %s",
+                    query.c_str(), sqlite3_errmsg(m_db));
             }
         }
-        ret = sqlite3_finalize(stmt);
-        if (ret != SQLITE_OK)
-        {
-            Log::error("ServerLobby",
-                "Error finalize database for query %s: %s",
-                query.c_str(), sqlite3_errmsg(m_db));
-        }
     }
-    if (!m_online_id_ban_table_exists)
+    if (!m_online_id_ban_table_exists && !online_id_ban_table.empty())
     {
         Log::warn("ServerLobby",
             "%s online id ban table not found in database.",
-            ServerConfig::m_online_id_ban_table.c_str());
+            online_id_ban_table.c_str());
     }
 #endif
 }   // initDatabase
diff --git a/src/network/server_config.hpp b/src/network/server_config.hpp
index 22d52a86a..2ac3434ea 100644
--- a/src/network/server_config.hpp
+++ b/src/network/server_config.hpp
@@ -337,13 +337,13 @@ namespace ServerConfig
         SERVER_CFG_DEFAULT(StringServerConfigParam("ipban",
         "ip-ban-table",
         "Ip ban list table name, you need to create the table first, see "
-        "NETWORKING.md for details."));
+        "NETWORKING.md for details, empty to disable."));
 
     SERVER_CFG_PREFIX StringServerConfigParam m_online_id_ban_table
         SERVER_CFG_DEFAULT(StringServerConfigParam("onlineidban",
         "online-id-ban-table",
         "Online ID ban list table name, you need to create the table first, "
-        "see NETWORKING.md for details."));
+        "see NETWORKING.md for details, empty to disable."));
 
     // ========================================================================
     /** Server version, will be advanced if there are protocol changes. */