1 files changed, 47 insertions, 0 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 329a489..1a6deca 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -36,7 +36,9 @@ using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using OpenSim;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
@@ -116,6 +118,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     // Either enable full remote functionality or just selected features                    
                     string enabledMethods = m_config.GetString("enabled_methods", "all");
 
+                    // To get this, you must explicitly specify "all" or
+                    // mention it in a whitelist. It won't be available
+                    // If you just leave the option out!
+                    //
+                    if (!String.IsNullOrEmpty(enabledMethods))
+                        availableMethods["admin_console_command"] = XmlRpcConsoleCommandMethod;
+
                     // The assumption here is that simply enabling Remote Admin as before will produce the same
                     // behavior - enable all methods unless the whitelist is in place for backward-compatibility.
                     if (enabledMethods.ToLower() == "all" || String.IsNullOrEmpty(enabledMethods))
@@ -1441,6 +1450,44 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             return response;
         }
 
+        public XmlRpcResponse XmlRpcConsoleCommandMethod(XmlRpcRequest request)
+        {
+            m_log.Info("[RADMIN]: Received Command XML Administrator Request");
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+
+            try
+            {
+                responseData["success"] = "true";
+
+                Hashtable requestData = (Hashtable) request.Params[0];
+
+                // check completeness
+                if (!requestData.Contains("password"))
+                    throw new Exception(String.Format("missing required parameter"));
+                if (!String.IsNullOrEmpty(requiredPassword) &&
+                    (string) requestData["password"] != requiredPassword) throw new Exception("wrong password");
+
+                if (!requestData.Contains("command"))
+                    throw new Exception(String.Format("missing required parameter"));
+                MainConsole.Instance.RunCommand(requestData["command"].ToString());
+
+                response.Value = responseData;
+            }
+            catch (Exception e)
+            {
+                m_log.InfoFormat("[RADMIN] ConsoleCommand: {0}", e.Message);
+
+                responseData["success"] = "false";
+                responseData["error"] = e.Message;
+
+                response.Value = responseData;
+            }
+
+            m_log.Info("[RADMIN]: Command XML Administrator Request complete");
+            return response;
+        }
+
         public void Dispose()
         {
         }