CHANGES:

- ModManager: only restrict RootFolder-mods, if restrict_commands is enabled.

Author: karel26

core/utils/discord.py

@@ -47,7 +47,8 @@
     "app_has_not_roles",
     "app_has_dcs_version",
     "cmd_has_roles",
-    "restricted",
+    "is_restricted",
+    "restricted_check",
     "get_role_ids",
     "format_embed",
     "embed_to_text",
@@ -485,9 +486,11 @@ async def wrapper(interaction: Interaction):
     return cmd_has_roles
 
 
-def restricted(interaction: discord.Interaction) -> bool:
-    return not interaction.client.node.locals.get('restrict_commands', False)
+def is_restricted(interaction: discord.Interaction) -> bool:
+    return interaction.client.node.locals.get('restrict_commands', False)
 
+def restricted_check(interaction: discord.Interaction) -> bool:
+    return not is_restricted(interaction)
 
 def get_role_ids(plugin: Plugin, role_names) -> list[int]:
     role_ids = []

plugins/admin/commands.py

@@ -372,7 +372,7 @@ async def bans(self, interaction: discord.Interaction, user: str):
 
     @dcs.command(description=_('Update your DCS installations'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     @app_commands.describe(warn_time=_("Time in seconds to warn users before shutdown"))
     @app_commands.autocomplete(branch=get_dcs_branches)
@@ -452,7 +452,7 @@ async def update(self, interaction: discord.Interaction,
 
     @dcs.command(description=_('Repair your DCS installations'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     @app_commands.describe(warn_time=_("Time in seconds to warn users before shutdown"))
     async def repair(self, interaction: discord.Interaction,
@@ -498,7 +498,7 @@ async def repair(self, interaction: discord.Interaction,
 
     @dcs.command(name='install', description=_('Install modules in your DCS server'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     @app_commands.autocomplete(module=available_modules_autocomplete)
     async def _install(self, interaction: discord.Interaction,
@@ -521,7 +521,7 @@ async def _install(self, interaction: discord.Interaction,
 
     @dcs.command(name='uninstall', description=_('Uninstall modules from your DCS server'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     @app_commands.autocomplete(module=installed_modules_autocomplete)
     async def _uninstall(self, interaction: discord.Interaction,
@@ -825,7 +825,7 @@ async def run_on_nodes(self, interaction: discord.Interaction, method: str, node
 
     @node_group.command(description=_('Shuts a specific node down'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def shutdown(self, interaction: discord.Interaction,
                        node: Optional[app_commands.Transform[Node, utils.NodeTransformer]] = None):
@@ -836,7 +836,7 @@ async def shutdown(self, interaction: discord.Interaction,
 
     @node_group.command(description=_('Restarts a specific node'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def restart(self, interaction: discord.Interaction,
                       node: Optional[app_commands.Transform[Node, utils.NodeTransformer]] = None):
@@ -932,7 +932,7 @@ async def _node_online(node_name: str):
 
     @node_group.command(description=_('Upgrade DCSServerBot'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def upgrade(self, interaction: discord.Interaction,
                       node: Optional[app_commands.Transform[Node, utils.NodeTransformer]] = None):
@@ -958,7 +958,7 @@ async def upgrade(self, interaction: discord.Interaction,
 
     @node_group.command(description=_('Run a shell command on a node'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def shell(self, interaction: discord.Interaction,
                     node: app_commands.Transform[Node, utils.NodeTransformer],
@@ -982,7 +982,7 @@ async def shell(self, interaction: discord.Interaction,
 
     @node_group.command(description=_("Add/create an instance\n"))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     @app_commands.autocomplete(name=utils.InstanceTransformer(unused=True).autocomplete)
     @app_commands.describe(name=_("Either select an existing instance or enter the name of a new one"))
@@ -1038,7 +1038,7 @@ async def add_instance(self, interaction: discord.Interaction,
 
     @node_group.command(description=_("Delete an instance\n"))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def delete_instance(self, interaction: discord.Interaction,
                               node: app_commands.Transform[Node, utils.NodeTransformer],
@@ -1076,7 +1076,7 @@ async def delete_instance(self, interaction: discord.Interaction,
 
     @node_group.command(description=_("Rename an instance\n"))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def rename_instance(self, interaction: discord.Interaction,
                               node: app_commands.Transform[Node, utils.NodeTransformer],
@@ -1119,7 +1119,7 @@ async def rename_instance(self, interaction: discord.Interaction,
 
     @node_group.command(description=_("Shows CPU topology"))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @app_commands.check(lambda interaction: sys.platform == 'win32')
     @utils.app_has_role('Admin')
     async def cpuinfo(self, interaction: discord.Interaction,
@@ -1133,7 +1133,7 @@ async def cpuinfo(self, interaction: discord.Interaction,
 
     @plug.command(name='install', description=_("Install Plugin"))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @app_commands.autocomplete(plugin=installable_plugins)
     @utils.app_has_role('Admin')
     async def _install(self, interaction: discord.Interaction, plugin: str):
@@ -1151,7 +1151,7 @@ async def _install(self, interaction: discord.Interaction, plugin: str):
 
     @plug.command(name='uninstall', description=_("Uninstall Plugin"))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @app_commands.autocomplete(plugin=uninstallable_plugins)
     @utils.app_has_role('Admin')
     async def _uninstall(self, interaction: discord.Interaction, plugin: str):
@@ -1169,7 +1169,7 @@ async def _uninstall(self, interaction: discord.Interaction, plugin: str):
 
     @plug.command(description=_('Reload Plugin'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     @app_commands.autocomplete(plugin=plugins_autocomplete)
     async def reload(self, interaction: discord.Interaction, plugin: Optional[str]):

plugins/backup/commands.py

@@ -72,7 +72,7 @@ def read_locals(self) -> dict:
 
     @command(description=_('Backup your data'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     @app_commands.autocomplete(what=backup_autocomplete)
     async def backup(self, interaction: discord.Interaction, node: app_commands.Transform[Node, utils.NodeTransformer],
@@ -96,7 +96,7 @@ async def backup(self, interaction: discord.Interaction, node: app_commands.Tran
 
     @command(description=_('Recover your data from an existing backup'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     @app_commands.autocomplete(what=backup_autocomplete)
     @app_commands.autocomplete(date=date_autocomplete)

plugins/lotatc/commands.py

@@ -68,7 +68,7 @@ async def get_server(self, message: discord.Message) -> Optional[Server]:
 
     @lotatc.command(description=_('Update LotAtc'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     async def update(self, interaction: discord.Interaction,
                      server: app_commands.Transform[Server, utils.ServerTransformer(
@@ -126,7 +126,7 @@ async def _configure(self, interaction: discord.Interaction,
 
     @lotatc.command(description=_('Configure LotAtc'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     async def configure(self, interaction: discord.Interaction,
                         server: app_commands.Transform[Server, utils.ServerTransformer(status=[Status.SHUTDOWN])],

plugins/modmanager/README.md

@@ -11,3 +11,9 @@ packages (aka mods) into your DCS World servers. Read there for further details.
 | /mods uninstall | mod                  | admin-channel | Admin     | Uninstalls a specific mod from the selected server.                                   |
 | /mods list      |                      | admin-channel | DCS Admin | Lists the installed mods on this server.                                              |
 | /mods download  | folder url [version] | admin-channel | Admin     | Download a package from a GitHub URL or any other URL. Version only works for GitHub. |
+
+> [!NOTE]
+> If `restricted_commands` is set to `true` in your nodes.yaml, you can only install and uninstall mods that are 
+> in the SavedGames folder of your MoodManager directory.
+> This is to allow hosters to open mod commands to DCS Admin users without them being able to break the main
+> DCS installation.

plugins/modmanager/commands.py

@@ -25,10 +25,14 @@ async def get_installed_mods(service: ModManagerService, server: Server) -> list
     return sorted(installed)
 
 
-async def get_available_mods(service: ModManagerService, server: Server) -> list[tuple[Folder, str, str]]:
+async def get_available_mods(
+        interaction: discord.Interaction, service: ModManagerService, server: Server
+) -> list[tuple[Folder, str, str]]:
     available = []
     config = service.get_config(server)
     for folder in Folder:
+        if folder == Folder.RootFolder and utils.is_restricted(interaction):
+            continue
         packages = []
         for x in os.listdir(os.path.expandvars(config[folder.value])):
             if x.startswith('.') or x.casefold() in ['desktop.ini']:
@@ -73,8 +77,9 @@ async def available_mods_autocomplete(interaction: discord.Interaction, current:
             return []
         return [
             app_commands.Choice(name=name, value=f"{folder.value}/{name}")
-            for folder, name in sorted(set((folder, name) for folder, name, _ in await get_available_mods(service,
-                                                                                                          server)))
+            for folder, name in sorted(set(
+                (folder, name) for folder, name, _ in await get_available_mods(interaction, service, server))
+            )
             if not current or current.casefold() in name.casefold()
         ][:25]
     except Exception as ex:
@@ -153,7 +158,7 @@ async def rename(self, conn: psycopg.AsyncConnection, old_name: str, new_name: s
 
     @mods.command(description=_('manage mods'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_roles(['Admin'])
     async def manage(self, interaction: discord.Interaction,
                      server: app_commands.Transform[Server, utils.ServerTransformer(
@@ -263,7 +268,7 @@ async def install(derived, interaction: discord.Interaction):
                         else:
                             derived.embed.set_footer(text=_("Mod {} updated.").format(package))
                             derived.installed = await get_installed_mods(self.service, server)
-                            derived.available = await get_available_mods(self.service, server)
+                            derived.available = await get_available_mods(interaction, self.service, server)
                             await derived.render()
                     else:
                         derived.embed.set_footer(text=_("Installing mod {}, please wait ...").format(package))
@@ -274,7 +279,7 @@ async def install(derived, interaction: discord.Interaction):
                         else:
                             derived.embed.set_footer(text=_("Mod {} installed.").format(package))
                             derived.installed = await get_installed_mods(self.service, server)
-                            derived.available = await get_available_mods(self.service, server)
+                            derived.available = await get_available_mods(interaction, self.service, server)
                             await derived.render()
                     await interaction.edit_original_response(embed=derived.embed, view=derived)
                 except Exception as ex:
@@ -293,7 +298,7 @@ async def uninstall(derived, interaction: discord.Interaction):
                 else:
                     derived.embed.set_footer(text=_("Mod {} uninstalled.").format(mod))
                     derived.installed = await get_installed_mods(self.service, server)
-                    derived.available = await get_available_mods(self.service, server)
+                    derived.available = await get_available_mods(interaction, self.service, server)
                     await derived.render()
                 await interaction.edit_original_response(embed=derived.embed, view=derived)
 
@@ -337,7 +342,7 @@ async def download(modal: UploadModal):
                         try:
                             await download(modal)
                             embed.remove_footer()
-                            derived.available = get_available_mods(self.service, server)
+                            derived.available = get_available_mods(interaction, self.service, server)
                         except aiohttp.client_exceptions.ClientResponseError as ex:
                             self.log.error(f"{ex.code}: {modal.url.value} {ex.message}")
                             embed.set_footer(text=f"{ex.code}: {ex.message}", icon_url=WARNING_ICON)
@@ -355,7 +360,7 @@ async def cancel(derived, _: discord.Interaction):
         embed.description = _("Install or uninstall mods to {}").format(server.name)
         view = PackageView(embed,
                            installed=await get_installed_mods(self.service, server),
-                           available=await get_available_mods(self.service, server))
+                           available=await get_available_mods(interaction, self.service, server))
         await view.render()
         # noinspection PyUnresolvedReferences
         await interaction.response.send_message(embed=embed, view=view, ephemeral=utils.get_ephemeral(interaction))
@@ -366,7 +371,6 @@ async def cancel(derived, _: discord.Interaction):
 
     @mods.command(name="install", description=_('Install mods'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
     @utils.app_has_roles(['Admin'])
     @app_commands.autocomplete(mod=available_mods_autocomplete)
     @app_commands.autocomplete(version=available_versions_autocomplete)
@@ -417,7 +421,6 @@ async def _install(self, interaction: discord.Interaction,
 
     @mods.command(description=_('Uninstall mods'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
     @utils.app_has_roles(['Admin'])
     @app_commands.autocomplete(mod=installed_mods_autocomplete)
     async def uninstall(self, interaction: discord.Interaction,
@@ -467,7 +470,7 @@ async def _list(self, interaction: discord.Interaction,
 
     @mods.command(description=_('Download a mod'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_roles(['Admin'])
     @app_commands.describe(url=_("GitHub repo link or download URL"))
     @app_commands.autocomplete(version=repo_version_autocomplete)

plugins/scheduler/commands.py

@@ -932,7 +932,7 @@ async def on_submit(derived, interaction: discord.Interaction):
 
     @group.command(description='Change the configuration of a DCS server')
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     async def config(self, interaction: discord.Interaction,
                      server: app_commands.Transform[Server, utils.ServerTransformer]):
@@ -993,7 +993,7 @@ async def _rename(self, interaction: discord.Interaction,
 
     @group.command(name="migrate", description="Migrate a server from one instance to another")
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('Admin')
     async def _migrate(self, interaction: discord.Interaction,
                        server: app_commands.Transform[Server, utils.ServerTransformer],

plugins/srs/commands.py

@@ -59,7 +59,7 @@ async def _list(self, interaction: discord.Interaction,
 
     @srs.command(description=_('Update DCS-SRS'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     async def update(self, interaction: discord.Interaction,
                      server: app_commands.Transform[Server, utils.ServerTransformer(
@@ -113,7 +113,7 @@ async def _configure(self, interaction: discord.Interaction,
 
     @srs.command(description=_('Configure SRS'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     async def configure(self, interaction: discord.Interaction,
                         server: app_commands.Transform[Server, utils.ServerTransformer(status=[Status.SHUTDOWN])],

plugins/tacview/commands.py

@@ -95,7 +95,7 @@ async def _configure(self, interaction: discord.Interaction, *,
 
     @tacview.command(description=_('Configure Tacview'))
     @app_commands.guild_only()
-    @app_commands.check(utils.restricted)
+    @app_commands.check(utils.restricted_check)
     @utils.app_has_role('DCS Admin')
     async def configure(self, interaction: discord.Interaction,
                         server: app_commands.Transform[Server, utils.ServerTransformer(status=[Status.SHUTDOWN])],