move RegionConsoleModule to simpleh.., and try to fix it

OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs

@@ -26,33 +26,26 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
+using System.Collections.Concurrent;
-using System.Drawing;
+using System.Net;
-using System.Drawing.Imaging;
 using System.Reflection;
 using System.IO;
-using System.Web;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
-using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
-using OpenSim.Capabilities.Handlers;
+
 
 namespace OpenSim.Region.ClientStack.Linden
 {
-
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionConsoleModule")]
     public class RegionConsoleModule : INonSharedRegionModule, IRegionConsole
     {
@@ -64,6 +57,8 @@ namespace OpenSim.Region.ClientStack.Linden
         private Commands m_commands = new Commands();
         public ICommands Commands { get { return m_commands; } }
 
+        ConcurrentDictionary<UUID,OnOutputDelegate> currentConsoles = new ConcurrentDictionary<UUID, OnOutputDelegate>();
+
         public event ConsoleMessage OnConsoleMessage;
 
         public void Initialise(IConfigSource source)
@@ -106,17 +101,30 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             //if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID) && !m_scene.Permissions.IsGod(agentID))
             //    return;
-
-            UUID capID = UUID.Random();
-
             //m_log.DebugFormat("[REGION CONSOLE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-            caps.RegisterHandler(
+            caps.RegisterSimpleHandler("SimConsoleAsync",
-                    "SimConsoleAsync",
+                    new ConsoleHandler("/" + UUID.Random(), "SimConsoleAsync", agentID, this, m_scene));
-                    new ConsoleHandler("/CAPS/" + capID + "/", "SimConsoleAsync", agentID, this, m_scene));
+        }
+
+        public void AddConsole(UUID agentID, OnOutputDelegate console)
+        {
+            if(currentConsoles.TryAdd(agentID, console))
+                MainConsole.Instance.OnOutput += console;
+        }
+
+        public void RemoveConsole(UUID agentID)
+        {
+            if(currentConsoles.TryRemove(agentID, out OnOutputDelegate console))
+                MainConsole.Instance.OnOutput -= console;
         }
 
         public void SendConsoleOutput(UUID agentID, string message)
         {
+            if (!m_scene.TryGetScenePresence(agentID, out ScenePresence sp) || sp.IsChildAgent || sp.IsDeleted)
+            {
+                RemoveConsole(agentID);
+                return;
+            }
             OSD osd = OSD.FromString(message);
 
             m_eventQueue.Enqueue(EventQueueHelper.BuildEvent("SimConsoleResponse", osd), agentID);
@@ -162,7 +170,7 @@ namespace OpenSim.Region.ClientStack.Linden
         }
     }
 
-    public class ConsoleHandler : BaseStreamHandler
+    public class ConsoleHandler : SimpleStreamHandler
     {
 //        private static readonly ILog m_log =
 //            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -174,27 +182,46 @@ namespace OpenSim.Region.ClientStack.Linden
         private bool m_consoleIsOn = false;
 
         public ConsoleHandler(string path, string name, UUID agentID, RegionConsoleModule module, Scene scene)
-                :base("POST", path, name, agentID.ToString())
+                :base(path)
         {
             m_agentID = agentID;
             m_consoleModule = module;
             m_scene = scene;
-
             m_isGod = m_scene.Permissions.IsGod(agentID);
         }
 
-        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            string message;
+            httpResponse.KeepAlive = false;
-            using(StreamReader reader = new StreamReader(request))
-                message = reader.ReadToEnd();
 
-            OSD osd = OSDParser.DeserializeLLSDXml(message);
+            if(httpRequest.HttpMethod != "POST")
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
+                return;
+            }
+
+            httpResponse.StatusCode = (int)HttpStatusCode.OK;
+
+            if (!m_scene.TryGetScenePresence(m_agentID, out ScenePresence sp) || sp.IsChildAgent || sp.IsDeleted)
+            {
+                return;
+            }
 
             if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_agentID) && !m_isGod)
             {
                 m_consoleModule.SendConsoleOutput(m_agentID, "No access");
-                return new byte[0];
+                return;
+            }
+
+            OSD osd;
+            try
+            {
+                osd = OSDParser.DeserializeLLSDXml(httpRequest.InputStream);
+            }
+            catch
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.BadRequest;
+                return;
             }
 
             string cmd = osd.AsString();
@@ -202,22 +229,22 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 if (m_isGod)
                 {
-                    MainConsole.Instance.OnOutput += ConsoleSender;
+                    m_consoleModule.AddConsole(m_agentID, ConsoleSender);
                     m_consoleIsOn = true;
                     m_consoleModule.SendConsoleOutput(m_agentID, "Console is now on");
                 }
-                return new byte[0];
+                return;
             }
             else if (cmd == "set console off")
             {
-                MainConsole.Instance.OnOutput -= ConsoleSender;
+                m_consoleModule.RemoveConsole(m_agentID);
                 m_consoleIsOn = false;
                 m_consoleModule.SendConsoleOutput(m_agentID, "Console is now off");
-                return new byte[0];
+                return;
             }
 
             if (m_consoleIsOn == false && m_consoleModule.RunCommand(osd.AsString().Trim(), m_agentID))
-                return new byte[0];
+                return;
 
             if (m_isGod && m_consoleIsOn)
             {
@@ -227,8 +254,6 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 m_consoleModule.SendConsoleOutput(m_agentID, "Unknown command");
             }
-
-            return new byte[0];
         }
 
         private void ConsoleSender(string text)
@@ -236,13 +261,6 @@ namespace OpenSim.Region.ClientStack.Linden
             m_consoleModule.SendConsoleOutput(m_agentID, text);
         }
 
-        private void OnMakeChildAgent(ScenePresence presence)
+ 
-        {
-            if (presence.UUID == m_agentID)
-            {
-                MainConsole.Instance.OnOutput -= ConsoleSender;
-                m_consoleIsOn = false;
-            }
-        }
     }
 }