diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs index ccf45c1770..261c745ba3 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs @@ -26,11 +26,9 @@ */ using System; -using System.Collections; using System.Collections.Generic; -using System.Collections.Specialized; +using System.Net; using System.Reflection; -using System.IO; using System.Web; using System.Xml; using log4net; @@ -40,14 +38,11 @@ using OpenMetaverse; using OpenMetaverse.Messages.Linden; using OpenMetaverse.StructuredData; using OpenSim.Framework; -using OpenSim.Framework.Capabilities; -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 OSDArray = OpenMetaverse.StructuredData.OSDArray; using OSDMap = OpenMetaverse.StructuredData.OSDMap; namespace OpenSim.Region.CoreModules.World.Media.Moap @@ -70,26 +65,6 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap /// protected Scene m_scene; - /// - /// Track the ObjectMedia capabilities given to users keyed by path - /// - protected Dictionary m_omCapUsers = new Dictionary(); - - /// - /// Track the ObjectMedia capabilities given to users keyed by agent. Lock m_omCapUsers to manipulate. - /// - protected Dictionary m_omCapUrls = new Dictionary(); - - /// - /// Track the ObjectMediaUpdate capabilities given to users keyed by path - /// - protected Dictionary m_omuCapUsers = new Dictionary(); - - /// - /// Track the ObjectMediaUpdate capabilities given to users keyed by agent. Lock m_omuCapUsers to manipulate - /// - protected Dictionary m_omuCapUrls = new Dictionary(); - public void Initialise(IConfigSource configSource) { IConfig config = configSource.Configs["MediaOnAPrim"]; @@ -117,7 +92,6 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap return; m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; - m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps; m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy; } @@ -127,7 +101,6 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap return; m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps; - m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps; m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy; } @@ -136,50 +109,18 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap // m_log.DebugFormat( // "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID); - string omCapUrl = "/CAPS/" + UUID.Random(); - lock (m_omCapUsers) - { - m_omCapUsers[omCapUrl] = agentID; - m_omCapUrls[agentID] = omCapUrl; + caps.RegisterSimpleHandler("ObjectMedia", + new SimpleStreamHandler("/" + UUID.Random() + "/", delegate (IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) + { + HandleObjectMediaMessage(httpRequest, httpResponse, agentID); + })); - // Even though we're registering for POST we're going to get GETS and UPDATES too - caps.RegisterHandler( - "ObjectMedia", - new RestStreamHandler( - "POST", omCapUrl, HandleObjectMediaMessage, "ObjectMedia", agentID.ToString())); - } - - string omuCapUrl = "/CAPS/" + UUID.Random(); - - lock (m_omuCapUsers) - { - m_omuCapUsers[omuCapUrl] = agentID; - m_omuCapUrls[agentID] = omuCapUrl; - - // Even though we're registering for POST we're going to get GETS and UPDATES too - caps.RegisterHandler( - "ObjectMediaNavigate", - new RestStreamHandler( - "POST", omuCapUrl, HandleObjectMediaNavigateMessage, "ObjectMediaNavigate", agentID.ToString())); - } - } - - public void OnDeregisterCaps(UUID agentID, Caps caps) - { - lock (m_omCapUsers) - { - string path = m_omCapUrls[agentID]; - m_omCapUrls.Remove(agentID); - m_omCapUsers.Remove(path); - } - - lock (m_omuCapUsers) - { - string path = m_omuCapUrls[agentID]; - m_omuCapUrls.Remove(agentID); - m_omuCapUsers.Remove(path); - } + caps.RegisterSimpleHandler("ObjectMediaNavigate", + new SimpleStreamHandler("/" + UUID.Random() + "/", delegate (IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) + { + HandleObjectMediaNavigateMessage(httpRequest, httpResponse, agentID); + })); } protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed) @@ -295,30 +236,46 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap /// /// Sets or gets per face media textures. /// - /// - /// - /// - /// - /// - /// - protected string HandleObjectMediaMessage( - string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) + protected void HandleObjectMediaMessage(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID agentID) { // m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request); - OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request); - ObjectMediaMessage omm = new ObjectMediaMessage(); - omm.Deserialize(osd); + try + { + OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(httpRequest.InputStream); + ObjectMediaMessage omm = new ObjectMediaMessage(); + omm.Deserialize(osd); - if (omm.Request is ObjectMediaRequest) - return HandleObjectMediaRequest(omm.Request as ObjectMediaRequest); - else if (omm.Request is ObjectMediaUpdate) - return HandleObjectMediaUpdate(path, omm.Request as ObjectMediaUpdate); - - throw new Exception( - string.Format( - "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}", - omm.Request.GetType())); + if (omm.Request is ObjectMediaRequest) + { + string ret = HandleObjectMediaRequest(omm.Request as ObjectMediaRequest); + if(!string.IsNullOrEmpty(ret)) + { + httpResponse.RawBuffer = Util.UTF8.GetBytes(ret); + httpResponse.StatusCode = (int)HttpStatusCode.OK; + return; + } + } + else if (omm.Request is ObjectMediaUpdate) + { + if(HandleObjectMediaUpdate(omm.Request as ObjectMediaUpdate, agentID)) + { + httpResponse.StatusCode = (int)HttpStatusCode.OK; + return; + } + } + else + { + m_log.ErrorFormat( + "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}", + omm.Request.GetType()); + } + } + catch + { + } + httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; + return; } /// @@ -387,10 +344,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap /// /// Handle an update of media textures. /// - /// Path on which this request was made /// /param> /// - protected string HandleObjectMediaUpdate(string path, ObjectMediaUpdate omu) + protected bool HandleObjectMediaUpdate(ObjectMediaUpdate omu, UUID agentId) { UUID primId = omu.PrimID; @@ -401,7 +357,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap m_log.WarnFormat( "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", primId, m_scene.RegionInfo.RegionName); - return string.Empty; + return false; } // m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId); @@ -418,14 +374,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap m_log.WarnFormat( "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces. Dropping request.", omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides()); - return string.Empty; + return false; } - UUID agentId = default(UUID); - - lock (m_omCapUsers) - agentId = m_omCapUsers[path]; - List media = part.Shape.Media; if (null == media) @@ -496,7 +447,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap part.TriggerScriptChangedEvent(Changed.MEDIA); - return string.Empty; + return true; } /// @@ -508,74 +459,87 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap /// /param> /// /param> /// - protected string HandleObjectMediaNavigateMessage( - string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) + protected void HandleObjectMediaNavigateMessage(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID agentId) { // m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request); - OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request); - ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage(); - omn.Deserialize(osd); - - UUID primId = omn.PrimID; - - SceneObjectPart part = m_scene.GetSceneObjectPart(primId); - - if (null == part) + try { - m_log.WarnFormat( - "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}", - primId, m_scene.RegionInfo.RegionName); - return string.Empty; - } + OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(httpRequest.InputStream); + ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage(); + omn.Deserialize(osd); - UUID agentId = default(UUID); + UUID primId = omn.PrimID; - lock (m_omuCapUsers) - agentId = m_omuCapUsers[path]; + SceneObjectPart part = m_scene.GetSceneObjectPart(primId); - if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face)) - return string.Empty; + bool bad = true; + MediaEntry me = null; -// m_log.DebugFormat( -// "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", -// omn.Face, part.Name, part.UUID, omn.URL); - - // If media has never been set for this prim, then just return. - if (null == part.Shape.Media) - return string.Empty; - - MediaEntry me = null; - - lock (part.Shape.Media) - me = part.Shape.Media[omn.Face]; - - // Do the same if media has not been set up for a specific face - if (null == me) - return string.Empty; - - if (me.EnableWhiteList) - { - if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList)) + while (true) { -// m_log.DebugFormat( -// "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", -// omn.Face, part.Name, part.UUID, omn.URL); + if (null == part) + { + m_log.WarnFormat( + "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}", + primId, m_scene.RegionInfo.RegionName); + } - return string.Empty; + if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face)) + break; + + //m_log.DebugFormat( + // "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", + // omn.Face, part.Name, part.UUID, omn.URL); + + // If media has never been set for this prim, then just return. + if (null == part.Shape.Media) + break; + + lock (part.Shape.Media) + me = part.Shape.Media[omn.Face]; + + // Do the same if media has not been set up for a specific face + if (null == me) + break; + + if (me.EnableWhiteList) + { + if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList)) + { + //m_log.DebugFormat( + // "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", + // omn.Face, part.Name, part.UUID, omn.URL); + break; + } + } + bad = false; + break; } + + if(bad) + { + httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; + return; + } + + me.CurrentURL = omn.URL; + + UpdateMediaUrl(part, agentId); + + part.ParentGroup.HasGroupChanged = true; + part.ScheduleFullUpdate(); + + part.TriggerScriptChangedEvent(Changed.MEDIA); + + httpResponse.RawBuffer = Util.UTF8.GetBytes(OSDParser.SerializeLLSDXmlString(new OSD())); + httpResponse.StatusCode = (int)HttpStatusCode.OK; + } + catch + { + httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; + httpResponse.RawBuffer = null; } - - me.CurrentURL = omn.URL; - - UpdateMediaUrl(part, agentId); - - part.ParentGroup.HasGroupChanged = true; - part.ScheduleFullUpdate(); - - part.TriggerScriptChangedEvent(Changed.MEDIA); - - return OSDParser.SerializeLLSDXmlString(new OSD()); } /// @@ -616,7 +580,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap part.MediaUrl = string.Format("x-mv:{0:D10}/{1}", ++version, updateId); } -// m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID); + //m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID); } /// diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index 3d73752a28..a6a20ab3a4 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs @@ -236,7 +236,7 @@ namespace OpenSim.Region.OptionalModules.Materials private void preprocess(IOSHttpRequest request, IOSHttpResponse response, UUID agentID) { - switch(request.HttpMethod) + switch (request.HttpMethod) { case "GET": RenderMaterialsGetCap(request, response);