diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs deleted file mode 100644 index 5163169dd9..0000000000 --- a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.IO; -using System.Reflection; -using System.Web; -using log4net; -using Nini.Config; -using OpenMetaverse; -using OpenSim.Framework; -using OpenSim.Framework.Capabilities; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Servers.HttpServer; -//using OpenSim.Region.Framework.Interfaces; -using OpenSim.Services.Interfaces; -using Caps = OpenSim.Framework.Capabilities.Caps; - -namespace OpenSim.Capabilities.Handlers -{ - public class AvatarPickerSearchHandler : BaseStreamHandler - { - private static readonly ILog m_log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private IPeople m_PeopleService; - - public AvatarPickerSearchHandler(string path, IPeople peopleService, string name, string description) - : base("GET", path, name, description) - { - m_PeopleService = peopleService; - } - - protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) - { - // Try to parse the texture ID from the request URL - NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); - string names = query.GetOne("names"); - string psize = query.GetOne("page_size"); - string pnumber = query.GetOne("page"); - - if (m_PeopleService == null) - return FailureResponse(names, (int)System.Net.HttpStatusCode.InternalServerError, httpResponse); - - if (string.IsNullOrEmpty(names) || names.Length < 3) - return FailureResponse(names, (int)System.Net.HttpStatusCode.BadRequest, httpResponse); - - m_log.DebugFormat("[AVATAR PICKER SEARCH]: search for {0}", names); - - int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize)); - int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber)); - - // Full content request - httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK; - //httpResponse.ContentLength = ??; - httpResponse.ContentType = "application/llsd+xml"; - - List users = m_PeopleService.GetUserData(names, page_size, page_number); - - LLSDAvatarPicker osdReply = new LLSDAvatarPicker(); - osdReply.next_page_url = httpRequest.RawUrl; - foreach (UserData u in users) - osdReply.agents.Array.Add(ConvertUserData(u)); - - string reply = LLSDHelpers.SerialiseLLSDReply(osdReply); - return System.Text.Encoding.UTF8.GetBytes(reply); - } - - private LLSDPerson ConvertUserData(UserData user) - { - LLSDPerson p = new LLSDPerson(); - p.legacy_first_name = user.FirstName; - p.legacy_last_name = user.LastName; - p.display_name = user.FirstName + " " + user.LastName; - if (user.LastName.StartsWith("@")) - p.username = user.FirstName.ToLower() + user.LastName.ToLower(); - else - p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower(); - p.id = user.Id; - p.is_display_name_default = false; - return p; - } - - private byte[] FailureResponse(string names, int statuscode, IOSHttpResponse httpResponse) - { - m_log.Error("[AVATAR PICKER SEARCH]: Error searching for " + names); - httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; - return System.Text.Encoding.UTF8.GetBytes(string.Empty); - } - } -} \ No newline at end of file diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs index e3c430cce5..01a7cc917c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs @@ -26,36 +26,30 @@ */ using System; -using System.Collections; +using System.Collections.Generic; using System.Collections.Specialized; -using System.Drawing; -using System.Drawing.Imaging; -using System.Reflection; -using System.IO; -using System.Web; + +using System.Net; using log4net; using Nini.Config; using Mono.Addins; using OpenMetaverse; -using OpenMetaverse.StructuredData; using OpenSim.Framework; -using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using OpenSim.Services.Interfaces; +using OpenSim.Framework.Capabilities; using Caps = OpenSim.Framework.Capabilities.Caps; -using OpenSim.Capabilities.Handlers; namespace OpenSim.Region.ClientStack.Linden { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AvatarPickerSearchModule")] - public class AvatarPickerSearchModule : INonSharedRegionModule + public class AvatarPickerSearchModule : ISharedRegionModule { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private Scene m_scene; - private IPeople m_People; + private int m_nscenes; + private IPeople m_People = null; private bool m_Enabled = false; private string m_URL; @@ -78,8 +72,6 @@ namespace OpenSim.Region.ClientStack.Linden { if (!m_Enabled) return; - - m_scene = s; } public void RemoveRegion(Scene s) @@ -87,8 +79,10 @@ namespace OpenSim.Region.ClientStack.Linden if (!m_Enabled) return; - m_scene.EventManager.OnRegisterCaps -= RegisterCaps; - m_scene = null; + s.EventManager.OnRegisterCaps -= RegisterCaps; + --m_nscenes; + if(m_nscenes >= 0) + m_People = null; } public void RegionLoaded(Scene s) @@ -96,8 +90,10 @@ namespace OpenSim.Region.ClientStack.Linden if (!m_Enabled) return; - m_People = m_scene.RequestModuleInterface(); - m_scene.EventManager.OnRegisterCaps += RegisterCaps; + if(m_People == null) + m_People = s.RequestModuleInterface(); + s.EventManager.OnRegisterCaps += RegisterCaps; + ++m_nscenes; } public void PostInitialise() @@ -121,16 +117,76 @@ namespace OpenSim.Region.ClientStack.Linden if (m_URL == "localhost") { -// m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); - caps.RegisterHandler( - "AvatarPickerSearch", - new AvatarPickerSearchHandler("/CAPS/" + capID + "/", m_People, "AvatarPickerSearch", "Search for avatars by name")); + // m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); + if(m_People != null) + caps.RegisterSimpleHandler("AvatarPickerSearch", + new SimpleStreamHandler("/" + UUID.Random() + "/", ProcessRequest)); } else { - // m_log.DebugFormat("[AVATAR PICKER SEARCH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); + // m_log.DebugFormat("[AVATAR PICKER SEARCH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName); caps.RegisterHandler("AvatarPickerSearch", m_URL); } } + + protected void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) + { + if(httpRequest.HttpMethod != "GET") + { + httpResponse.StatusCode = (int)HttpStatusCode.NotFound; + return; + } + + NameValueCollection query = httpRequest.QueryString; + string names = query.GetOne("names"); + string psize = query.GetOne("page_size"); + string pnumber = query.GetOne("page"); + + if (string.IsNullOrEmpty(names) || names.Length < 3) + { + httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; + return; + } + + int page_size; + int page_number; + try + { + page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize)); + page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber)); + } + catch + { + httpResponse.StatusCode = (int)HttpStatusCode.BadRequest; + return; + } + // Full content request + List users = m_People.GetUserData(names, page_size, page_number); + + LLSDAvatarPicker osdReply = new LLSDAvatarPicker(); + osdReply.next_page_url = httpRequest.RawUrl; + foreach (UserData u in users) + osdReply.agents.Array.Add(ConvertUserData(u)); + + string reply = LLSDHelpers.SerialiseLLSDReply(osdReply); + httpResponse.RawBuffer = Util.UTF8.GetBytes(reply); + httpResponse.StatusCode = (int)HttpStatusCode.OK; + httpResponse.ContentType = "application/llsd+xml"; + } + + private LLSDPerson ConvertUserData(UserData user) + { + LLSDPerson p = new LLSDPerson(); + p.legacy_first_name = user.FirstName; + p.legacy_last_name = user.LastName; + p.display_name = user.FirstName + " " + user.LastName; + if (user.LastName.StartsWith("@")) + p.username = user.FirstName.ToLower() + user.LastName.ToLower(); + else + p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower(); + p.id = user.Id; + p.is_display_name_default = false; + return p; + } } -} \ No newline at end of file +}