BUGFIX:

- Missing node annotation for remote audit() call

Author: karel26

services/bot/dcsserverbot.py

@@ -1,7 +1,7 @@
 import asyncio
 import discord
 
-from core import Channel, utils, Status, PluginError, Group, DEFAULT_PLUGINS
+from core import Channel, utils, Status, PluginError, Group, Node, DEFAULT_PLUGINS
 from core.data.node import FatalException
 from core.listener import EventListener
 from core.services.registry import ServiceRegistry
@@ -310,7 +310,7 @@ async def reload(self, plugin: Optional[str] = None) -> bool:
             return rc
 
     async def audit(self, message, *, user: Optional[Union[discord.Member, str]] = None,
-                    server: Optional["Server"] = None, **kwargs):
+                    server: Optional["Server"] = None, node: Optional[Node] = None, **kwargs):
         if not self.audit_channel:
             self.audit_channel = self.get_channel(self.locals.get('channels', {}).get('audit', -1))
         if self.audit_channel:
@@ -337,6 +337,8 @@ async def audit(self, message, *, user: Optional[Union[discord.Member, str]] = N
                 embed.add_field(name='UCID', value=user)
             if server:
                 embed.add_field(name='Server', value=server.display_name)
+            if not node:
+                node = self.node
             if kwargs:
                 for name, value in kwargs.items():
                     embed.add_field(name=name.title(), value=value, inline=False)
@@ -347,7 +349,7 @@ async def audit(self, message, *, user: Optional[Union[discord.Member, str]] = N
                 await conn.execute("""
                     INSERT INTO audit (node, event, server_name, discord_id, ucid)
                     VALUES (%s, %s, %s, %s, %s)
-                """, (self.node.name, message, server.name if server else None,
+                """, (node.name, message, server.name if server else None,
                       user.id if isinstance(user, discord.Member) else None,
                       user if isinstance(user, str) else None))
 

services/bot/service.py

@@ -6,8 +6,7 @@
 import zipfile
 
 from aiohttp import BasicAuth
-
-from core import utils, FatalException, Node
+from core import utils, FatalException
 from core.services.base import Service
 from core.services.registry import ServiceRegistry
 from discord.ext import commands
@@ -27,7 +26,7 @@
 yaml = YAML()
 
 if TYPE_CHECKING:
-    from core import Server, Plugin
+    from core import Server, Plugin, Node
 
 __all__ = ["BotService"]
 
@@ -98,17 +97,17 @@ def proxy_auth(self) -> Optional[BasicAuth]:
             return BasicAuth(username, password)
 
     def init_bot(self):
-        def get_prefix(client, message):
-            prefixes = [self.locals.get('command_prefix', '.')]
-            # Allow users to @mention the bot instead of using a prefix
-            return commands.when_mentioned_or(*prefixes)(client, message)
-
         if self.locals.get('no_discord', False):
             return DummyBot(version=self.node.bot_version,
                             sub_version=self.node.sub_version,
                             node=self.node,
                             locals=self.locals)
         else:
+            def get_prefix(client, message):
+                prefixes = [self.locals.get('command_prefix', '.')]
+                # Allow users to @mention the bot instead of using a prefix
+                return commands.when_mentioned_or(*prefixes)(client, message)
+
             # Create the Bot
             return DCSServerBot(version=self.node.bot_version,
                                 sub_version=self.node.sub_version,
@@ -132,7 +131,7 @@ async def start(self, *, reconnect: bool = True) -> None:
         try:
             self.bot = self.init_bot()
             await self.install_fonts()
-            await self.bot.login(self.token)
+            await self.bot.login(token=self.token)
             # noinspection PyAsyncCall
             asyncio.create_task(self.bot.connect(reconnect=reconnect))
         except Exception as ex:
@@ -204,8 +203,8 @@ async def send_message(self, channel: Optional[int] = -1, content: Optional[str]
         await _channel.send(content=content, file=file, embed=_embed)
 
     async def audit(self, message, user: Optional[Union[discord.Member, str]] = None,
-                    server: Optional[Server] = None, **kwargs):
-        await self.bot.audit(message, user=user, server=server, **kwargs)
+                    server: Optional[Server] = None, node: Optional[Node] = None, **kwargs):
+        await self.bot.audit(message, user=user, server=server, node=node, **kwargs)
 
     async def rename_server(self, server: Server, new_name: str):
         async with self.apool.connection() as conn:

services/servicebus/service.py

@@ -628,22 +628,29 @@ async def rpc(self, obj: object, data: dict) -> Optional[dict]:
             method_name = data['method']
             func = getattr(obj, method_name, None)
             if not func:
-                return None
+                raise ValueError(f"Call to non-existing function {method_name}()")
 
             kwargs = data.get('params', {}).copy()
 
             func_signature = None
             if callable(func):
                 func_signature = inspect.signature(func).parameters
 
+            # check function signature
+            invalid_keys = set(kwargs.keys()) - set(func_signature.keys())
+            if invalid_keys:
+                raise ValueError("RPC call {} onto non-matching function {}!".format(
+                    "{}({})".format(method_name, ','.join(kwargs.keys())),
+                    "{}({})".format(method_name, ','.join(func_signature.keys())))
+                )
+
             server_key = kwargs.get('server')
-            if server_key and func_signature and func_signature.get('server', None).annotation != 'str':
+            if server_key and func_signature and func_signature['server'].annotation != 'str':
                 kwargs['server'] = self.servers.get(server_key, None)
 
             instance_key = kwargs.get('instance')
-            if instance_key and func_signature and func_signature.get('instance', None).annotation != 'str':
-                instance_lookup = {inst.name: inst for inst in self.node.instances}
-                kwargs['instance'] = instance_lookup.get(instance_key, None)
+            if instance_key and func_signature and func_signature['instance'].annotation != 'str':
+                kwargs['instance'] = next((inst for inst in self.node.instances if inst.name == instance_key), None)
 
             # Handle master-specific mappings
             if self.master:
@@ -662,7 +669,7 @@ async def rpc(self, obj: object, data: dict) -> Optional[dict]:
                         kwargs['user'] = None
 
                 node_key = kwargs.get('node')
-                if node_key and func_signature and func_signature.get('node', None).annotation != 'str':
+                if node_key and func_signature and func_signature['node'].annotation != 'str':
                     kwargs['node'] = self.node.all_nodes.get(node_key, None)
 
             # Log performance and execute function