diff options
author | Diva Canto | 2015-01-09 08:31:56 -0800 |
---|---|---|
committer | Diva Canto | 2015-01-09 08:31:56 -0800 |
commit | e2dd15625f158c7f7d8f5ceec14f09e85dd8e2b6 (patch) | |
tree | 522ca8d3d1901ca7f594a7a5b6ec77d045d0ba21 /OpenSim/Capabilities | |
parent | Commented out clear_registry_ because (1) it isn't clearing up anything anymo... (diff) | |
download | opensim-SC-e2dd15625f158c7f7d8f5ceec14f09e85dd8e2b6.zip opensim-SC-e2dd15625f158c7f7d8f5ceec14f09e85dd8e2b6.tar.gz opensim-SC-e2dd15625f158c7f7d8f5ceec14f09e85dd8e2b6.tar.bz2 opensim-SC-e2dd15625f158c7f7d8f5ceec14f09e85dd8e2b6.tar.xz |
Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others.
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 120 | ||||
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs | 71 |
2 files changed, 191 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs new file mode 100644 index 0000000..0353d9d --- /dev/null +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | |||
@@ -0,0 +1,120 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Collections.Specialized; | ||
32 | using System.Drawing; | ||
33 | using System.Drawing.Imaging; | ||
34 | using System.Reflection; | ||
35 | using System.IO; | ||
36 | using System.Web; | ||
37 | using log4net; | ||
38 | using Nini.Config; | ||
39 | using OpenMetaverse; | ||
40 | using OpenMetaverse.StructuredData; | ||
41 | using OpenMetaverse.Imaging; | ||
42 | using OpenSim.Framework; | ||
43 | using OpenSim.Framework.Capabilities; | ||
44 | using OpenSim.Framework.Servers; | ||
45 | using OpenSim.Framework.Servers.HttpServer; | ||
46 | using OpenSim.Region.Framework.Interfaces; | ||
47 | using OpenSim.Services.Interfaces; | ||
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
49 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | ||
50 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | ||
51 | |||
52 | namespace OpenSim.Capabilities.Handlers | ||
53 | { | ||
54 | public class GetDisplayNamesHandler : BaseStreamHandler | ||
55 | { | ||
56 | private static readonly ILog m_log = | ||
57 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
58 | private IUserManagement m_UserManagement; | ||
59 | |||
60 | public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) | ||
61 | : base("GET", path, name, description) | ||
62 | { | ||
63 | m_UserManagement = umService; | ||
64 | } | ||
65 | |||
66 | protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | ||
67 | { | ||
68 | m_log.DebugFormat("[GET_DISPLAY_NAMES]: called {0}", httpRequest.Url.Query); | ||
69 | |||
70 | NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query); | ||
71 | string[] ids = query.GetValues("ids"); | ||
72 | |||
73 | |||
74 | if (m_UserManagement == null) | ||
75 | { | ||
76 | m_log.Error("[GET_DISPLAY_NAMES]: Cannot fetch display names without a user management component"); | ||
77 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.InternalServerError; | ||
78 | return new byte[0]; | ||
79 | } | ||
80 | |||
81 | OSDMap osdReply = new OSDMap(); | ||
82 | OSDArray agents = new OSDArray(); | ||
83 | |||
84 | osdReply["agents"] = agents; | ||
85 | foreach (string id in ids) | ||
86 | { | ||
87 | UUID uuid = UUID.Zero; | ||
88 | if (UUID.TryParse(id, out uuid)) | ||
89 | { | ||
90 | string name = m_UserManagement.GetUserName(uuid); | ||
91 | if (!string.IsNullOrEmpty(name)) | ||
92 | { | ||
93 | string[] parts = name.Split(new char[] {' '}); | ||
94 | OSDMap osdname = new OSDMap(); | ||
95 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.MinValue); | ||
96 | osdname["display_name_expires"] = OSD.FromDate(DateTime.Now.AddMonths(1)); | ||
97 | osdname["display_name"] = OSD.FromString(name); | ||
98 | osdname["legacy_first_name"] = parts[0]; | ||
99 | osdname["legacy_last_name"] = parts[1]; | ||
100 | osdname["username"] = OSD.FromString(name); | ||
101 | osdname["id"] = OSD.FromUUID(uuid); | ||
102 | osdname["is_display_name_default"] = OSD.FromBoolean(false); | ||
103 | |||
104 | agents.Add(osdname); | ||
105 | } | ||
106 | } | ||
107 | } | ||
108 | |||
109 | // Full content request | ||
110 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK; | ||
111 | //httpResponse.ContentLength = ??; | ||
112 | httpResponse.ContentType = "application/llsd+xml"; | ||
113 | |||
114 | string reply = OSDParser.SerializeLLSDXmlString(osdReply); | ||
115 | return System.Text.Encoding.UTF8.GetBytes(reply); | ||
116 | |||
117 | } | ||
118 | |||
119 | } | ||
120 | } \ No newline at end of file | ||
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs new file mode 100644 index 0000000..d42de56 --- /dev/null +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | using OpenSim.Server.Base; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using OpenSim.Server.Handlers.Base; | ||
34 | using OpenMetaverse; | ||
35 | |||
36 | namespace OpenSim.Capabilities.Handlers | ||
37 | { | ||
38 | public class GetDisplayNamesServerConnector : ServiceConnector | ||
39 | { | ||
40 | private IUserManagement m_UserManagement; | ||
41 | private string m_ConfigName = "CapsService"; | ||
42 | |||
43 | public GetDisplayNamesServerConnector(IConfigSource config, IHttpServer server, string configName) : | ||
44 | base(config, server, configName) | ||
45 | { | ||
46 | if (configName != String.Empty) | ||
47 | m_ConfigName = configName; | ||
48 | |||
49 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
50 | if (serverConfig == null) | ||
51 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); | ||
52 | |||
53 | string umService = serverConfig.GetString("AssetService", String.Empty); | ||
54 | |||
55 | if (umService == String.Empty) | ||
56 | throw new Exception("No AssetService in config file"); | ||
57 | |||
58 | Object[] args = new Object[] { config }; | ||
59 | m_UserManagement = | ||
60 | ServerUtils.LoadPlugin<IUserManagement>(umService, args); | ||
61 | |||
62 | if (m_UserManagement == null) | ||
63 | throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName)); | ||
64 | |||
65 | string rurl = serverConfig.GetString("GetTextureRedirectURL"); | ||
66 | |||
67 | server.AddStreamHandler( | ||
68 | new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null)); | ||
69 | } | ||
70 | } | ||
71 | } \ No newline at end of file | ||