diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 169 |
1 files changed, 127 insertions, 42 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index b4f6b5a..0397478 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -38,12 +38,13 @@ using OpenSim.Services.Interfaces; | |||
38 | using OpenSim.Services.Connectors.Hypergrid; | 38 | using OpenSim.Services.Connectors.Hypergrid; |
39 | 39 | ||
40 | using OpenMetaverse; | 40 | using OpenMetaverse; |
41 | using OpenMetaverse.Packets; | ||
41 | using log4net; | 42 | using log4net; |
42 | using Nini.Config; | 43 | using Nini.Config; |
43 | 44 | ||
44 | namespace OpenSim.Region.CoreModules.Framework.UserManagement | 45 | namespace OpenSim.Region.CoreModules.Framework.UserManagement |
45 | { | 46 | { |
46 | class UserData | 47 | public class UserData |
47 | { | 48 | { |
48 | public UUID Id { get; set; } | 49 | public UUID Id { get; set; } |
49 | public string FirstName { get; set; } | 50 | public string FirstName { get; set; } |
@@ -56,36 +57,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
56 | { | 57 | { |
57 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
58 | 59 | ||
59 | private List<Scene> m_Scenes = new List<Scene>(); | 60 | protected bool m_Enabled; |
61 | protected List<Scene> m_Scenes = new List<Scene>(); | ||
60 | 62 | ||
61 | // The cache | 63 | // The cache |
62 | Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>(); | 64 | protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>(); |
63 | 65 | ||
64 | #region ISharedRegionModule | 66 | #region ISharedRegionModule |
65 | 67 | ||
66 | public void Initialise(IConfigSource config) | 68 | public void Initialise(IConfigSource config) |
67 | { | 69 | { |
68 | //m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled); | 70 | string umanmod = config.Configs["Modules"].GetString("UserManagementModule", Name); |
69 | //if (m_Enabled) | 71 | if (umanmod == Name) |
70 | //{ | 72 | { |
71 | // IConfig libConfig = config.Configs["LibraryService"]; | 73 | m_Enabled = true; |
72 | // if (libConfig != null) | 74 | RegisterConsoleCmds(); |
73 | // { | 75 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name); |
74 | // string dllName = libConfig.GetString("LocalServiceModule", string.Empty); | 76 | } |
75 | // m_log.Debug("[LIBRARY MODULE]: Library service dll is " + dllName); | ||
76 | // if (dllName != string.Empty) | ||
77 | // { | ||
78 | // Object[] args = new Object[] { config }; | ||
79 | // m_Library = ServerUtils.LoadPlugin<ILibraryService>(dllName, args); | ||
80 | // } | ||
81 | // } | ||
82 | //} | ||
83 | MainConsole.Instance.Commands.AddCommand("grid", true, | ||
84 | "show names", | ||
85 | "show names", | ||
86 | "Show the bindings between user UUIDs and user names", | ||
87 | String.Empty, | ||
88 | HandleShowUsers); | ||
89 | } | 77 | } |
90 | 78 | ||
91 | public bool IsSharedModule | 79 | public bool IsSharedModule |
@@ -93,9 +81,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
93 | get { return true; } | 81 | get { return true; } |
94 | } | 82 | } |
95 | 83 | ||
96 | public string Name | 84 | public virtual string Name |
97 | { | 85 | { |
98 | get { return "UserManagement Module"; } | 86 | get { return "BasicUserManagementModule"; } |
99 | } | 87 | } |
100 | 88 | ||
101 | public Type ReplaceableInterface | 89 | public Type ReplaceableInterface |
@@ -105,17 +93,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
105 | 93 | ||
106 | public void AddRegion(Scene scene) | 94 | public void AddRegion(Scene scene) |
107 | { | 95 | { |
108 | m_Scenes.Add(scene); | 96 | if (m_Enabled) |
97 | { | ||
98 | m_Scenes.Add(scene); | ||
109 | 99 | ||
110 | scene.RegisterModuleInterface<IUserManagement>(this); | 100 | scene.RegisterModuleInterface<IUserManagement>(this); |
111 | scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient); | 101 | scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient); |
112 | scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded); | 102 | scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded); |
103 | } | ||
113 | } | 104 | } |
114 | 105 | ||
115 | public void RemoveRegion(Scene scene) | 106 | public void RemoveRegion(Scene scene) |
116 | { | 107 | { |
117 | scene.UnregisterModuleInterface<IUserManagement>(this); | 108 | if (m_Enabled) |
118 | m_Scenes.Remove(scene); | 109 | { |
110 | scene.UnregisterModuleInterface<IUserManagement>(this); | ||
111 | m_Scenes.Remove(scene); | ||
112 | } | ||
119 | } | 113 | } |
120 | 114 | ||
121 | public void RegionLoaded(Scene s) | 115 | public void RegionLoaded(Scene s) |
@@ -149,7 +143,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
149 | 143 | ||
150 | void EventManager_OnNewClient(IClientAPI client) | 144 | void EventManager_OnNewClient(IClientAPI client) |
151 | { | 145 | { |
146 | client.OnConnectionClosed += new Action<IClientAPI>(HandleConnectionClosed); | ||
152 | client.OnNameFromUUIDRequest += new UUIDNameRequest(HandleUUIDNameRequest); | 147 | client.OnNameFromUUIDRequest += new UUIDNameRequest(HandleUUIDNameRequest); |
148 | client.OnAvatarPickerRequest += new AvatarPickerRequest(HandleAvatarPickerRequest); | ||
149 | } | ||
150 | |||
151 | void HandleConnectionClosed(IClientAPI client) | ||
152 | { | ||
153 | client.OnNameFromUUIDRequest -= new UUIDNameRequest(HandleUUIDNameRequest); | ||
154 | client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest); | ||
153 | } | 155 | } |
154 | 156 | ||
155 | void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) | 157 | void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) |
@@ -170,6 +172,77 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
170 | } | 172 | } |
171 | } | 173 | } |
172 | 174 | ||
175 | public void HandleAvatarPickerRequest(IClientAPI client, UUID avatarID, UUID RequestID, string query) | ||
176 | { | ||
177 | //EventManager.TriggerAvatarPickerRequest(); | ||
178 | |||
179 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: HandleAvatarPickerRequest for {0}", query); | ||
180 | |||
181 | List<UserAccount> accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query); | ||
182 | |||
183 | List<UserData> users = new List<UserData>(); | ||
184 | if (accs != null) | ||
185 | { | ||
186 | foreach (UserAccount acc in accs) | ||
187 | { | ||
188 | UserData ud = new UserData(); | ||
189 | ud.FirstName = acc.FirstName; | ||
190 | ud.LastName = acc.LastName; | ||
191 | ud.Id = acc.PrincipalID; | ||
192 | users.Add(ud); | ||
193 | } | ||
194 | } | ||
195 | |||
196 | AddAdditionalUsers(avatarID, query, users); | ||
197 | |||
198 | AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); | ||
199 | // TODO: don't create new blocks if recycling an old packet | ||
200 | |||
201 | AvatarPickerReplyPacket.DataBlock[] searchData = | ||
202 | new AvatarPickerReplyPacket.DataBlock[users.Count]; | ||
203 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); | ||
204 | |||
205 | agentData.AgentID = avatarID; | ||
206 | agentData.QueryID = RequestID; | ||
207 | replyPacket.AgentData = agentData; | ||
208 | //byte[] bytes = new byte[AvatarResponses.Count*32]; | ||
209 | |||
210 | int i = 0; | ||
211 | foreach (UserData item in users) | ||
212 | { | ||
213 | UUID translatedIDtem = item.Id; | ||
214 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); | ||
215 | searchData[i].AvatarID = translatedIDtem; | ||
216 | searchData[i].FirstName = Utils.StringToBytes((string)item.FirstName); | ||
217 | searchData[i].LastName = Utils.StringToBytes((string)item.LastName); | ||
218 | i++; | ||
219 | } | ||
220 | if (users.Count == 0) | ||
221 | { | ||
222 | searchData = new AvatarPickerReplyPacket.DataBlock[0]; | ||
223 | } | ||
224 | replyPacket.Data = searchData; | ||
225 | |||
226 | AvatarPickerReplyAgentDataArgs agent_data = new AvatarPickerReplyAgentDataArgs(); | ||
227 | agent_data.AgentID = replyPacket.AgentData.AgentID; | ||
228 | agent_data.QueryID = replyPacket.AgentData.QueryID; | ||
229 | |||
230 | List<AvatarPickerReplyDataArgs> data_args = new List<AvatarPickerReplyDataArgs>(); | ||
231 | for (i = 0; i < replyPacket.Data.Length; i++) | ||
232 | { | ||
233 | AvatarPickerReplyDataArgs data_arg = new AvatarPickerReplyDataArgs(); | ||
234 | data_arg.AvatarID = replyPacket.Data[i].AvatarID; | ||
235 | data_arg.FirstName = replyPacket.Data[i].FirstName; | ||
236 | data_arg.LastName = replyPacket.Data[i].LastName; | ||
237 | data_args.Add(data_arg); | ||
238 | } | ||
239 | client.SendAvatarPickerReply(agent_data, data_args); | ||
240 | } | ||
241 | |||
242 | protected virtual void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users) | ||
243 | { | ||
244 | } | ||
245 | |||
173 | #endregion Event Handlers | 246 | #endregion Event Handlers |
174 | 247 | ||
175 | private void CacheCreators(SceneObjectGroup sog) | 248 | private void CacheCreators(SceneObjectGroup sog) |
@@ -226,7 +299,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
226 | 299 | ||
227 | public string GetUserName(UUID uuid) | 300 | public string GetUserName(UUID uuid) |
228 | { | 301 | { |
229 | //m_log.DebugFormat("[XXX] GetUserName {0}", uuid); | ||
230 | string[] names = GetUserNames(uuid); | 302 | string[] names = GetUserNames(uuid); |
231 | if (names.Length == 2) | 303 | if (names.Length == 2) |
232 | { | 304 | { |
@@ -267,9 +339,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
267 | 339 | ||
268 | if (userdata.HomeURL != null && userdata.HomeURL != string.Empty) | 340 | if (userdata.HomeURL != null && userdata.HomeURL != string.Empty) |
269 | { | 341 | { |
270 | m_log.DebugFormat( | 342 | //m_log.DebugFormat( |
271 | "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}", | 343 | // "[USER MANAGEMENT MODULE]: Did not find url type {0} so requesting urls from '{1}' for {2}", |
272 | serverType, userdata.HomeURL, userID); | 344 | // serverType, userdata.HomeURL, userID); |
273 | 345 | ||
274 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL); | 346 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(userdata.HomeURL); |
275 | userdata.ServerURLs = uConn.GetServerURLs(userID); | 347 | userdata.ServerURLs = uConn.GetServerURLs(userID); |
@@ -328,11 +400,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
328 | 400 | ||
329 | public void AddUser(UUID uuid, string first, string last, string homeURL) | 401 | public void AddUser(UUID uuid, string first, string last, string homeURL) |
330 | { | 402 | { |
403 | // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL); | ||
404 | |||
331 | AddUser(uuid, homeURL + ";" + first + " " + last); | 405 | AddUser(uuid, homeURL + ";" + first + " " + last); |
332 | } | 406 | } |
333 | 407 | ||
334 | public void AddUser (UUID id, string creatorData) | 408 | public void AddUser (UUID id, string creatorData) |
335 | { | 409 | { |
410 | //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData); | ||
411 | |||
336 | UserData oldUser; | 412 | UserData oldUser; |
337 | //lock the whole block - prevent concurrent update | 413 | //lock the whole block - prevent concurrent update |
338 | lock (m_UserCache) | 414 | lock (m_UserCache) |
@@ -358,9 +434,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
358 | return; | 434 | return; |
359 | } | 435 | } |
360 | } | 436 | } |
361 | // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData); | ||
362 | 437 | ||
363 | UserAccount account = m_Scenes [0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id); | 438 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id); |
364 | 439 | ||
365 | if (account != null) | 440 | if (account != null) |
366 | { | 441 | { |
@@ -409,9 +484,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
409 | lock (m_UserCache) | 484 | lock (m_UserCache) |
410 | m_UserCache[user.Id] = user; | 485 | m_UserCache[user.Id] = user; |
411 | 486 | ||
412 | // m_log.DebugFormat( | 487 | //m_log.DebugFormat( |
413 | // "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", | 488 | // "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", |
414 | // user.Id, user.FirstName, user.LastName, user.HomeURL); | 489 | // user.Id, user.FirstName, user.LastName, user.HomeURL); |
415 | } | 490 | } |
416 | 491 | ||
417 | public bool IsLocalGridUser(UUID uuid) | 492 | public bool IsLocalGridUser(UUID uuid) |
@@ -425,13 +500,23 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
425 | 500 | ||
426 | #endregion IUserManagement | 501 | #endregion IUserManagement |
427 | 502 | ||
503 | protected void RegisterConsoleCmds() | ||
504 | { | ||
505 | MainConsole.Instance.Commands.AddCommand("Users", true, | ||
506 | "show names", | ||
507 | "show names", | ||
508 | "Show the bindings between user UUIDs and user names", | ||
509 | String.Empty, | ||
510 | HandleShowUsers); | ||
511 | } | ||
512 | |||
428 | private void HandleShowUsers(string module, string[] cmd) | 513 | private void HandleShowUsers(string module, string[] cmd) |
429 | { | 514 | { |
430 | lock (m_UserCache) | 515 | lock (m_UserCache) |
431 | { | 516 | { |
432 | if (m_UserCache.Count == 0) | 517 | if (m_UserCache.Count == 0) |
433 | { | 518 | { |
434 | MainConsole.Instance.Output("No users not found"); | 519 | MainConsole.Instance.Output("No users found"); |
435 | return; | 520 | return; |
436 | } | 521 | } |
437 | 522 | ||