diff options
author | Diva Canto | 2010-01-10 21:00:03 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 21:00:03 -0800 |
commit | cddd48aeeaee98d14fd4ae887cdf32abc6110c40 (patch) | |
tree | 139f66b5da9e23db4ab65b74ebdd1c06bced11f0 | |
parent | All Framework.Communications.Clients and Framework.Communications.Services de... (diff) | |
download | opensim-SC_OLD-cddd48aeeaee98d14fd4ae887cdf32abc6110c40.zip opensim-SC_OLD-cddd48aeeaee98d14fd4ae887cdf32abc6110c40.tar.gz opensim-SC_OLD-cddd48aeeaee98d14fd4ae887cdf32abc6110c40.tar.bz2 opensim-SC_OLD-cddd48aeeaee98d14fd4ae887cdf32abc6110c40.tar.xz |
Some more unnecessary things deleted in Framework.Communications.
9 files changed, 0 insertions, 1324 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs index c40ea0e..9755e73 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs | |||
@@ -35,7 +35,6 @@ using Nini.Config; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | using IUserService = OpenSim.Framework.Communications.IUserService; | ||
39 | using IAvatarService = OpenSim.Services.Interfaces.IAvatarService; | 38 | using IAvatarService = OpenSim.Services.Interfaces.IAvatarService; |
40 | 39 | ||
41 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 40 | namespace OpenSim.ApplicationPlugins.Rest.Inventory |
diff --git a/OpenSim/Framework/Communications/IAuthentication.cs b/OpenSim/Framework/Communications/IAuthentication.cs deleted file mode 100644 index bd568e4..0000000 --- a/OpenSim/Framework/Communications/IAuthentication.cs +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
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 OpenMetaverse; | ||
30 | |||
31 | namespace OpenSim.Framework.Communications | ||
32 | { | ||
33 | public interface IAuthentication | ||
34 | { | ||
35 | string GetNewKey(string url, UUID userID, UUID authToken); | ||
36 | bool VerifyKey(UUID userID, string key); | ||
37 | bool VerifySession(UUID iserID, UUID sessionID); | ||
38 | } | ||
39 | } | ||
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs deleted file mode 100644 index 760aa62..0000000 --- a/OpenSim/Framework/Communications/IAvatarService.cs +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
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 OpenMetaverse; | ||
29 | |||
30 | namespace OpenSim.Framework.Communications | ||
31 | { | ||
32 | public interface IAvatarService | ||
33 | { | ||
34 | /// <summary> | ||
35 | /// Get avatar appearance information | ||
36 | /// </summary> | ||
37 | /// <param name="user"></param> | ||
38 | /// <returns></returns> | ||
39 | AvatarAppearance GetUserAppearance(UUID user); | ||
40 | |||
41 | /// <summary> | ||
42 | /// Update avatar appearance information | ||
43 | /// </summary> | ||
44 | /// <param name="user"></param> | ||
45 | /// <param name="appearance"></param> | ||
46 | void UpdateUserAppearance(UUID user, AvatarAppearance appearance); | ||
47 | } | ||
48 | } | ||
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs deleted file mode 100644 index 7f17872..0000000 --- a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
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.Collections.Generic; | ||
29 | using OpenMetaverse; | ||
30 | |||
31 | namespace OpenSim.Framework.Communications | ||
32 | { | ||
33 | /// <summary> | ||
34 | /// Inventory operations used between grid services. | ||
35 | /// </summary> | ||
36 | public interface IInterServiceInventoryServices | ||
37 | { | ||
38 | /// <summary> | ||
39 | /// Create a new inventory for the given user. | ||
40 | /// </summary> | ||
41 | /// <param name="user"></param> | ||
42 | /// <returns>true if the inventory was successfully created, false otherwise</returns> | ||
43 | bool CreateNewUserInventory(UUID user); | ||
44 | |||
45 | /// <summary> | ||
46 | /// Returns a list of all the folders in a given user's inventory. | ||
47 | /// </summary> | ||
48 | /// <param name="userId"></param> | ||
49 | /// <returns>A flat list of the user's inventory folder tree, | ||
50 | /// null if there is no inventory for this user</returns> | ||
51 | List<InventoryFolderBase> GetInventorySkeleton(UUID userId); | ||
52 | |||
53 | /// <summary> | ||
54 | /// Returns a list of all the active gestures in a user's inventory. | ||
55 | /// </summary> | ||
56 | /// <param name="userId"> | ||
57 | /// The <see cref="UUID"/> of the user | ||
58 | /// </param> | ||
59 | /// <returns> | ||
60 | /// A flat list of the gesture items. | ||
61 | /// </returns> | ||
62 | List<InventoryItemBase> GetActiveGestures(UUID userId); | ||
63 | } | ||
64 | } | ||
diff --git a/OpenSim/Framework/Communications/IMessagingService.cs b/OpenSim/Framework/Communications/IMessagingService.cs deleted file mode 100644 index 5d65f19..0000000 --- a/OpenSim/Framework/Communications/IMessagingService.cs +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
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.Collections.Generic; | ||
29 | using OpenMetaverse; | ||
30 | |||
31 | namespace OpenSim.Framework.Communications | ||
32 | { | ||
33 | public interface IMessagingService | ||
34 | { | ||
35 | Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids); | ||
36 | } | ||
37 | } | ||
diff --git a/OpenSim/Framework/Communications/IUserAdminService.cs b/OpenSim/Framework/Communications/IUserAdminService.cs deleted file mode 100644 index 423b49b..0000000 --- a/OpenSim/Framework/Communications/IUserAdminService.cs +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
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 OpenMetaverse; | ||
29 | |||
30 | namespace OpenSim.Framework.Communications | ||
31 | { | ||
32 | /// <summary> | ||
33 | /// Interface for the service for administrating users | ||
34 | /// </summary> | ||
35 | public interface IUserAdminService | ||
36 | { | ||
37 | /// <summary> | ||
38 | /// Add a new user | ||
39 | /// </summary> | ||
40 | /// <param name="firstName">The first name</param> | ||
41 | /// <param name="lastName">The last name</param> | ||
42 | /// <param name="pass">password of avatar</param> | ||
43 | /// <param name="email">email of user</param> | ||
44 | /// <param name="regX">region X</param> | ||
45 | /// <param name="regY">region Y</param> | ||
46 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> | ||
47 | UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY); | ||
48 | |||
49 | /// <summary> | ||
50 | /// Add a new user with a specified UUID. SHOULD ONLY BE USED in very special circumstances from modules! | ||
51 | /// </summary> | ||
52 | /// <param name="firstName">The first name</param> | ||
53 | /// <param name="lastName">The last name</param> | ||
54 | /// <param name="pass">password of avatar</param> | ||
55 | /// <param name="email">email of user</param> | ||
56 | /// <param name="regX">region X</param> | ||
57 | /// <param name="regY">region Y</param> | ||
58 | /// <param name="setUUID">The set UUID</param> | ||
59 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> | ||
60 | UUID AddUser(string firstName, string lastName, string pass, string email, uint regX, uint regY, UUID setUUID); | ||
61 | |||
62 | /// <summary> | ||
63 | /// Reset a user password | ||
64 | /// </summary> | ||
65 | /// <param name="firstName"></param> | ||
66 | /// <param name="lastName"></param> | ||
67 | /// <param name="newPassword"></param> | ||
68 | /// <returns>true if the update was successful, false otherwise</returns> | ||
69 | bool ResetUserPassword(string firstName, string lastName, string newPassword); | ||
70 | } | ||
71 | } | ||
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs deleted file mode 100644 index caa9c1c..0000000 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ /dev/null | |||
@@ -1,910 +0,0 @@ | |||
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.Generic; | ||
30 | using System.Net; | ||
31 | using System.Reflection; | ||
32 | using System.Security.Cryptography; | ||
33 | using log4net; | ||
34 | using Nwc.XmlRpc; | ||
35 | using OpenMetaverse; | ||
36 | using OpenMetaverse.StructuredData; | ||
37 | using OpenSim.Data; | ||
38 | using OpenSim.Framework.Communications; | ||
39 | using OpenSim.Framework.Statistics; | ||
40 | using OpenSim.Services.Interfaces; | ||
41 | |||
42 | namespace OpenSim.Framework.Communications | ||
43 | { | ||
44 | /// <summary> | ||
45 | /// Base class for user management (create, read, etc) | ||
46 | /// </summary> | ||
47 | public abstract class UserManagerBase | ||
48 | : IUserService, IUserAdminService, IAvatarService, IMessagingService, IAuthentication | ||
49 | { | ||
50 | private static readonly ILog m_log | ||
51 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
52 | |||
53 | /// <value> | ||
54 | /// List of plugins to search for user data | ||
55 | /// </value> | ||
56 | private List<IUserDataPlugin> m_plugins = new List<IUserDataPlugin>(); | ||
57 | |||
58 | protected CommunicationsManager m_commsManager; | ||
59 | protected IInventoryService m_InventoryService; | ||
60 | |||
61 | /// <summary> | ||
62 | /// Constructor | ||
63 | /// </summary> | ||
64 | /// <param name="commsManager"></param> | ||
65 | public UserManagerBase(CommunicationsManager commsManager) | ||
66 | { | ||
67 | m_commsManager = commsManager; | ||
68 | } | ||
69 | |||
70 | public virtual void SetInventoryService(IInventoryService invService) | ||
71 | { | ||
72 | m_InventoryService = invService; | ||
73 | } | ||
74 | |||
75 | /// <summary> | ||
76 | /// Add a new user data plugin - plugins will be requested in the order they were added. | ||
77 | /// </summary> | ||
78 | /// <param name="plugin">The plugin that will provide user data</param> | ||
79 | public void AddPlugin(IUserDataPlugin plugin) | ||
80 | { | ||
81 | m_plugins.Add(plugin); | ||
82 | } | ||
83 | |||
84 | /// <summary> | ||
85 | /// Adds a list of user data plugins, as described by `provider' and | ||
86 | /// `connect', to `_plugins'. | ||
87 | /// </summary> | ||
88 | /// <param name="provider"> | ||
89 | /// The filename of the inventory server plugin DLL. | ||
90 | /// </param> | ||
91 | /// <param name="connect"> | ||
92 | /// The connection string for the storage backend. | ||
93 | /// </param> | ||
94 | public void AddPlugin(string provider, string connect) | ||
95 | { | ||
96 | m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IUserDataPlugin>(provider, connect)); | ||
97 | } | ||
98 | |||
99 | #region UserProfile | ||
100 | |||
101 | public virtual void AddTemporaryUserProfile(UserProfileData userProfile) | ||
102 | { | ||
103 | foreach (IUserDataPlugin plugin in m_plugins) | ||
104 | { | ||
105 | plugin.AddTemporaryUserProfile(userProfile); | ||
106 | } | ||
107 | } | ||
108 | |||
109 | public virtual UserProfileData GetUserProfile(string fname, string lname) | ||
110 | { | ||
111 | foreach (IUserDataPlugin plugin in m_plugins) | ||
112 | { | ||
113 | UserProfileData profile = plugin.GetUserByName(fname, lname); | ||
114 | |||
115 | if (profile != null) | ||
116 | { | ||
117 | profile.CurrentAgent = GetUserAgent(profile.ID); | ||
118 | return profile; | ||
119 | } | ||
120 | } | ||
121 | |||
122 | return null; | ||
123 | } | ||
124 | |||
125 | public void LogoutUsers(UUID regionID) | ||
126 | { | ||
127 | foreach (IUserDataPlugin plugin in m_plugins) | ||
128 | { | ||
129 | plugin.LogoutUsers(regionID); | ||
130 | } | ||
131 | } | ||
132 | |||
133 | public void ResetAttachments(UUID userID) | ||
134 | { | ||
135 | foreach (IUserDataPlugin plugin in m_plugins) | ||
136 | { | ||
137 | plugin.ResetAttachments(userID); | ||
138 | } | ||
139 | } | ||
140 | |||
141 | public UserProfileData GetUserProfile(Uri uri) | ||
142 | { | ||
143 | foreach (IUserDataPlugin plugin in m_plugins) | ||
144 | { | ||
145 | UserProfileData profile = plugin.GetUserByUri(uri); | ||
146 | |||
147 | if (null != profile) | ||
148 | return profile; | ||
149 | } | ||
150 | |||
151 | return null; | ||
152 | } | ||
153 | |||
154 | public virtual UserAgentData GetAgentByUUID(UUID userId) | ||
155 | { | ||
156 | foreach (IUserDataPlugin plugin in m_plugins) | ||
157 | { | ||
158 | UserAgentData agent = plugin.GetAgentByUUID(userId); | ||
159 | |||
160 | if (agent != null) | ||
161 | { | ||
162 | return agent; | ||
163 | } | ||
164 | } | ||
165 | |||
166 | return null; | ||
167 | } | ||
168 | |||
169 | public Uri GetUserUri(UserProfileData userProfile) | ||
170 | { | ||
171 | throw new NotImplementedException(); | ||
172 | } | ||
173 | |||
174 | // see IUserService | ||
175 | public virtual UserProfileData GetUserProfile(UUID uuid) | ||
176 | { | ||
177 | foreach (IUserDataPlugin plugin in m_plugins) | ||
178 | { | ||
179 | UserProfileData profile = plugin.GetUserByUUID(uuid); | ||
180 | |||
181 | if (null != profile) | ||
182 | { | ||
183 | profile.CurrentAgent = GetUserAgent(profile.ID); | ||
184 | return profile; | ||
185 | } | ||
186 | } | ||
187 | |||
188 | return null; | ||
189 | } | ||
190 | |||
191 | public virtual List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query) | ||
192 | { | ||
193 | List<AvatarPickerAvatar> allPickerList = new List<AvatarPickerAvatar>(); | ||
194 | |||
195 | foreach (IUserDataPlugin plugin in m_plugins) | ||
196 | { | ||
197 | try | ||
198 | { | ||
199 | List<AvatarPickerAvatar> pickerList = plugin.GeneratePickerResults(queryID, query); | ||
200 | if (pickerList != null) | ||
201 | allPickerList.AddRange(pickerList); | ||
202 | } | ||
203 | catch (Exception) | ||
204 | { | ||
205 | m_log.Error( | ||
206 | "[USERSTORAGE]: Unable to generate AgentPickerData via " + plugin.Name + "(" + query + ")"); | ||
207 | } | ||
208 | } | ||
209 | |||
210 | return allPickerList; | ||
211 | } | ||
212 | |||
213 | public virtual bool UpdateUserProfile(UserProfileData data) | ||
214 | { | ||
215 | bool result = false; | ||
216 | |||
217 | foreach (IUserDataPlugin plugin in m_plugins) | ||
218 | { | ||
219 | try | ||
220 | { | ||
221 | plugin.UpdateUserProfile(data); | ||
222 | result = true; | ||
223 | } | ||
224 | catch (Exception e) | ||
225 | { | ||
226 | m_log.ErrorFormat( | ||
227 | "[USERSTORAGE]: Unable to set user {0} {1} via {2}: {3}", | ||
228 | data.FirstName, data.SurName, plugin.Name, e.ToString()); | ||
229 | } | ||
230 | } | ||
231 | |||
232 | return result; | ||
233 | } | ||
234 | |||
235 | #endregion | ||
236 | |||
237 | #region Get UserAgent | ||
238 | |||
239 | /// <summary> | ||
240 | /// Loads a user agent by uuid (not called directly) | ||
241 | /// </summary> | ||
242 | /// <param name="uuid">The agent's UUID</param> | ||
243 | /// <returns>Agent profiles</returns> | ||
244 | public UserAgentData GetUserAgent(UUID uuid) | ||
245 | { | ||
246 | foreach (IUserDataPlugin plugin in m_plugins) | ||
247 | { | ||
248 | try | ||
249 | { | ||
250 | UserAgentData result = plugin.GetAgentByUUID(uuid); | ||
251 | |||
252 | if (result != null) | ||
253 | return result; | ||
254 | } | ||
255 | catch (Exception e) | ||
256 | { | ||
257 | m_log.Error("[USERSTORAGE]: Unable to find user via " + plugin.Name + "(" + e.ToString() + ")"); | ||
258 | } | ||
259 | } | ||
260 | |||
261 | return null; | ||
262 | } | ||
263 | |||
264 | /// <summary> | ||
265 | /// Loads a user agent by name (not called directly) | ||
266 | /// </summary> | ||
267 | /// <param name="name">The agent's name</param> | ||
268 | /// <returns>A user agent</returns> | ||
269 | public UserAgentData GetUserAgent(string name) | ||
270 | { | ||
271 | foreach (IUserDataPlugin plugin in m_plugins) | ||
272 | { | ||
273 | try | ||
274 | { | ||
275 | UserAgentData result = plugin.GetAgentByName(name); | ||
276 | |||
277 | if (result != null) | ||
278 | return result; | ||
279 | } | ||
280 | catch (Exception e) | ||
281 | { | ||
282 | m_log.Error("[USERSTORAGE]: Unable to find user via " + plugin.Name + "(" + e.ToString() + ")"); | ||
283 | } | ||
284 | } | ||
285 | |||
286 | return null; | ||
287 | } | ||
288 | |||
289 | /// <summary> | ||
290 | /// Loads a user agent by name (not called directly) | ||
291 | /// </summary> | ||
292 | /// <param name="fname">The agent's firstname</param> | ||
293 | /// <param name="lname">The agent's lastname</param> | ||
294 | /// <returns>A user agent</returns> | ||
295 | public UserAgentData GetUserAgent(string fname, string lname) | ||
296 | { | ||
297 | foreach (IUserDataPlugin plugin in m_plugins) | ||
298 | { | ||
299 | try | ||
300 | { | ||
301 | UserAgentData result = plugin.GetAgentByName(fname, lname); | ||
302 | |||
303 | if (result != null) | ||
304 | return result; | ||
305 | } | ||
306 | catch (Exception e) | ||
307 | { | ||
308 | m_log.Error("[USERSTORAGE]: Unable to find user via " + plugin.Name + "(" + e.ToString() + ")"); | ||
309 | } | ||
310 | } | ||
311 | |||
312 | return null; | ||
313 | } | ||
314 | |||
315 | public virtual List<FriendListItem> GetUserFriendList(UUID ownerID) | ||
316 | { | ||
317 | List<FriendListItem> allFriends = new List<FriendListItem>(); | ||
318 | |||
319 | foreach (IUserDataPlugin plugin in m_plugins) | ||
320 | { | ||
321 | try | ||
322 | { | ||
323 | List<FriendListItem> friends = plugin.GetUserFriendList(ownerID); | ||
324 | |||
325 | if (friends != null) | ||
326 | allFriends.AddRange(friends); | ||
327 | } | ||
328 | catch (Exception e) | ||
329 | { | ||
330 | m_log.Error("[USERSTORAGE]: Unable to GetUserFriendList via " + plugin.Name + "(" + e.ToString() + ")"); | ||
331 | } | ||
332 | } | ||
333 | |||
334 | return allFriends; | ||
335 | } | ||
336 | |||
337 | public virtual Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids) | ||
338 | { | ||
339 | //Dictionary<UUID, FriendRegionInfo> allFriendRegions = new Dictionary<UUID, FriendRegionInfo>(); | ||
340 | |||
341 | foreach (IUserDataPlugin plugin in m_plugins) | ||
342 | { | ||
343 | try | ||
344 | { | ||
345 | Dictionary<UUID, FriendRegionInfo> friendRegions = plugin.GetFriendRegionInfos(uuids); | ||
346 | |||
347 | if (friendRegions != null) | ||
348 | return friendRegions; | ||
349 | } | ||
350 | catch (Exception e) | ||
351 | { | ||
352 | m_log.Error("[USERSTORAGE]: Unable to GetFriendRegionInfos via " + plugin.Name + "(" + e.ToString() + ")"); | ||
353 | } | ||
354 | } | ||
355 | |||
356 | return new Dictionary<UUID, FriendRegionInfo>(); | ||
357 | } | ||
358 | |||
359 | public void StoreWebLoginKey(UUID agentID, UUID webLoginKey) | ||
360 | { | ||
361 | foreach (IUserDataPlugin plugin in m_plugins) | ||
362 | { | ||
363 | try | ||
364 | { | ||
365 | plugin.StoreWebLoginKey(agentID, webLoginKey); | ||
366 | } | ||
367 | catch (Exception e) | ||
368 | { | ||
369 | m_log.Error("[USERSTORAGE]: Unable to Store WebLoginKey via " + plugin.Name + "(" + e.ToString() + ")"); | ||
370 | } | ||
371 | } | ||
372 | } | ||
373 | |||
374 | public virtual void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) | ||
375 | { | ||
376 | foreach (IUserDataPlugin plugin in m_plugins) | ||
377 | { | ||
378 | try | ||
379 | { | ||
380 | plugin.AddNewUserFriend(friendlistowner, friend, perms); | ||
381 | } | ||
382 | catch (Exception e) | ||
383 | { | ||
384 | m_log.Error("[USERSTORAGE]: Unable to AddNewUserFriend via " + plugin.Name + "(" + e.ToString() + ")"); | ||
385 | } | ||
386 | } | ||
387 | } | ||
388 | |||
389 | public virtual void RemoveUserFriend(UUID friendlistowner, UUID friend) | ||
390 | { | ||
391 | foreach (IUserDataPlugin plugin in m_plugins) | ||
392 | { | ||
393 | try | ||
394 | { | ||
395 | plugin.RemoveUserFriend(friendlistowner, friend); | ||
396 | } | ||
397 | catch (Exception e) | ||
398 | { | ||
399 | m_log.Error("[USERSTORAGE]: Unable to RemoveUserFriend via " + plugin.Name + "(" + e.ToString() + ")"); | ||
400 | } | ||
401 | } | ||
402 | } | ||
403 | |||
404 | public virtual void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) | ||
405 | { | ||
406 | foreach (IUserDataPlugin plugin in m_plugins) | ||
407 | { | ||
408 | try | ||
409 | { | ||
410 | plugin.UpdateUserFriendPerms(friendlistowner, friend, perms); | ||
411 | } | ||
412 | catch (Exception e) | ||
413 | { | ||
414 | m_log.Error("[USERSTORAGE]: Unable to UpdateUserFriendPerms via " + plugin.Name + "(" + e.ToString() + ")"); | ||
415 | } | ||
416 | } | ||
417 | } | ||
418 | |||
419 | /// <summary> | ||
420 | /// Resets the currentAgent in the user profile | ||
421 | /// </summary> | ||
422 | /// <param name="agentID">The agent's ID</param> | ||
423 | public virtual void ClearUserAgent(UUID agentID) | ||
424 | { | ||
425 | UserProfileData profile = GetUserProfile(agentID); | ||
426 | |||
427 | if (profile == null) | ||
428 | { | ||
429 | return; | ||
430 | } | ||
431 | |||
432 | profile.CurrentAgent = null; | ||
433 | |||
434 | UpdateUserProfile(profile); | ||
435 | } | ||
436 | |||
437 | #endregion | ||
438 | |||
439 | #region CreateAgent | ||
440 | |||
441 | /// <summary> | ||
442 | /// Creates and initialises a new user agent - make sure to use CommitAgent when done to submit to the DB | ||
443 | /// </summary> | ||
444 | /// <param name="profile">The users profile</param> | ||
445 | /// <param name="request">The users loginrequest</param> | ||
446 | public void CreateAgent(UserProfileData profile, XmlRpcRequest request) | ||
447 | { | ||
448 | //m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID); | ||
449 | |||
450 | UserAgentData agent = new UserAgentData(); | ||
451 | |||
452 | // User connection | ||
453 | agent.AgentOnline = true; | ||
454 | |||
455 | if (request.Params.Count > 1) | ||
456 | { | ||
457 | if (request.Params[1] != null) | ||
458 | { | ||
459 | IPEndPoint RemoteIPEndPoint = (IPEndPoint)request.Params[1]; | ||
460 | agent.AgentIP = RemoteIPEndPoint.Address.ToString(); | ||
461 | agent.AgentPort = (uint)RemoteIPEndPoint.Port; | ||
462 | } | ||
463 | } | ||
464 | |||
465 | // Generate sessions | ||
466 | RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); | ||
467 | byte[] randDataS = new byte[16]; | ||
468 | byte[] randDataSS = new byte[16]; | ||
469 | rand.GetBytes(randDataS); | ||
470 | rand.GetBytes(randDataSS); | ||
471 | |||
472 | agent.SecureSessionID = new UUID(randDataSS, 0); | ||
473 | agent.SessionID = new UUID(randDataS, 0); | ||
474 | |||
475 | // Profile UUID | ||
476 | agent.ProfileID = profile.ID; | ||
477 | |||
478 | // Current location/position/alignment | ||
479 | if (profile.CurrentAgent != null) | ||
480 | { | ||
481 | agent.Region = profile.CurrentAgent.Region; | ||
482 | agent.Handle = profile.CurrentAgent.Handle; | ||
483 | agent.Position = profile.CurrentAgent.Position; | ||
484 | agent.LookAt = profile.CurrentAgent.LookAt; | ||
485 | } | ||
486 | else | ||
487 | { | ||
488 | agent.Region = profile.HomeRegionID; | ||
489 | agent.Handle = profile.HomeRegion; | ||
490 | agent.Position = profile.HomeLocation; | ||
491 | agent.LookAt = profile.HomeLookAt; | ||
492 | } | ||
493 | |||
494 | // What time did the user login? | ||
495 | agent.LoginTime = Util.UnixTimeSinceEpoch(); | ||
496 | agent.LogoutTime = 0; | ||
497 | |||
498 | profile.CurrentAgent = agent; | ||
499 | } | ||
500 | |||
501 | public void CreateAgent(UserProfileData profile, OSD request) | ||
502 | { | ||
503 | //m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID); | ||
504 | |||
505 | UserAgentData agent = new UserAgentData(); | ||
506 | |||
507 | // User connection | ||
508 | agent.AgentOnline = true; | ||
509 | |||
510 | //if (request.Params.Count > 1) | ||
511 | //{ | ||
512 | // IPEndPoint RemoteIPEndPoint = (IPEndPoint)request.Params[1]; | ||
513 | // agent.AgentIP = RemoteIPEndPoint.Address.ToString(); | ||
514 | // agent.AgentPort = (uint)RemoteIPEndPoint.Port; | ||
515 | //} | ||
516 | |||
517 | // Generate sessions | ||
518 | RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); | ||
519 | byte[] randDataS = new byte[16]; | ||
520 | byte[] randDataSS = new byte[16]; | ||
521 | rand.GetBytes(randDataS); | ||
522 | rand.GetBytes(randDataSS); | ||
523 | |||
524 | agent.SecureSessionID = new UUID(randDataSS, 0); | ||
525 | agent.SessionID = new UUID(randDataS, 0); | ||
526 | |||
527 | // Profile UUID | ||
528 | agent.ProfileID = profile.ID; | ||
529 | |||
530 | // Current location/position/alignment | ||
531 | if (profile.CurrentAgent != null) | ||
532 | { | ||
533 | agent.Region = profile.CurrentAgent.Region; | ||
534 | agent.Handle = profile.CurrentAgent.Handle; | ||
535 | agent.Position = profile.CurrentAgent.Position; | ||
536 | agent.LookAt = profile.CurrentAgent.LookAt; | ||
537 | } | ||
538 | else | ||
539 | { | ||
540 | agent.Region = profile.HomeRegionID; | ||
541 | agent.Handle = profile.HomeRegion; | ||
542 | agent.Position = profile.HomeLocation; | ||
543 | agent.LookAt = profile.HomeLookAt; | ||
544 | } | ||
545 | |||
546 | // What time did the user login? | ||
547 | agent.LoginTime = Util.UnixTimeSinceEpoch(); | ||
548 | agent.LogoutTime = 0; | ||
549 | |||
550 | profile.CurrentAgent = agent; | ||
551 | } | ||
552 | |||
553 | /// <summary> | ||
554 | /// Saves a target agent to the database | ||
555 | /// </summary> | ||
556 | /// <param name="profile">The users profile</param> | ||
557 | /// <returns>Successful?</returns> | ||
558 | public bool CommitAgent(ref UserProfileData profile) | ||
559 | { | ||
560 | //m_log.DebugFormat("[USER MANAGER]: Committing agent {0} {1}", profile.Name, profile.ID); | ||
561 | |||
562 | // TODO: how is this function different from setUserProfile? -> Add AddUserAgent() here and commit both tables "users" and "agents" | ||
563 | // TODO: what is the logic should be? | ||
564 | bool ret = false; | ||
565 | ret = AddUserAgent(profile.CurrentAgent); | ||
566 | ret = ret & UpdateUserProfile(profile); | ||
567 | return ret; | ||
568 | } | ||
569 | |||
570 | /// <summary> | ||
571 | /// Process a user logoff from OpenSim. | ||
572 | /// </summary> | ||
573 | /// <param name="userid"></param> | ||
574 | /// <param name="regionid"></param> | ||
575 | /// <param name="regionhandle"></param> | ||
576 | /// <param name="position"></param> | ||
577 | /// <param name="lookat"></param> | ||
578 | public virtual void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat) | ||
579 | { | ||
580 | if (StatsManager.UserStats != null) | ||
581 | StatsManager.UserStats.AddLogout(); | ||
582 | |||
583 | UserProfileData userProfile = GetUserProfile(userid); | ||
584 | |||
585 | if (userProfile != null) | ||
586 | { | ||
587 | UserAgentData userAgent = userProfile.CurrentAgent; | ||
588 | if (userAgent != null) | ||
589 | { | ||
590 | userAgent.AgentOnline = false; | ||
591 | userAgent.LogoutTime = Util.UnixTimeSinceEpoch(); | ||
592 | //userAgent.sessionID = UUID.Zero; | ||
593 | if (regionid != UUID.Zero) | ||
594 | { | ||
595 | userAgent.Region = regionid; | ||
596 | } | ||
597 | userAgent.Handle = regionhandle; | ||
598 | userAgent.Position = position; | ||
599 | userAgent.LookAt = lookat; | ||
600 | //userProfile.CurrentAgent = userAgent; | ||
601 | userProfile.LastLogin = userAgent.LogoutTime; | ||
602 | |||
603 | CommitAgent(ref userProfile); | ||
604 | } | ||
605 | else | ||
606 | { | ||
607 | // If currentagent is null, we can't reference it here or the UserServer crashes! | ||
608 | m_log.Info("[LOGOUT]: didn't save logout position: " + userid.ToString()); | ||
609 | } | ||
610 | } | ||
611 | else | ||
612 | { | ||
613 | m_log.Warn("[LOGOUT]: Unknown User logged out"); | ||
614 | } | ||
615 | } | ||
616 | |||
617 | public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz) | ||
618 | { | ||
619 | LogOffUser(userid, regionid, regionhandle, new Vector3(posx, posy, posz), new Vector3()); | ||
620 | } | ||
621 | |||
622 | #endregion | ||
623 | |||
624 | /// <summary> | ||
625 | /// Add a new user | ||
626 | /// </summary> | ||
627 | /// <param name="firstName">first name</param> | ||
628 | /// <param name="lastName">last name</param> | ||
629 | /// <param name="password">password</param> | ||
630 | /// <param name="email">email</param> | ||
631 | /// <param name="regX">location X</param> | ||
632 | /// <param name="regY">location Y</param> | ||
633 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> | ||
634 | public virtual UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) | ||
635 | { | ||
636 | return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random()); | ||
637 | } | ||
638 | |||
639 | /// <summary> | ||
640 | /// Add a new user | ||
641 | /// </summary> | ||
642 | /// <param name="firstName">first name</param> | ||
643 | /// <param name="lastName">last name</param> | ||
644 | /// <param name="password">password</param> | ||
645 | /// <param name="email">email</param> | ||
646 | /// <param name="regX">location X</param> | ||
647 | /// <param name="regY">location Y</param> | ||
648 | /// <param name="SetUUID">UUID of avatar.</param> | ||
649 | /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> | ||
650 | public virtual UUID AddUser( | ||
651 | string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID) | ||
652 | { | ||
653 | |||
654 | UserProfileData user = new UserProfileData(); | ||
655 | |||
656 | user.PasswordSalt = Util.Md5Hash(UUID.Random().ToString()); | ||
657 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + user.PasswordSalt); | ||
658 | |||
659 | user.HomeLocation = new Vector3(128, 128, 100); | ||
660 | user.ID = SetUUID; | ||
661 | user.FirstName = firstName; | ||
662 | user.SurName = lastName; | ||
663 | user.PasswordHash = md5PasswdHash; | ||
664 | user.Created = Util.UnixTimeSinceEpoch(); | ||
665 | user.HomeLookAt = new Vector3(100, 100, 100); | ||
666 | user.HomeRegionX = regX; | ||
667 | user.HomeRegionY = regY; | ||
668 | user.Email = email; | ||
669 | |||
670 | foreach (IUserDataPlugin plugin in m_plugins) | ||
671 | { | ||
672 | try | ||
673 | { | ||
674 | plugin.AddNewUserProfile(user); | ||
675 | } | ||
676 | catch (Exception e) | ||
677 | { | ||
678 | m_log.Error("[USERSTORAGE]: Unable to add user via " + plugin.Name + "(" + e.ToString() + ")"); | ||
679 | } | ||
680 | } | ||
681 | |||
682 | UserProfileData userProf = GetUserProfile(firstName, lastName); | ||
683 | if (userProf == null) | ||
684 | { | ||
685 | return UUID.Zero; | ||
686 | } | ||
687 | else | ||
688 | { | ||
689 | return userProf.ID; | ||
690 | } | ||
691 | } | ||
692 | |||
693 | /// <summary> | ||
694 | /// Reset a user password. | ||
695 | /// </summary> | ||
696 | /// <param name="firstName"></param> | ||
697 | /// <param name="lastName"></param> | ||
698 | /// <param name="newPassword"></param> | ||
699 | /// <returns>true if the update was successful, false otherwise</returns> | ||
700 | public virtual bool ResetUserPassword(string firstName, string lastName, string newPassword) | ||
701 | { | ||
702 | string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(newPassword) + ":" + String.Empty); | ||
703 | |||
704 | UserProfileData profile = GetUserProfile(firstName, lastName); | ||
705 | |||
706 | if (null == profile) | ||
707 | { | ||
708 | m_log.ErrorFormat("[USERSTORAGE]: Could not find user {0} {1}", firstName, lastName); | ||
709 | return false; | ||
710 | } | ||
711 | |||
712 | profile.PasswordHash = md5PasswdHash; | ||
713 | profile.PasswordSalt = String.Empty; | ||
714 | |||
715 | UpdateUserProfile(profile); | ||
716 | |||
717 | return true; | ||
718 | } | ||
719 | |||
720 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName); | ||
721 | public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password); | ||
722 | public abstract UserProfileData SetupMasterUser(UUID uuid); | ||
723 | |||
724 | /// <summary> | ||
725 | /// Add an agent using data plugins. | ||
726 | /// </summary> | ||
727 | /// <param name="agentdata">The agent data to be added</param> | ||
728 | /// <returns> | ||
729 | /// true if at least one plugin added the user agent. false if no plugin successfully added the agent | ||
730 | /// </returns> | ||
731 | public virtual bool AddUserAgent(UserAgentData agentdata) | ||
732 | { | ||
733 | bool result = false; | ||
734 | |||
735 | foreach (IUserDataPlugin plugin in m_plugins) | ||
736 | { | ||
737 | try | ||
738 | { | ||
739 | plugin.AddNewUserAgent(agentdata); | ||
740 | result = true; | ||
741 | } | ||
742 | catch (Exception e) | ||
743 | { | ||
744 | m_log.Error("[USERSTORAGE]: Unable to add agent via " + plugin.Name + "(" + e.ToString() + ")"); | ||
745 | } | ||
746 | } | ||
747 | |||
748 | return result; | ||
749 | } | ||
750 | |||
751 | /// <summary> | ||
752 | /// Get avatar appearance information | ||
753 | /// </summary> | ||
754 | /// <param name="user"></param> | ||
755 | /// <returns></returns> | ||
756 | public virtual AvatarAppearance GetUserAppearance(UUID user) | ||
757 | { | ||
758 | foreach (IUserDataPlugin plugin in m_plugins) | ||
759 | { | ||
760 | try | ||
761 | { | ||
762 | AvatarAppearance appearance = plugin.GetUserAppearance(user); | ||
763 | |||
764 | if (appearance != null) | ||
765 | return appearance; | ||
766 | } | ||
767 | catch (Exception e) | ||
768 | { | ||
769 | m_log.ErrorFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Name, e.ToString()); | ||
770 | } | ||
771 | } | ||
772 | |||
773 | return null; | ||
774 | } | ||
775 | |||
776 | public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance) | ||
777 | { | ||
778 | foreach (IUserDataPlugin plugin in m_plugins) | ||
779 | { | ||
780 | try | ||
781 | { | ||
782 | plugin.UpdateUserAppearance(user, appearance); | ||
783 | } | ||
784 | catch (Exception e) | ||
785 | { | ||
786 | m_log.ErrorFormat("[USERSTORAGE]: Unable to update user appearance {0} via {1} ({2})", user.ToString(), plugin.Name, e.ToString()); | ||
787 | } | ||
788 | } | ||
789 | } | ||
790 | |||
791 | #region IAuthentication | ||
792 | |||
793 | protected Dictionary<UUID, List<string>> m_userKeys = new Dictionary<UUID, List<string>>(); | ||
794 | |||
795 | /// <summary> | ||
796 | /// This generates authorization keys in the form | ||
797 | /// http://userserver/uuid | ||
798 | /// after verifying that the caller is, indeed, authorized to request a key | ||
799 | /// </summary> | ||
800 | /// <param name="url">URL of the user server</param> | ||
801 | /// <param name="userID">The user ID requesting the new key</param> | ||
802 | /// <param name="authToken">The original authorization token for that user, obtained during login</param> | ||
803 | /// <returns></returns> | ||
804 | public string GetNewKey(string url, UUID userID, UUID authToken) | ||
805 | { | ||
806 | UserProfileData profile = GetUserProfile(userID); | ||
807 | string newKey = string.Empty; | ||
808 | if (!url.EndsWith("/")) | ||
809 | url = url + "/"; | ||
810 | |||
811 | if (profile != null) | ||
812 | { | ||
813 | // I'm overloading webloginkey for this, so that no changes are needed in the DB | ||
814 | // The uses of webloginkey are fairly mutually exclusive | ||
815 | if (profile.WebLoginKey.Equals(authToken)) | ||
816 | { | ||
817 | newKey = UUID.Random().ToString(); | ||
818 | List<string> keys; | ||
819 | lock (m_userKeys) | ||
820 | { | ||
821 | if (m_userKeys.ContainsKey(userID)) | ||
822 | { | ||
823 | keys = m_userKeys[userID]; | ||
824 | } | ||
825 | else | ||
826 | { | ||
827 | keys = new List<string>(); | ||
828 | m_userKeys.Add(userID, keys); | ||
829 | } | ||
830 | keys.Add(newKey); | ||
831 | } | ||
832 | m_log.InfoFormat("[USERAUTH]: Successfully generated new auth key for user {0}", userID); | ||
833 | } | ||
834 | else | ||
835 | m_log.Warn("[USERAUTH]: Unauthorized key generation request. Denying new key."); | ||
836 | } | ||
837 | else | ||
838 | m_log.Warn("[USERAUTH]: User not found."); | ||
839 | |||
840 | return url + newKey; | ||
841 | } | ||
842 | |||
843 | /// <summary> | ||
844 | /// This verifies the uuid portion of the key given out by GenerateKey | ||
845 | /// </summary> | ||
846 | /// <param name="userID"></param> | ||
847 | /// <param name="key"></param> | ||
848 | /// <returns></returns> | ||
849 | public bool VerifyKey(UUID userID, string key) | ||
850 | { | ||
851 | lock (m_userKeys) | ||
852 | { | ||
853 | if (m_userKeys.ContainsKey(userID)) | ||
854 | { | ||
855 | List<string> keys = m_userKeys[userID]; | ||
856 | if (keys.Contains(key)) | ||
857 | { | ||
858 | // Keys are one-time only, so remove it | ||
859 | keys.Remove(key); | ||
860 | return true; | ||
861 | } | ||
862 | return false; | ||
863 | } | ||
864 | else | ||
865 | return false; | ||
866 | } | ||
867 | } | ||
868 | |||
869 | public virtual bool VerifySession(UUID userID, UUID sessionID) | ||
870 | { | ||
871 | UserProfileData userProfile = GetUserProfile(userID); | ||
872 | |||
873 | if (userProfile != null && userProfile.CurrentAgent != null) | ||
874 | { | ||
875 | m_log.DebugFormat( | ||
876 | "[USER AUTH]: Verifying session {0} for {1}; current session {2}", | ||
877 | sessionID, userID, userProfile.CurrentAgent.SessionID); | ||
878 | |||
879 | if (userProfile.CurrentAgent.SessionID == sessionID) | ||
880 | { | ||
881 | return true; | ||
882 | } | ||
883 | } | ||
884 | |||
885 | return false; | ||
886 | } | ||
887 | |||
888 | public virtual bool AuthenticateUserByPassword(UUID userID, string password) | ||
889 | { | ||
890 | // m_log.DebugFormat("[USER AUTH]: Authenticating user {0} given password {1}", userID, password); | ||
891 | |||
892 | UserProfileData userProfile = GetUserProfile(userID); | ||
893 | |||
894 | if (null == userProfile) | ||
895 | return false; | ||
896 | |||
897 | string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt); | ||
898 | |||
899 | // m_log.DebugFormat( | ||
900 | // "[USER AUTH]: Submitted hash {0}, stored hash {1}", md5PasswordHash, userProfile.PasswordHash); | ||
901 | |||
902 | if (md5PasswordHash == userProfile.PasswordHash) | ||
903 | return true; | ||
904 | else | ||
905 | return false; | ||
906 | } | ||
907 | |||
908 | #endregion | ||
909 | } | ||
910 | } | ||
diff --git a/OpenSim/Tests/Common/Mock/MockUserService.cs b/OpenSim/Tests/Common/Mock/MockUserService.cs deleted file mode 100644 index 396ef25..0000000 --- a/OpenSim/Tests/Common/Mock/MockUserService.cs +++ /dev/null | |||
@@ -1,149 +0,0 @@ | |||
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.Generic; | ||
30 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Framework.Communications; | ||
33 | using OpenSim.Framework.Communications.Cache; | ||
34 | using OpenSim.Services.Interfaces; | ||
35 | |||
36 | namespace OpenSim.Tests.Common | ||
37 | { | ||
38 | public class MockUserService : IUserService | ||
39 | { | ||
40 | public void AddTemporaryUserProfile(UserProfileData userProfile) | ||
41 | { | ||
42 | throw new NotImplementedException(); | ||
43 | } | ||
44 | |||
45 | public UserProfileData GetUserProfile(string firstName, string lastName) | ||
46 | { | ||
47 | throw new NotImplementedException(); | ||
48 | } | ||
49 | |||
50 | public UserProfileData GetUserProfile(UUID userId) | ||
51 | { | ||
52 | throw new NotImplementedException(); | ||
53 | } | ||
54 | |||
55 | public UserProfileData GetUserProfile(Uri uri) | ||
56 | { | ||
57 | UserProfileData userProfile = new UserProfileData(); | ||
58 | |||
59 | // userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret)); | ||
60 | |||
61 | return userProfile; | ||
62 | } | ||
63 | |||
64 | public Uri GetUserUri(UserProfileData userProfile) | ||
65 | { | ||
66 | throw new NotImplementedException(); | ||
67 | } | ||
68 | |||
69 | public UserAgentData GetAgentByUUID(UUID userId) | ||
70 | { | ||
71 | throw new NotImplementedException(); | ||
72 | } | ||
73 | |||
74 | public void ClearUserAgent(UUID avatarID) | ||
75 | { | ||
76 | throw new NotImplementedException(); | ||
77 | } | ||
78 | |||
79 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID QueryID, string Query) | ||
80 | { | ||
81 | throw new NotImplementedException(); | ||
82 | } | ||
83 | |||
84 | public UserProfileData SetupMasterUser(string firstName, string lastName) | ||
85 | { | ||
86 | throw new NotImplementedException(); | ||
87 | } | ||
88 | |||
89 | public UserProfileData SetupMasterUser(string firstName, string lastName, string password) | ||
90 | { | ||
91 | throw new NotImplementedException(); | ||
92 | } | ||
93 | |||
94 | public UserProfileData SetupMasterUser(UUID userId) | ||
95 | { | ||
96 | throw new NotImplementedException(); | ||
97 | } | ||
98 | |||
99 | public bool UpdateUserProfile(UserProfileData data) | ||
100 | { | ||
101 | throw new NotImplementedException(); | ||
102 | } | ||
103 | |||
104 | public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) | ||
105 | { | ||
106 | throw new NotImplementedException(); | ||
107 | } | ||
108 | |||
109 | public void RemoveUserFriend(UUID friendlistowner, UUID friend) | ||
110 | { | ||
111 | throw new NotImplementedException(); | ||
112 | } | ||
113 | |||
114 | public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) | ||
115 | { | ||
116 | throw new NotImplementedException(); | ||
117 | } | ||
118 | |||
119 | public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat) | ||
120 | { | ||
121 | throw new NotImplementedException(); | ||
122 | } | ||
123 | |||
124 | public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz) | ||
125 | { | ||
126 | throw new NotImplementedException(); | ||
127 | } | ||
128 | |||
129 | public List<FriendListItem> GetUserFriendList(UUID friendlistowner) | ||
130 | { | ||
131 | throw new NotImplementedException(); | ||
132 | } | ||
133 | |||
134 | public bool VerifySession(UUID userID, UUID sessionID) | ||
135 | { | ||
136 | return true; | ||
137 | } | ||
138 | |||
139 | public void SetInventoryService(IInventoryService inv) | ||
140 | { | ||
141 | throw new NotImplementedException(); | ||
142 | } | ||
143 | |||
144 | public virtual bool AuthenticateUserByPassword(UUID userID, string password) | ||
145 | { | ||
146 | throw new NotImplementedException(); | ||
147 | } | ||
148 | } | ||
149 | } | ||
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index fccc282..d4cdcd6 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |||
@@ -58,11 +58,6 @@ namespace OpenSim.Tests.Common.Mock | |||
58 | : base(serversInfo, null) | 58 | : base(serversInfo, null) |
59 | { | 59 | { |
60 | 60 | ||
61 | LocalUserServices lus = new LocalUserServices(991, 992, this); | ||
62 | lus.AddPlugin(new TemporaryUserProfilePlugin()); | ||
63 | m_userDataPlugin = new TestUserDataPlugin(); | ||
64 | lus.AddPlugin(m_userDataPlugin); | ||
65 | |||
66 | } | 61 | } |
67 | } | 62 | } |
68 | } | 63 | } |