CHANGES:

- Mission: better messages for ban avoidance

Author: karel26

core/utils/os.py

@@ -313,30 +313,31 @@ def shouldRollover(self, record):
         return 0
 
 
+class SHELLEXECUTEINFO(ctypes.Structure):
+    _fields_ = [
+        ("cbSize", ctypes.c_ulong),
+        ("fMask", ctypes.c_ulong),
+        ("hwnd", ctypes.c_void_p),
+        ("lpVerb", ctypes.c_wchar_p),
+        ("lpFile", ctypes.c_wchar_p),
+        ("lpParameters", ctypes.c_wchar_p),
+        ("lpDirectory", ctypes.c_wchar_p),
+        ("nShow", ctypes.c_int),
+        ("hInstApp", ctypes.c_void_p),
+        ("lpIDList", ctypes.c_void_p),
+        ("lpClass", ctypes.c_wchar_p),
+        ("hkeyClass", ctypes.c_void_p),
+        ("dwHotKey", ctypes.c_ulong),
+        ("hIcon", ctypes.c_void_p),
+        ("hProcess", ctypes.c_void_p),
+    ]
+
+
 def run_elevated(exe_path, cwd, *args):
     """Start *exe_path* as Administrator and return the return code."""
     if sys.platform != 'win32':
         return -1
 
-    class SHELLEXECUTEINFO(ctypes.Structure):
-        _fields_ = [
-            ("cbSize", ctypes.c_ulong),
-            ("fMask", ctypes.c_ulong),
-            ("hwnd", ctypes.c_void_p),
-            ("lpVerb", ctypes.c_wchar_p),
-            ("lpFile", ctypes.c_wchar_p),
-            ("lpParameters", ctypes.c_wchar_p),
-            ("lpDirectory", ctypes.c_wchar_p),
-            ("nShow", ctypes.c_int),
-            ("hInstApp", ctypes.c_void_p),
-            ("lpIDList", ctypes.c_void_p),
-            ("lpClass", ctypes.c_wchar_p),
-            ("hkeyClass", ctypes.c_void_p),
-            ("dwHotKey", ctypes.c_ulong),
-            ("hIcon", ctypes.c_void_p),
-            ("hProcess", ctypes.c_void_p),
-        ]
-
     sei = SHELLEXECUTEINFO()
     sei.cbSize = ctypes.sizeof(sei)
     sei.fMask  = SEE_MASK_NOCLOSEPROCESS

plugins/mission/commands.py

@@ -2278,8 +2278,12 @@ async def on_interaction(self, interaction: discord.Interaction):
                 # noinspection PyUnresolvedReferences
                 await interaction.response.edit_message(view=None)
             elif custom_id.startswith('ban_'):
-                ucid = custom_id[len('ban_'):]
-                await self.bus.ban(ucid, interaction.user.display_name, _("Inappropriate nickname"))
+                if custom_id.startswith('ban_profanity_'):
+                    ucid = custom_id[len('ban_profanity_'):]
+                    await self.bus.ban(ucid, interaction.user.display_name, _("Inappropriate nickname"))
+                elif custom_id.startswith('ban_evade_'):
+                    ucid = custom_id[len('ban_evade_'):]
+                    await self.bus.ban(ucid, interaction.user.display_name, _("Trying to evade a ban with a 2nd account."))
                 # noinspection PyUnresolvedReferences
                 await interaction.response.edit_message(view=None)
             elif custom_id == 'cancel':

plugins/mission/listener.py

@@ -8,15 +8,16 @@
 from core import utils, EventListener, PersistentReport, Plugin, Report, Status, Side, Player, Coalition, \
     Channel, DataObjectFactory, event, chat_command, ServiceRegistry, ChatCommand, get_translation
 from datetime import datetime, timezone
+from discord import ButtonStyle
 from discord.ext import tasks
+from discord.ui import View, Button
 from pathlib import Path
 from psycopg.rows import dict_row
 from services.servicebus import ServiceBus
 from services.bot.dummy import DummyBot
 from typing import TYPE_CHECKING, Callable, Coroutine
 
 from .menu import read_menu_config, filter_menu
-from .views import ProfanityView
 
 if TYPE_CHECKING:
     from core import Server
@@ -654,7 +655,49 @@ async def onCensoredPlayerName(self, server: Server, data: dict) -> None:
         else:
             message = _("User {} (ucid={})\nPotentially inappropriate nickname.").format(
                 data['name'], data['ucid'])
