Updated load/unload/reload of plugins to make sure the name is alphanumeric.

satoon101 · satoon101 · commit e56d1ff68652 · 2014-09-03T03:32:50.000-04:00
diff --git a/addons/source-python/packages/source-python/core/command.py b/addons/source-python/packages/source-python/core/command.py
@@ -1,4 +1,4 @@
-# ../_core/command.py
+# ../core/command.py
 
 """Registers the "sp" command and all of its sub-commands."""
 
diff --git a/addons/source-python/packages/source-python/plugins/command.py b/addons/source-python/packages/source-python/plugins/command.py
@@ -251,6 +251,16 @@ def print_help(self, message=''):
 
     def load_plugin(self, plugin_name):
         """Load a plugin by name."""
+        # Is the given plugin name a proper name?
+        if not plugin_name.isalnum():
+
+            # Send a message that the given name is invalid
+            self.logger.log_message(self.prefix + self.translations[
+                'Invalid Name'].get_string(plugin=plugin_name))
+
+            # No need to go further
+            return
+
         # Is the plugin already loaded?
         if plugin_name in self.manager:
 
@@ -283,6 +293,16 @@ def load_plugin(self, plugin_name):
 
     def unload_plugin(self, plugin_name):
         """Unload a plugin by name."""
+        # Is the given plugin name a proper name?
+        if not plugin_name.isalnum():
+
+            # Send a message that the given name is invalid
+            self.logger.log_message(self.prefix + self.translations[
+                'Invalid Name'].get_string(plugin=plugin_name))
+
+            # No need to go further
+            return
+
         # Is the plugin loaded?
         if plugin_name not in self.manager:
 
@@ -305,6 +325,16 @@ def unload_plugin(self, plugin_name):
 
     def reload_plugin(self, plugin_name):
         """Reload a plugin by name."""
+        # Is the given plugin name a proper name?
+        if not plugin_name.isalnum():
+
+            # Send a message that the given name is invalid
+            self.logger.log_message(self.prefix + self.translations[
+                'Invalid Name'].get_string(plugin=plugin_name))
+
+            # No need to go further
+            return
+
         # Unload the plugin
         self.unload_plugin(plugin_name)
 
diff --git a/resource/source-python/translations/_core/plugin_strings.ini b/resource/source-python/translations/_core/plugin_strings.ini
@@ -1,3 +1,6 @@
+[Invalid Name]
+en = "Given plugin name '$plugin' is invalid. Plugin names must be alphanumeric."
+
 [Loading]
 en = "Loading plugin '$plugin'..."
 de = "Lade Plugin '$plugin'..."

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# ../_core/command.py`
	`1`	`+# ../core/command.py`
`2`	`2`
`3`	`3`	`"""Registers the "sp" command and all of its sub-commands."""`
`4`	`4`