-        view = ProfanityView(ucid=data['ucid'], name=data['name'])
+
+        view = View(timeout=None)
+        # noinspection PyTypeChecker
+        button = Button(label="Whitelist", style=ButtonStyle.primary, custom_id=f"whitelist_{data['name']}")
+        view.add_item(button)
+        # noinspection PyTypeChecker
+        button = Button(label="Ban", style=ButtonStyle.red, custom_id=f"ban_profanity_{data['ucid']}")
+        view.add_item(button)
+        # noinspection PyTypeChecker
+        button = Button(label="Cancel", style=ButtonStyle.secondary, custom_id=f"cancel")
+        view.add_item(button)
+        await admin_channel.send(f"```{message}```", view=view)
+
+    @event(name="onBanReject")
+    async def onBanReject(self, server: Server, data: dict) -> None:
+        admin_channel = self.bot.get_admin_channel(server)
+        if not admin_channel:
+            return
+        message = _('Banned user {name} (ucid={ucid}, ipaddr={ipaddr}) rejected. Reason: {reason}').format(
+            name=data['name'], ucid=data['ucid'], ipaddr=data['ipaddr'], reason=data['reason'])
+        await admin_channel.send(f"```{message}```")
+
+    @event(name="onBanEvade")
+    async def onBanEvade(self, server: Server, data: dict) -> None:
+        admin_channel = self.bot.get_admin_channel(server)
+        if not admin_channel:
+            return
+        old_name = await self.bot.get_member_or_name_by_ucid(data['old_ucid'])
+        if isinstance(old_name, discord.Member):
+            old_name = old_name.display_name
+
+        message = _('Player {name} (ucid={ucid}) connected from the same IP (ipaddr={ipaddr}) '
+                    'as banned player {old_name} (ucid={old_ucid}), who was banned for {reason}!').format(
+            name=data['name'], ucid=data['ucid'], ipaddr=data['ipaddr'], old_name=old_name,
+            old_ucid=data['old_ucid'], reason=data['reason']
+        )
+        view = View(timeout=None)
+        # noinspection PyTypeChecker
+        button = Button(label="Ban", style=ButtonStyle.red, custom_id=f"ban_evade_{data['ucid']}")
+        view.add_item(button)
+        # noinspection PyTypeChecker
+        button = Button(label="Cancel", style=ButtonStyle.secondary, custom_id=f"cancel")
+        view.add_item(button)
         await admin_channel.send(f"```{message}```", view=view)
 
     async def _stop_player(self, server: Server, player: Player):

plugins/mission/lua/callbacks.lua

@@ -125,17 +125,21 @@ function mission.onPlayerTryConnect(addr, name, ucid, playerID)
             log.write('DCSServerBot', log.DEBUG, 'Mission: Smart Bans disabled')
         end
         local msg = {
-            command = 'sendMessage',
-            message = 'Banned user ' .. name .. ' (ucid=' .. ucid .. ', ipaddr=' .. ipaddr .. ') rejected. Reason: ' .. dcsbot.banList[ucid]
+            command = 'onBanReject',
+            ucid = ucid,
+            ipaddr = ipaddr,
+            reason = dcsbot.banList[ucid]
         }
         utils.sendBotTable(msg, config.channels.admin)
         return false, string.gsub(config['messages']['message_ban'], "{}", dcsbot.banList[ucid])
     elseif isBanned(ipaddr) and dcsbot.banList[dcsbot.banList[ipaddr]] then
         local old_ucid = dcsbot.banList[ipaddr]
         local msg = {
-            command = 'sendMessage',
-            message = 'Player ' .. name .. ' (ucid=' .. ucid .. ') connected from the same IP (ipaddr=' .. ipaddr .. ') as banned player (ucid=' .. old_ucid .. '), who was banned for ' .. dcsbot.banList[old_ucid] ..'!',
-            mention = 'DCS Admin'
+            command = 'onBanEvade',
+            ucid = ucid,
+            ipaddr = ipaddr,
+            old_ucid = old_ucid,
+            reason = dcsbot.banList[old_ucid]
         }
         utils.sendBotTable(msg, config.channels.admin)
         return false, string.gsub(config.messages.message_ban, "{}", dcsbot.banList[old_ucid])
@@ -152,7 +156,7 @@ function mission.onPlayerTryConnect(addr, name, ucid, playerID)
                 ucid = ucid,
                 name = name
             }
-            utils.sendBotTable(msg, config.channels.admin)
+            utils.sendBotTable(msg)
             if config.no_join_with_cursename then
                 return false, config.messages.message_player_inappropriate_username
             end

plugins/mission/views.py

@@ -3,16 +3,14 @@
 import os
 
 from contextlib import suppress
-from core import Server, Report, Status, ReportEnv, Player, Member, DataObjectFactory, utils, ServiceRegistry, \
-    get_translation
+from core import Server, Report, Status, ReportEnv, Player, Member, DataObjectFactory, utils, get_translation
 from discord import SelectOption, ButtonStyle
-from discord.ui import View, Select, Button, Modal, TextInput
+from discord.ui import View, Select, Button
 from io import StringIO
 from ruamel.yaml import YAML
 from typing import cast
 
-from services.bot import DCSServerBot, BotService
-from services.servicebus import ServiceBus
+from services.bot import DCSServerBot
 
 WARNING_ICON = "https://github.com/Special-K-s-Flightsim-Bots/DCSServerBot/blob/master/images/warning.png?raw=true"
 _ = get_translation(__name__.split('.')[1])
@@ -462,17 +460,3 @@ async def cancel(self, interaction: discord.Interaction):
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
         self.stop()
-
-
-class ProfanityView(View):
-    def __init__(self, ucid: str, name: str):
-        super().__init__(timeout=None)
-        # noinspection PyTypeChecker
-        button = Button(label="Whitelist", style=ButtonStyle.primary, custom_id=f"whitelist_{name}")
-        self.add_item(button)
-        # noinspection PyTypeChecker
-        button = Button(label="Ban", style=ButtonStyle.red, custom_id=f"ban_{ucid}")
-        self.add_item(button)
-        # noinspection PyTypeChecker
-        button = Button(label="Cancel", style=ButtonStyle.secondary, custom_id=f"cancel")
-        self.add_item(button)