* Fission OGS1UserServices into user service and OGS1 user data plugin components
* Make OGS1UserServices inherit from UserManagerBase * This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims0.6.5-rc1
parent
7dbcf0570f
commit
2c81e41c8a
|
@ -220,7 +220,11 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
|
||||||
new LocalUserServices(
|
new LocalUserServices(
|
||||||
m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
|
m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
|
||||||
localuserService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource);
|
localuserService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource);
|
||||||
|
|
||||||
HGUserServices userService = new HGUserServices(localuserService);
|
HGUserServices userService = new HGUserServices(localuserService);
|
||||||
|
// This plugin arrangement could eventually be configurable rather than hardcoded here.
|
||||||
|
OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(m_commsManager);
|
||||||
|
userService.AddPlugin(userDataPlugin);
|
||||||
|
|
||||||
HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
|
HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
|
@ -48,9 +49,16 @@ namespace OpenSim.Data
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="fname">Account firstname</param>
|
/// <param name="fname">Account firstname</param>
|
||||||
/// <param name="lname">Account lastname</param>
|
/// <param name="lname">Account lastname</param>
|
||||||
/// <returns>The user data profile</returns>
|
/// <returns>The user data profile. Null if no user is found</returns>
|
||||||
UserProfileData GetUserByName(string fname, string lname);
|
UserProfileData GetUserByName(string fname, string lname);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a user from a given uri.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="uri"></param>
|
||||||
|
/// <returns>The user data profile. Null if no user is found.</returns>
|
||||||
|
UserProfileData GetUserByUri(Uri uri);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns a list of UUIDs firstnames and lastnames that match string query entered into the avatar picker.
|
/// Returns a list of UUIDs firstnames and lastnames that match string query entered into the avatar picker.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -63,7 +71,7 @@ namespace OpenSim.Data
|
||||||
/// Returns the current agent for a user searching by it's UUID
|
/// Returns the current agent for a user searching by it's UUID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="user">The users UUID</param>
|
/// <param name="user">The users UUID</param>
|
||||||
/// <returns>The current agent session</returns>
|
/// <returns>The current agent session. Null if no session was found</returns>
|
||||||
UserAgentData GetAgentByUUID(UUID user);
|
UserAgentData GetAgentByUUID(UUID user);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
|
@ -42,6 +43,7 @@ namespace OpenSim.Data
|
||||||
public abstract UserAgentData GetAgentByUUID(UUID user);
|
public abstract UserAgentData GetAgentByUUID(UUID user);
|
||||||
public abstract UserAgentData GetAgentByName(string name);
|
public abstract UserAgentData GetAgentByName(string name);
|
||||||
public abstract UserAgentData GetAgentByName(string fname, string lname);
|
public abstract UserAgentData GetAgentByName(string fname, string lname);
|
||||||
|
public UserProfileData GetUserByUri(Uri uri) { return null; }
|
||||||
public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
|
public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
|
||||||
public abstract void AddNewUserProfile(UserProfileData user);
|
public abstract void AddNewUserProfile(UserProfileData user);
|
||||||
public abstract bool UpdateUserProfile(UserProfileData user);
|
public abstract bool UpdateUserProfile(UserProfileData user);
|
||||||
|
|
|
@ -31,10 +31,18 @@ namespace OpenSim.Framework.Communications
|
||||||
{
|
{
|
||||||
public interface IAvatarService
|
public interface IAvatarService
|
||||||
{
|
{
|
||||||
/// Get's the User Appearance
|
/// <summary>
|
||||||
|
/// Get avatar appearance information
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="user"></param>
|
||||||
|
/// <returns></returns>
|
||||||
AvatarAppearance GetUserAppearance(UUID user);
|
AvatarAppearance GetUserAppearance(UUID user);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Update avatar appearance information
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="user"></param>
|
||||||
|
/// <param name="appearance"></param>
|
||||||
void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
|
void UpdateUserAppearance(UUID user, AvatarAppearance appearance);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1147,7 +1147,6 @@ namespace OpenSim.Framework.Communications.Services
|
||||||
if (m_userManager.VerifySession(guess_aid, guess_sid))
|
if (m_userManager.VerifySession(guess_aid, guess_sid))
|
||||||
{
|
{
|
||||||
authed = "TRUE";
|
authed = "TRUE";
|
||||||
}
|
|
||||||
m_log.InfoFormat("[UserManager]: CheckAuthSession TRUE for user {0}", guess_aid);
|
m_log.InfoFormat("[UserManager]: CheckAuthSession TRUE for user {0}", guess_aid);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1155,6 +1154,8 @@ namespace OpenSim.Framework.Communications.Services
|
||||||
m_log.InfoFormat("[UserManager]: CheckAuthSession FALSE");
|
m_log.InfoFormat("[UserManager]: CheckAuthSession FALSE");
|
||||||
return Util.CreateUnknownUserErrorResponse();
|
return Util.CreateUnknownUserErrorResponse();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Hashtable responseData = new Hashtable();
|
Hashtable responseData = new Hashtable();
|
||||||
responseData["auth_session"] = authed;
|
responseData["auth_session"] = authed;
|
||||||
response.Value = responseData;
|
response.Value = responseData;
|
||||||
|
|
|
@ -50,7 +50,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <value>
|
/// <value>
|
||||||
/// List of plugins to search for user data
|
/// List of plugins to search for user data
|
||||||
/// </value>
|
/// </value>
|
||||||
private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>();
|
private List<IUserDataPlugin> m_plugins = new List<IUserDataPlugin>();
|
||||||
|
|
||||||
protected IInterServiceInventoryServices m_interServiceInventoryService;
|
protected IInterServiceInventoryServices m_interServiceInventoryService;
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <param name="plugin">The plugin that will provide user data</param>
|
/// <param name="plugin">The plugin that will provide user data</param>
|
||||||
public void AddPlugin(IUserDataPlugin plugin)
|
public void AddPlugin(IUserDataPlugin plugin)
|
||||||
{
|
{
|
||||||
_plugins.Add(plugin);
|
m_plugins.Add(plugin);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -84,15 +84,15 @@ namespace OpenSim.Framework.Communications
|
||||||
/// </param>
|
/// </param>
|
||||||
public void AddPlugin(string provider, string connect)
|
public void AddPlugin(string provider, string connect)
|
||||||
{
|
{
|
||||||
_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IUserDataPlugin>(provider, connect));
|
m_plugins.AddRange(DataPluginFactory.LoadDataPlugins<IUserDataPlugin>(provider, connect));
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Get UserProfile
|
#region Get UserProfile
|
||||||
|
|
||||||
// see IUserService
|
// see IUserService
|
||||||
public UserProfileData GetUserProfile(string fname, string lname)
|
public virtual UserProfileData GetUserProfile(string fname, string lname)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
UserProfileData profile = plugin.GetUserByName(fname, lname);
|
UserProfileData profile = plugin.GetUserByName(fname, lname);
|
||||||
|
|
||||||
|
@ -108,7 +108,7 @@ namespace OpenSim.Framework.Communications
|
||||||
|
|
||||||
public void LogoutUsers(UUID regionID)
|
public void LogoutUsers(UUID regionID)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
plugin.LogoutUsers(regionID);
|
plugin.LogoutUsers(regionID);
|
||||||
}
|
}
|
||||||
|
@ -116,7 +116,7 @@ namespace OpenSim.Framework.Communications
|
||||||
|
|
||||||
public void ResetAttachments(UUID userID)
|
public void ResetAttachments(UUID userID)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
plugin.ResetAttachments(userID);
|
plugin.ResetAttachments(userID);
|
||||||
}
|
}
|
||||||
|
@ -124,12 +124,20 @@ namespace OpenSim.Framework.Communications
|
||||||
|
|
||||||
public UserProfileData GetUserProfile(Uri uri)
|
public UserProfileData GetUserProfile(Uri uri)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
|
{
|
||||||
|
UserProfileData profile = plugin.GetUserByUri(uri);
|
||||||
|
|
||||||
|
if (null != profile)
|
||||||
|
return profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserAgentData GetAgentByUUID(UUID userId)
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual UserAgentData GetAgentByUUID(UUID userId)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
UserAgentData agent = plugin.GetAgentByUUID(userId);
|
UserAgentData agent = plugin.GetAgentByUUID(userId);
|
||||||
|
|
||||||
|
@ -150,7 +158,7 @@ namespace OpenSim.Framework.Communications
|
||||||
// see IUserService
|
// see IUserService
|
||||||
public virtual UserProfileData GetUserProfile(UUID uuid)
|
public virtual UserProfileData GetUserProfile(UUID uuid)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
UserProfileData profile = plugin.GetUserByUUID(uuid);
|
UserProfileData profile = plugin.GetUserByUUID(uuid);
|
||||||
|
|
||||||
|
@ -164,10 +172,10 @@ namespace OpenSim.Framework.Communications
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
|
public virtual List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
|
||||||
{
|
{
|
||||||
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
|
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -188,9 +196,9 @@ namespace OpenSim.Framework.Communications
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="data"></param>
|
/// <param name="data"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool UpdateUserProfile(UserProfileData data)
|
public virtual bool UpdateUserProfile(UserProfileData data)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -217,7 +225,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <returns>Agent profiles</returns>
|
/// <returns>Agent profiles</returns>
|
||||||
public UserAgentData GetUserAgent(UUID uuid)
|
public UserAgentData GetUserAgent(UUID uuid)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -244,7 +252,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <returns>A user agent</returns>
|
/// <returns>A user agent</returns>
|
||||||
public UserAgentData GetUserAgent(string name)
|
public UserAgentData GetUserAgent(string name)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -267,7 +275,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <returns>A user agent</returns>
|
/// <returns>A user agent</returns>
|
||||||
public UserAgentData GetUserAgent(string fname, string lname)
|
public UserAgentData GetUserAgent(string fname, string lname)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -287,9 +295,9 @@ namespace OpenSim.Framework.Communications
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="name">the UUID of the friend list owner</param>
|
/// <param name="name">the UUID of the friend list owner</param>
|
||||||
/// <returns>A List of FriendListItems that contains info about the user's friends</returns>
|
/// <returns>A List of FriendListItems that contains info about the user's friends</returns>
|
||||||
public List<FriendListItem> GetUserFriendList(UUID ownerID)
|
public virtual List<FriendListItem> GetUserFriendList(UUID ownerID)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -309,9 +317,9 @@ namespace OpenSim.Framework.Communications
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids)
|
public virtual Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos (List<UUID> uuids)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -332,7 +340,7 @@ namespace OpenSim.Framework.Communications
|
||||||
|
|
||||||
public void StoreWebLoginKey(UUID agentID, UUID webLoginKey)
|
public void StoreWebLoginKey(UUID agentID, UUID webLoginKey)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -345,13 +353,13 @@ namespace OpenSim.Framework.Communications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
|
public virtual void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
plugin.AddNewUserFriend(friendlistowner,friend,perms);
|
plugin.AddNewUserFriend(friendlistowner, friend, perms);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -360,9 +368,9 @@ namespace OpenSim.Framework.Communications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveUserFriend(UUID friendlistowner, UUID friend)
|
public virtual void RemoveUserFriend(UUID friendlistowner, UUID friend)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -375,9 +383,9 @@ namespace OpenSim.Framework.Communications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
|
public virtual void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -394,7 +402,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// Resets the currentAgent in the user profile
|
/// Resets the currentAgent in the user profile
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="agentID">The agent's ID</param>
|
/// <param name="agentID">The agent's ID</param>
|
||||||
public void ClearUserAgent(UUID agentID)
|
public virtual void ClearUserAgent(UUID agentID)
|
||||||
{
|
{
|
||||||
UserProfileData profile = GetUserProfile(agentID);
|
UserProfileData profile = GetUserProfile(agentID);
|
||||||
|
|
||||||
|
@ -408,7 +416,6 @@ namespace OpenSim.Framework.Communications
|
||||||
UpdateUserProfile(profile);
|
UpdateUserProfile(profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region CreateAgent
|
#region CreateAgent
|
||||||
|
@ -544,7 +551,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <param name="regionhandle"></param>
|
/// <param name="regionhandle"></param>
|
||||||
/// <param name="position"></param>
|
/// <param name="position"></param>
|
||||||
/// <param name="lookat"></param>
|
/// <param name="lookat"></param>
|
||||||
public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
|
public virtual void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
|
||||||
{
|
{
|
||||||
if (StatsManager.UserStats != null)
|
if (StatsManager.UserStats != null)
|
||||||
StatsManager.UserStats.AddLogout();
|
StatsManager.UserStats.AddLogout();
|
||||||
|
@ -583,15 +590,6 @@ namespace OpenSim.Framework.Communications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Process a user logoff from OpenSim (deprecated as of 2008-08-27)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="userid"></param>
|
|
||||||
/// <param name="regionid"></param>
|
|
||||||
/// <param name="regionhandle"></param>
|
|
||||||
/// <param name="posx"></param>
|
|
||||||
/// <param name="posy"></param>
|
|
||||||
/// <param name="posz"></param>
|
|
||||||
public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
|
public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
|
||||||
{
|
{
|
||||||
LogOffUser(userid, regionid, regionhandle, new Vector3(posx, posy, posz), new Vector3());
|
LogOffUser(userid, regionid, regionhandle, new Vector3(posx, posy, posz), new Vector3());
|
||||||
|
@ -643,7 +641,7 @@ namespace OpenSim.Framework.Communications
|
||||||
user.HomeRegionY = regY;
|
user.HomeRegionY = regY;
|
||||||
user.Email = email;
|
user.Email = email;
|
||||||
|
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -669,13 +667,13 @@ namespace OpenSim.Framework.Communications
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reset a user password
|
/// Reset a user password.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="firstName"></param>
|
/// <param name="firstName"></param>
|
||||||
/// <param name="lastName"></param>
|
/// <param name="lastName"></param>
|
||||||
/// <param name="newPassword"></param>
|
/// <param name="newPassword"></param>
|
||||||
/// <returns>true if the update was successful, false otherwise</returns>
|
/// <returns>true if the update was successful, false otherwise</returns>
|
||||||
public bool ResetUserPassword(string firstName, string lastName, string newPassword)
|
public virtual bool ResetUserPassword(string firstName, string lastName, string newPassword)
|
||||||
{
|
{
|
||||||
string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(newPassword) + ":" + String.Empty);
|
string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(newPassword) + ":" + String.Empty);
|
||||||
|
|
||||||
|
@ -705,7 +703,7 @@ namespace OpenSim.Framework.Communications
|
||||||
/// <param name="agentdata">The agent data to be added</param>
|
/// <param name="agentdata">The agent data to be added</param>
|
||||||
public bool AddUserAgent(UserAgentData agentdata)
|
public bool AddUserAgent(UserAgentData agentdata)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -725,9 +723,9 @@ namespace OpenSim.Framework.Communications
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="user"></param>
|
/// <param name="user"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public AvatarAppearance GetUserAppearance(UUID user)
|
public virtual AvatarAppearance GetUserAppearance(UUID user)
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -741,14 +739,9 @@ namespace OpenSim.Framework.Communications
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
|
||||||
/// Update avatar appearance information
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="user"></param>
|
|
||||||
/// <param name="appearance"></param>
|
|
||||||
public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
|
|
||||||
{
|
{
|
||||||
foreach (IUserDataPlugin plugin in _plugins)
|
foreach (IUserDataPlugin plugin in m_plugins)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -839,7 +832,7 @@ namespace OpenSim.Framework.Communications
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool VerifySession(UUID userID, UUID sessionID)
|
public virtual bool VerifySession(UUID userID, UUID sessionID)
|
||||||
{
|
{
|
||||||
UserProfileData userProfile = GetUserProfile(userID);
|
UserProfileData userProfile = GetUserProfile(userID);
|
||||||
|
|
||||||
|
@ -851,6 +844,7 @@ namespace OpenSim.Framework.Communications
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -331,6 +331,7 @@ namespace OpenSim.Grid.UserServer.Modules
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (responseSuccess)
|
if (responseSuccess)
|
||||||
{
|
{
|
||||||
handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
|
handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
|
||||||
|
|
|
@ -31,6 +31,7 @@ using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Communications;
|
using OpenSim.Framework.Communications;
|
||||||
using OpenSim.Framework.Communications.Cache;
|
using OpenSim.Framework.Communications.Cache;
|
||||||
using OpenSim.Framework.Servers;
|
using OpenSim.Framework.Servers;
|
||||||
|
using OpenSim.Region.Communications.OGS1;
|
||||||
using OpenSim.Region.Framework.Scenes;
|
using OpenSim.Region.Framework.Scenes;
|
||||||
|
|
||||||
namespace OpenSim.Region.Communications.Hypergrid
|
namespace OpenSim.Region.Communications.Hypergrid
|
||||||
|
@ -51,7 +52,6 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
|
IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
|
||||||
: base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
|
: base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
|
||||||
{
|
{
|
||||||
|
|
||||||
// From constructor at CommunicationsOGS1
|
// From constructor at CommunicationsOGS1
|
||||||
HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService);
|
HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService);
|
||||||
m_gridService = gridInterComms;
|
m_gridService = gridInterComms;
|
||||||
|
@ -63,12 +63,15 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
AddSecureInventoryService(invService);
|
AddSecureInventoryService(invService);
|
||||||
m_defaultInventoryHost = invService.Host;
|
m_defaultInventoryHost = invService.Host;
|
||||||
if (SecureInventoryService != null)
|
if (SecureInventoryService != null)
|
||||||
m_log.Info("[HG] SecureInventoryService.");
|
m_log.Info("[HG]: SecureInventoryService.");
|
||||||
else
|
else
|
||||||
m_log.Info("[HG] Non-secureInventoryService.");
|
m_log.Info("[HG]: Non-secureInventoryService.");
|
||||||
|
|
||||||
|
|
||||||
HGUserServices userServices = new HGUserServices(this);
|
HGUserServices userServices = new HGUserServices(this);
|
||||||
|
// This plugin arrangement could eventually be configurable rather than hardcoded here.
|
||||||
|
OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
|
||||||
|
userServices.AddPlugin(userDataPlugin);
|
||||||
|
|
||||||
m_userService = userServices;
|
m_userService = userServices;
|
||||||
m_messageService = userServices;
|
m_messageService = userServices;
|
||||||
m_avatarService = (IAvatarService)m_userService;
|
m_avatarService = (IAvatarService)m_userService;
|
||||||
|
|
|
@ -59,6 +59,7 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
|
|
||||||
// Constructor called when running in standalone
|
// Constructor called when running in standalone
|
||||||
public HGUserServices(LocalUserServices local)
|
public HGUserServices(LocalUserServices local)
|
||||||
|
: base(null)
|
||||||
{
|
{
|
||||||
m_localUserServices = local;
|
m_localUserServices = local;
|
||||||
}
|
}
|
||||||
|
@ -101,30 +102,12 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
base.LogOffUser(userid, regionid, regionhandle, position, lookat);
|
base.LogOffUser(userid, regionid, regionhandle, position, lookat);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Logs off a user on the user server (deprecated as of 2008-08-27)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="UserID">UUID of the user</param>
|
|
||||||
/// <param name="regionID">UUID of the Region</param>
|
|
||||||
/// <param name="regionhandle">regionhandle</param>
|
|
||||||
/// <param name="posx">final position x</param>
|
|
||||||
/// <param name="posy">final position y</param>
|
|
||||||
/// <param name="posz">final position z</param>
|
|
||||||
public override void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
|
|
||||||
{
|
|
||||||
string url = string.Empty;
|
|
||||||
if ((m_localUserServices != null) && !IsForeignUser(userid, out url))
|
|
||||||
m_localUserServices.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
|
|
||||||
else
|
|
||||||
base.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
|
|
||||||
}
|
|
||||||
|
|
||||||
public override UserProfileData GetUserProfile(string firstName, string lastName)
|
public override UserProfileData GetUserProfile(string firstName, string lastName)
|
||||||
{
|
{
|
||||||
if (m_localUserServices != null)
|
if (m_localUserServices != null)
|
||||||
return m_localUserServices.GetUserProfile(firstName, lastName);
|
return m_localUserServices.GetUserProfile(firstName, lastName);
|
||||||
|
|
||||||
return GetUserProfile(firstName + " " + lastName);
|
return base.GetUserProfile(firstName, lastName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
|
public override List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
|
||||||
|
@ -135,18 +118,6 @@ namespace OpenSim.Region.Communications.Hypergrid
|
||||||
return base.GenerateAgentPickerRequestResponse(queryID, query);
|
return base.GenerateAgentPickerRequestResponse(queryID, query);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get a user profile from the user server
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="avatarID"></param>
|
|
||||||
/// <returns>null if the request fails</returns>
|
|
||||||
public override UserProfileData GetUserProfile(string name)
|
|
||||||
{
|
|
||||||
// This doesn't exist in LocalUserServices
|
|
||||||
|
|
||||||
return base.GetUserProfile(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get a user profile from the user server
|
/// Get a user profile from the user server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -55,7 +55,11 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
m_defaultInventoryHost = invService.Host;
|
m_defaultInventoryHost = invService.Host;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This plugin arrangement could eventually be configurable rather than hardcoded here.
|
||||||
OGS1UserServices userServices = new OGS1UserServices(this);
|
OGS1UserServices userServices = new OGS1UserServices(this);
|
||||||
|
OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
|
||||||
|
userServices.AddPlugin(userDataPlugin);
|
||||||
|
|
||||||
m_userService = userServices;
|
m_userService = userServices;
|
||||||
m_messageService = userServices;
|
m_messageService = userServices;
|
||||||
m_avatarService = (IAvatarService)m_userService;
|
m_avatarService = (IAvatarService)m_userService;
|
||||||
|
|
|
@ -0,0 +1,760 @@
|
||||||
|
/*
|
||||||
|
* 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 OpenSim 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;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Net;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using System.Xml.Serialization;
|
||||||
|
using log4net;
|
||||||
|
using Nwc.XmlRpc;
|
||||||
|
using OpenMetaverse;
|
||||||
|
using OpenSim.Data;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Framework.Communications;
|
||||||
|
using OpenSim.Framework.Communications.Clients;
|
||||||
|
|
||||||
|
namespace OpenSim.Region.Communications.OGS1
|
||||||
|
{
|
||||||
|
public class OGS1UserDataPlugin : IUserDataPlugin
|
||||||
|
{
|
||||||
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
protected CommunicationsManager m_commsManager;
|
||||||
|
|
||||||
|
public OGS1UserDataPlugin(CommunicationsManager commsManager)
|
||||||
|
{
|
||||||
|
m_log.DebugFormat("[OGS1 USER SERVICES]: {0} initialized", Name);
|
||||||
|
m_commsManager = commsManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Version { get { return "0.1"; } }
|
||||||
|
public string Name { get { return "Open Grid Services 1 (OGS1) User Data Plugin"; } }
|
||||||
|
public void Initialise() {}
|
||||||
|
|
||||||
|
public void Initialise(string connect) {}
|
||||||
|
|
||||||
|
public void Dispose() {}
|
||||||
|
|
||||||
|
// Arguably the presence of these means that IUserDataPlugin could be fissioned
|
||||||
|
public UserAgentData GetUserAgent(string name) { return null; }
|
||||||
|
public UserAgentData GetAgentByName(string name) { return null; }
|
||||||
|
public UserAgentData GetAgentByName(string fname, string lname) { return null; }
|
||||||
|
public void StoreWebLoginKey(UUID agentID, UUID webLoginKey) {}
|
||||||
|
public void AddNewUserProfile(UserProfileData user) {}
|
||||||
|
public void AddNewUserAgent(UserAgentData agent) {}
|
||||||
|
public bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return false; }
|
||||||
|
public bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return false; }
|
||||||
|
public void ResetAttachments(UUID userID) {}
|
||||||
|
public void LogoutUsers(UUID regionID) {}
|
||||||
|
|
||||||
|
public UserProfileData GetUserByUri(Uri uri)
|
||||||
|
{
|
||||||
|
WebRequest request = WebRequest.Create(uri);
|
||||||
|
|
||||||
|
WebResponse webResponse = request.GetResponse();
|
||||||
|
|
||||||
|
XmlSerializer deserializer = new XmlSerializer(typeof(XmlRpcResponse));
|
||||||
|
XmlRpcResponse xmlRpcResponse = (XmlRpcResponse)deserializer.Deserialize(webResponse.GetResponseStream());
|
||||||
|
|
||||||
|
Hashtable respData = (Hashtable)xmlRpcResponse.Value;
|
||||||
|
|
||||||
|
return ConvertXMLRPCDataToUserProfile(respData);
|
||||||
|
}
|
||||||
|
|
||||||
|
// public Uri GetUserUri(UserProfileData userProfile)
|
||||||
|
// {
|
||||||
|
// throw new NotImplementedException();
|
||||||
|
// }
|
||||||
|
|
||||||
|
public virtual UserAgentData GetAgentByUUID(UUID userId)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["avatar_uuid"] = userId.ToString();
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters);
|
||||||
|
|
||||||
|
XmlRpcResponse resp = req.Send(GetUserServerURL(userId), 6000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
if (respData.Contains("error_type"))
|
||||||
|
{
|
||||||
|
//m_log.Warn("[GRID]: " +
|
||||||
|
// "Error sent by user server when trying to get agent: (" +
|
||||||
|
// (string) respData["error_type"] +
|
||||||
|
// "): " + (string)respData["error_desc"]);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
UUID sessionid = UUID.Zero;
|
||||||
|
|
||||||
|
UserAgentData userAgent = new UserAgentData();
|
||||||
|
userAgent.Handle = Convert.ToUInt64((string)respData["handle"]);
|
||||||
|
UUID.TryParse((string)respData["sessionid"], out sessionid);
|
||||||
|
userAgent.SessionID = sessionid;
|
||||||
|
|
||||||
|
if ((string)respData["agent_online"] == "TRUE")
|
||||||
|
{
|
||||||
|
userAgent.AgentOnline = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
userAgent.AgentOnline = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return userAgent;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
m_log.ErrorFormat(
|
||||||
|
"[OGS1 USER SERVICES]: Error when trying to fetch agent data by uuid from remote user server: {0}",
|
||||||
|
e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual UserProfileData GetUserByName(string firstName, string lastName)
|
||||||
|
{
|
||||||
|
return GetUserProfile(firstName + " " + lastName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
|
||||||
|
{
|
||||||
|
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
|
||||||
|
Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9 ]");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["queryid"] = (string)queryID.ToString();
|
||||||
|
param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
pickerlist = ConvertXMLRPCDataToAvatarPickerList(queryID, respData);
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[OGS1 USER SERVICES]: Error when trying to fetch Avatar Picker Response: " +
|
||||||
|
e.Message);
|
||||||
|
// Return Empty picker list (no results)
|
||||||
|
}
|
||||||
|
return pickerlist;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a user profile from the user server
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="avatarID"></param>
|
||||||
|
/// <returns>null if the request fails</returns>
|
||||||
|
protected virtual UserProfileData GetUserProfile(string name)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["avatar_name"] = name;
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
|
||||||
|
return ConvertXMLRPCDataToUserProfile(respData);
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.ErrorFormat(
|
||||||
|
"[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}",
|
||||||
|
e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Get a user profile from the user server
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="avatarID"></param>
|
||||||
|
/// <returns>null if the request fails</returns>
|
||||||
|
public virtual UserProfileData GetUserByUUID(UUID avatarID)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["avatar_uuid"] = avatarID.ToString();
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
|
||||||
|
return ConvertXMLRPCDataToUserProfile(respData);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
m_log.ErrorFormat(
|
||||||
|
"[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}",
|
||||||
|
e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual bool UpdateUserProfile(UserProfileData userProfile)
|
||||||
|
{
|
||||||
|
m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile.");
|
||||||
|
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["avatar_uuid"] = userProfile.ID.ToString();
|
||||||
|
//param["AllowPublish"] = userProfile.ToString();
|
||||||
|
param["FLImageID"] = userProfile.FirstLifeImage.ToString();
|
||||||
|
param["ImageID"] = userProfile.Image.ToString();
|
||||||
|
//param["MaturePublish"] = MaturePublish.ToString();
|
||||||
|
param["AboutText"] = userProfile.AboutText;
|
||||||
|
param["FLAboutText"] = userProfile.FirstLifeAboutText;
|
||||||
|
//param["ProfileURL"] = userProfile.ProfileURL.ToString();
|
||||||
|
|
||||||
|
param["home_region"] = userProfile.HomeRegion.ToString();
|
||||||
|
param["home_region_id"] = userProfile.HomeRegionID.ToString();
|
||||||
|
|
||||||
|
param["home_pos_x"] = userProfile.HomeLocationX.ToString();
|
||||||
|
param["home_pos_y"] = userProfile.HomeLocationY.ToString();
|
||||||
|
param["home_pos_z"] = userProfile.HomeLocationZ.ToString();
|
||||||
|
param["home_look_x"] = userProfile.HomeLookAtX.ToString();
|
||||||
|
param["home_look_y"] = userProfile.HomeLookAtY.ToString();
|
||||||
|
param["home_look_z"] = userProfile.HomeLookAtZ.ToString();
|
||||||
|
param["user_flags"] = userProfile.UserFlags.ToString();
|
||||||
|
param["god_level"] = userProfile.GodLevel.ToString();
|
||||||
|
param["custom_type"] = userProfile.CustomType.ToString();
|
||||||
|
param["partner"] = userProfile.Partner.ToString();
|
||||||
|
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("update_user_profile", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(GetUserServerURL(userProfile.ID), 3000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
if (respData != null)
|
||||||
|
{
|
||||||
|
if (respData.Contains("returnString"))
|
||||||
|
{
|
||||||
|
if (((string)respData["returnString"]).ToUpper() != "TRUE")
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update user profile, User Server Reported an issue");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update user profile, UserServer didn't understand me!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update user profile, UserServer didn't understand me!");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a new friend to the database for XUser
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="friendlistowner">The agent that who's friends list is being added to</param>
|
||||||
|
/// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
|
||||||
|
/// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
|
||||||
|
public virtual void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["ownerID"] = friendlistowner.Guid.ToString();
|
||||||
|
param["friendID"] = friend.Guid.ToString();
|
||||||
|
param["friendPerms"] = perms.ToString();
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("add_new_user_friend", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
if (respData != null)
|
||||||
|
{
|
||||||
|
if (respData.Contains("returnString"))
|
||||||
|
{
|
||||||
|
if ((string)respData["returnString"] == "TRUE")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to add new friend, User Server Reported an issue");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!");
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " +
|
||||||
|
e.Message);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Delete friend on friendlistowner's friendlist.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="friendlistowner">The agent that who's friends list is being updated</param>
|
||||||
|
/// <param name="friend">The Ex-friend agent</param>
|
||||||
|
public virtual void RemoveUserFriend(UUID friendlistowner, UUID friend)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["ownerID"] = friendlistowner.Guid.ToString();
|
||||||
|
param["friendID"] = friend.Guid.ToString();
|
||||||
|
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("remove_user_friend", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
if (respData != null)
|
||||||
|
{
|
||||||
|
if (respData.Contains("returnString"))
|
||||||
|
{
|
||||||
|
if ((string)respData["returnString"] == "TRUE")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to remove friend, User Server Reported an issue");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!");
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " +
|
||||||
|
e.Message);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Update permissions for friend on friendlistowner's friendlist.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="friendlistowner">The agent that who's friends list is being updated</param>
|
||||||
|
/// <param name="friend">The agent that is getting or loosing permissions</param>
|
||||||
|
/// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
|
||||||
|
public virtual void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["ownerID"] = friendlistowner.Guid.ToString();
|
||||||
|
param["friendID"] = friend.Guid.ToString();
|
||||||
|
param["friendPerms"] = perms.ToString();
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("update_user_friend_perms", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
if (respData != null)
|
||||||
|
{
|
||||||
|
if (respData.Contains("returnString"))
|
||||||
|
{
|
||||||
|
if ((string)respData["returnString"] == "TRUE")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update_user_friend_perms, User Server Reported an issue");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!");
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Error when trying to update_user_friend_perms: " +
|
||||||
|
e.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
|
||||||
|
public virtual List<FriendListItem> GetUserFriendList(UUID friendlistowner)
|
||||||
|
{
|
||||||
|
List<FriendListItem> buddylist = new List<FriendListItem>();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["ownerID"] = friendlistowner.Guid.ToString();
|
||||||
|
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 8000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
|
||||||
|
if (respData != null && respData.Contains("avcount"))
|
||||||
|
{
|
||||||
|
buddylist = ConvertXMLRPCDataToFriendListItemList(respData);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[OGS1 USER SERVICES]: Error when trying to fetch Avatar's friends list: " +
|
||||||
|
e.Message);
|
||||||
|
// Return Empty list (no friends)
|
||||||
|
}
|
||||||
|
return buddylist;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids)
|
||||||
|
{
|
||||||
|
Dictionary<UUID, FriendRegionInfo> result = new Dictionary<UUID, FriendRegionInfo>();
|
||||||
|
|
||||||
|
// ask MessageServer about the current on-/offline status and regions the friends are in
|
||||||
|
ArrayList parameters = new ArrayList();
|
||||||
|
Hashtable map = new Hashtable();
|
||||||
|
|
||||||
|
ArrayList list = new ArrayList();
|
||||||
|
foreach (UUID uuid in uuids)
|
||||||
|
{
|
||||||
|
list.Add(uuid.ToString());
|
||||||
|
list.Add(uuid.ToString());
|
||||||
|
}
|
||||||
|
map["uuids"] = list;
|
||||||
|
|
||||||
|
map["recv_key"] = m_commsManager.NetworkServersInfo.UserRecvKey;
|
||||||
|
map["send_key"] = m_commsManager.NetworkServersInfo.UserSendKey;
|
||||||
|
|
||||||
|
parameters.Add(map);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_presence_info_bulk", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.MessagingURL, 8000);
|
||||||
|
Hashtable respData = resp != null ? (Hashtable)resp.Value : null;
|
||||||
|
|
||||||
|
if (respData == null || respData.ContainsKey("faultMessage"))
|
||||||
|
{
|
||||||
|
m_log.WarnFormat("[OGS1 USER SERVICES]: Contacting MessagingServer about user-regions resulted in error: {0}",
|
||||||
|
respData == null ? "<unknown error>" : respData["faultMessage"]);
|
||||||
|
}
|
||||||
|
else if (!respData.ContainsKey("count"))
|
||||||
|
{
|
||||||
|
m_log.WarnFormat("[OGS1 USER SERVICES]: Wrong format in response for MessagingServer request get_presence_info_bulk: missing 'count' field");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int count = (int)respData["count"];
|
||||||
|
m_log.DebugFormat("[OGS1 USER SERVICES]: Request returned {0} results.", count);
|
||||||
|
for (int i = 0; i < count; ++i)
|
||||||
|
{
|
||||||
|
if (respData.ContainsKey("uuid_" + i) && respData.ContainsKey("isOnline_" + i) && respData.ContainsKey("regionHandle_" + i))
|
||||||
|
{
|
||||||
|
UUID uuid;
|
||||||
|
if (UUID.TryParse((string)respData["uuid_" + i], out uuid))
|
||||||
|
{
|
||||||
|
FriendRegionInfo info = new FriendRegionInfo();
|
||||||
|
info.isOnline = (bool)respData["isOnline_" + i];
|
||||||
|
if (info.isOnline)
|
||||||
|
{
|
||||||
|
// TODO remove this after the next protocol update (say, r7800?)
|
||||||
|
info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
|
||||||
|
|
||||||
|
// accept missing id
|
||||||
|
if (respData.ContainsKey("regionID_" + i))
|
||||||
|
UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
|
||||||
|
}
|
||||||
|
|
||||||
|
result.Add(uuid, info);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.WarnFormat("[OGS1 USER SERVICES]: Response to get_presence_info_bulk contained an error in entry {0}", i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch friend infos: {0}", e.Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
m_log.DebugFormat("[OGS1 USER SERVICES]: Returning {0} entries", result.Count);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual AvatarAppearance GetUserAppearance(UUID user)
|
||||||
|
{
|
||||||
|
AvatarAppearance appearance = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = new Hashtable();
|
||||||
|
param["owner"] = user.ToString();
|
||||||
|
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(GetUserServerURL(user), 8000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
|
||||||
|
return ConvertXMLRPCDataToAvatarAppearance(respData);
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch appearance for avatar {0}, {1}", user, e.Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return appearance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Hashtable param = appearance.ToHashTable();
|
||||||
|
param["owner"] = user.ToString();
|
||||||
|
|
||||||
|
IList parameters = new ArrayList();
|
||||||
|
parameters.Add(param);
|
||||||
|
XmlRpcRequest req = new XmlRpcRequest("update_avatar_appearance", parameters);
|
||||||
|
XmlRpcResponse resp = req.Send(GetUserServerURL(user), 8000);
|
||||||
|
Hashtable respData = (Hashtable)resp.Value;
|
||||||
|
|
||||||
|
if (respData != null)
|
||||||
|
{
|
||||||
|
if (respData.Contains("returnString"))
|
||||||
|
{
|
||||||
|
if ((string)respData["returnString"] == "TRUE")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update_user_appearance, User Server Reported an issue");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update_user_appearance, UserServer didn't understand me!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: Unable to update_user_appearance, UserServer didn't understand me!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (WebException e)
|
||||||
|
{
|
||||||
|
m_log.Warn("[OGS1 USER SERVICES]: Error when trying to update Avatar's appearance: " +
|
||||||
|
e.Message);
|
||||||
|
// Return Empty list (no friends)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual string GetUserServerURL(UUID userID)
|
||||||
|
{
|
||||||
|
return m_commsManager.NetworkServersInfo.UserURL;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
|
||||||
|
{
|
||||||
|
if (data.Contains("error_type"))
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: " +
|
||||||
|
"Error sent by user server when trying to get user profile: (" +
|
||||||
|
data["error_type"] +
|
||||||
|
"): " + data["error_desc"]);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
UserProfileData userData = new UserProfileData();
|
||||||
|
userData.FirstName = (string)data["firstname"];
|
||||||
|
userData.SurName = (string)data["lastname"];
|
||||||
|
userData.ID = new UUID((string)data["uuid"]);
|
||||||
|
userData.Created = Convert.ToInt32(data["profile_created"]);
|
||||||
|
userData.UserInventoryURI = (string)data["server_inventory"];
|
||||||
|
userData.UserAssetURI = (string)data["server_asset"];
|
||||||
|
userData.FirstLifeAboutText = (string)data["profile_firstlife_about"];
|
||||||
|
userData.FirstLifeImage = new UUID((string)data["profile_firstlife_image"]);
|
||||||
|
userData.CanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
|
||||||
|
userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
|
||||||
|
userData.AboutText = (string)data["profile_about"];
|
||||||
|
userData.Image = new UUID((string)data["profile_image"]);
|
||||||
|
userData.LastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
|
||||||
|
userData.HomeRegion = Convert.ToUInt64((string)data["home_region"]);
|
||||||
|
if (data.Contains("home_region_id"))
|
||||||
|
userData.HomeRegionID = new UUID((string)data["home_region_id"]);
|
||||||
|
else
|
||||||
|
userData.HomeRegionID = UUID.Zero;
|
||||||
|
userData.HomeLocation =
|
||||||
|
new Vector3((float)Convert.ToDecimal((string)data["home_coordinates_x"]),
|
||||||
|
(float)Convert.ToDecimal((string)data["home_coordinates_y"]),
|
||||||
|
(float)Convert.ToDecimal((string)data["home_coordinates_z"]));
|
||||||
|
userData.HomeLookAt =
|
||||||
|
new Vector3((float)Convert.ToDecimal((string)data["home_look_x"]),
|
||||||
|
(float)Convert.ToDecimal((string)data["home_look_y"]),
|
||||||
|
(float)Convert.ToDecimal((string)data["home_look_z"]));
|
||||||
|
if (data.Contains("user_flags"))
|
||||||
|
userData.UserFlags = Convert.ToInt32((string)data["user_flags"]);
|
||||||
|
if (data.Contains("god_level"))
|
||||||
|
userData.GodLevel = Convert.ToInt32((string)data["god_level"]);
|
||||||
|
|
||||||
|
if (data.Contains("custom_type"))
|
||||||
|
userData.CustomType = (string)data["custom_type"];
|
||||||
|
else
|
||||||
|
userData.CustomType = "";
|
||||||
|
if (userData.CustomType == null)
|
||||||
|
userData.CustomType = "";
|
||||||
|
|
||||||
|
if (data.Contains("partner"))
|
||||||
|
userData.Partner = new UUID((string)data["partner"]);
|
||||||
|
else
|
||||||
|
userData.Partner = UUID.Zero;
|
||||||
|
|
||||||
|
return userData;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data)
|
||||||
|
{
|
||||||
|
if (data != null)
|
||||||
|
{
|
||||||
|
if (data.Contains("error_type"))
|
||||||
|
{
|
||||||
|
m_log.Warn("[GRID]: " +
|
||||||
|
"Error sent by user server when trying to get user appearance: (" +
|
||||||
|
data["error_type"] +
|
||||||
|
"): " + data["error_desc"]);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return new AvatarAppearance(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Error("[GRID]: The avatar appearance is null, something bad happenend");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(UUID queryID, Hashtable data)
|
||||||
|
{
|
||||||
|
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
|
||||||
|
int pickercount = Convert.ToInt32((string)data["avcount"]);
|
||||||
|
UUID respqueryID = new UUID((string)data["queryid"]);
|
||||||
|
if (queryID == respqueryID)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < pickercount; i++)
|
||||||
|
{
|
||||||
|
AvatarPickerAvatar apicker = new AvatarPickerAvatar();
|
||||||
|
UUID avatarID = new UUID((string)data["avatarid" + i.ToString()]);
|
||||||
|
string firstname = (string)data["firstname" + i.ToString()];
|
||||||
|
string lastname = (string)data["lastname" + i.ToString()];
|
||||||
|
apicker.AvatarID = avatarID;
|
||||||
|
apicker.firstName = firstname;
|
||||||
|
apicker.lastName = lastname;
|
||||||
|
pickerlist.Add(apicker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_log.Warn("[OGS1 USER SERVICES]: Got invalid queryID from userServer");
|
||||||
|
}
|
||||||
|
return pickerlist;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected List<FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)
|
||||||
|
{
|
||||||
|
List<FriendListItem> buddylist = new List<FriendListItem>();
|
||||||
|
int buddycount = Convert.ToInt32((string)data["avcount"]);
|
||||||
|
|
||||||
|
|
||||||
|
for (int i = 0; i < buddycount; i++)
|
||||||
|
{
|
||||||
|
FriendListItem buddylistitem = new FriendListItem();
|
||||||
|
|
||||||
|
buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
|
||||||
|
buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
|
||||||
|
buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
|
||||||
|
buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
|
||||||
|
|
||||||
|
buddylist.Add(buddylistitem);
|
||||||
|
}
|
||||||
|
|
||||||
|
return buddylist;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -35,227 +35,34 @@ using System.Xml.Serialization;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
|
using OpenSim.Data;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Communications;
|
using OpenSim.Framework.Communications;
|
||||||
using OpenSim.Framework.Communications.Clients;
|
using OpenSim.Framework.Communications.Clients;
|
||||||
|
|
||||||
namespace OpenSim.Region.Communications.OGS1
|
namespace OpenSim.Region.Communications.OGS1
|
||||||
{
|
{
|
||||||
public class OGS1UserServices : IUserService, IAvatarService, IMessagingService
|
public class OGS1UserServices : UserManagerBase
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
protected CommunicationsManager m_commsManager;
|
protected CommunicationsManager m_commsManager;
|
||||||
|
|
||||||
public OGS1UserServices(CommunicationsManager commsManager)
|
public OGS1UserServices(CommunicationsManager commsManager)
|
||||||
|
: base(commsManager.InterServiceInventoryService)
|
||||||
{
|
{
|
||||||
m_commsManager = commsManager;
|
m_commsManager = commsManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public OGS1UserServices()
|
public override void ClearUserAgent(UUID avatarID)
|
||||||
{
|
{
|
||||||
|
// TODO: implement
|
||||||
|
// It may be possible to use the UserManagerBase implementation.
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserProfileData ConvertXMLRPCDataToUserProfile(Hashtable data)
|
protected virtual string GetUserServerURL(UUID userID)
|
||||||
{
|
{
|
||||||
if (data.Contains("error_type"))
|
return m_commsManager.NetworkServersInfo.UserURL;
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: " +
|
|
||||||
"Error sent by user server when trying to get user profile: (" +
|
|
||||||
data["error_type"] +
|
|
||||||
"): " + data["error_desc"]);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
UserProfileData userData = new UserProfileData();
|
|
||||||
userData.FirstName = (string)data["firstname"];
|
|
||||||
userData.SurName = (string)data["lastname"];
|
|
||||||
userData.ID = new UUID((string)data["uuid"]);
|
|
||||||
userData.Created = Convert.ToInt32(data["profile_created"]);
|
|
||||||
userData.UserInventoryURI = (string)data["server_inventory"];
|
|
||||||
userData.UserAssetURI = (string)data["server_asset"];
|
|
||||||
userData.FirstLifeAboutText = (string)data["profile_firstlife_about"];
|
|
||||||
userData.FirstLifeImage = new UUID((string)data["profile_firstlife_image"]);
|
|
||||||
userData.CanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
|
|
||||||
userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
|
|
||||||
userData.AboutText = (string)data["profile_about"];
|
|
||||||
userData.Image = new UUID((string)data["profile_image"]);
|
|
||||||
userData.LastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
|
|
||||||
userData.HomeRegion = Convert.ToUInt64((string)data["home_region"]);
|
|
||||||
if (data.Contains("home_region_id"))
|
|
||||||
userData.HomeRegionID = new UUID((string)data["home_region_id"]);
|
|
||||||
else
|
|
||||||
userData.HomeRegionID = UUID.Zero;
|
|
||||||
userData.HomeLocation =
|
|
||||||
new Vector3((float)Convert.ToDecimal((string)data["home_coordinates_x"]),
|
|
||||||
(float)Convert.ToDecimal((string)data["home_coordinates_y"]),
|
|
||||||
(float)Convert.ToDecimal((string)data["home_coordinates_z"]));
|
|
||||||
userData.HomeLookAt =
|
|
||||||
new Vector3((float)Convert.ToDecimal((string)data["home_look_x"]),
|
|
||||||
(float)Convert.ToDecimal((string)data["home_look_y"]),
|
|
||||||
(float)Convert.ToDecimal((string)data["home_look_z"]));
|
|
||||||
if (data.Contains("user_flags"))
|
|
||||||
userData.UserFlags = Convert.ToInt32((string)data["user_flags"]);
|
|
||||||
if (data.Contains("god_level"))
|
|
||||||
userData.GodLevel = Convert.ToInt32((string)data["god_level"]);
|
|
||||||
|
|
||||||
if (data.Contains("custom_type"))
|
|
||||||
userData.CustomType = (string)data["custom_type"];
|
|
||||||
else
|
|
||||||
userData.CustomType = "";
|
|
||||||
if (userData.CustomType == null)
|
|
||||||
userData.CustomType = "";
|
|
||||||
|
|
||||||
if (data.Contains("partner"))
|
|
||||||
userData.Partner = new UUID((string)data["partner"]);
|
|
||||||
else
|
|
||||||
userData.Partner = UUID.Zero;
|
|
||||||
|
|
||||||
return userData;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserProfileData GetUserProfile(Uri uri)
|
|
||||||
{
|
|
||||||
WebRequest request = WebRequest.Create(uri);
|
|
||||||
|
|
||||||
WebResponse webResponse = request.GetResponse();
|
|
||||||
|
|
||||||
XmlSerializer deserializer = new XmlSerializer(typeof(XmlRpcResponse));
|
|
||||||
XmlRpcResponse xmlRpcResponse = (XmlRpcResponse)deserializer.Deserialize(webResponse.GetResponseStream());
|
|
||||||
|
|
||||||
Hashtable respData = (Hashtable)xmlRpcResponse.Value;
|
|
||||||
|
|
||||||
return ConvertXMLRPCDataToUserProfile(respData);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Uri GetUserUri(UserProfileData userProfile)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get a user agent from the user server
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="avatarID"></param>
|
|
||||||
/// <returns>null if the request fails</returns>
|
|
||||||
public virtual UserAgentData GetAgentByUUID(UUID userId)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["avatar_uuid"] = userId.ToString();
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters);
|
|
||||||
|
|
||||||
XmlRpcResponse resp = req.Send(GetUserServerURL(userId), 6000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
if (respData.Contains("error_type"))
|
|
||||||
{
|
|
||||||
//m_log.Warn("[GRID]: " +
|
|
||||||
// "Error sent by user server when trying to get agent: (" +
|
|
||||||
// (string) respData["error_type"] +
|
|
||||||
// "): " + (string)respData["error_desc"]);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
UUID sessionid = UUID.Zero;
|
|
||||||
|
|
||||||
UserAgentData userAgent = new UserAgentData();
|
|
||||||
userAgent.Handle = Convert.ToUInt64((string)respData["handle"]);
|
|
||||||
UUID.TryParse((string)respData["sessionid"], out sessionid);
|
|
||||||
userAgent.SessionID = sessionid;
|
|
||||||
|
|
||||||
if ((string)respData["agent_online"] == "TRUE")
|
|
||||||
{
|
|
||||||
userAgent.AgentOnline = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
userAgent.AgentOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return userAgent;
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat(
|
|
||||||
"[OGS1 USER SERVICES]: Error when trying to fetch agent data by uuid from remote user server: {0}",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data)
|
|
||||||
{
|
|
||||||
if (data != null)
|
|
||||||
{
|
|
||||||
if (data.Contains("error_type"))
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: " +
|
|
||||||
"Error sent by user server when trying to get user appearance: (" +
|
|
||||||
data["error_type"] +
|
|
||||||
"): " + data["error_desc"]);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return new AvatarAppearance(data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Error("[GRID]: The avatar appearance is null, something bad happenend");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(UUID queryID, Hashtable data)
|
|
||||||
{
|
|
||||||
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
|
|
||||||
int pickercount = Convert.ToInt32((string)data["avcount"]);
|
|
||||||
UUID respqueryID = new UUID((string)data["queryid"]);
|
|
||||||
if (queryID == respqueryID)
|
|
||||||
{
|
|
||||||
for (int i = 0; i < pickercount; i++)
|
|
||||||
{
|
|
||||||
AvatarPickerAvatar apicker = new AvatarPickerAvatar();
|
|
||||||
UUID avatarID = new UUID((string)data["avatarid" + i.ToString()]);
|
|
||||||
string firstname = (string)data["firstname" + i.ToString()];
|
|
||||||
string lastname = (string)data["lastname" + i.ToString()];
|
|
||||||
apicker.AvatarID = avatarID;
|
|
||||||
apicker.firstName = firstname;
|
|
||||||
apicker.lastName = lastname;
|
|
||||||
pickerlist.Add(apicker);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[OGS1 USER SERVICES]: Got invalid queryID from userServer");
|
|
||||||
}
|
|
||||||
return pickerlist;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<FriendListItem> ConvertXMLRPCDataToFriendListItemList(Hashtable data)
|
|
||||||
{
|
|
||||||
List<FriendListItem> buddylist = new List<FriendListItem>();
|
|
||||||
int buddycount = Convert.ToInt32((string)data["avcount"]);
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < buddycount; i++)
|
|
||||||
{
|
|
||||||
FriendListItem buddylistitem = new FriendListItem();
|
|
||||||
|
|
||||||
buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
|
|
||||||
buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
|
|
||||||
buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
|
|
||||||
buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
|
|
||||||
|
|
||||||
buddylist.Add(buddylistitem);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return buddylist;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -266,7 +73,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
/// <param name="regionhandle">regionhandle</param>
|
/// <param name="regionhandle">regionhandle</param>
|
||||||
/// <param name="position">final position</param>
|
/// <param name="position">final position</param>
|
||||||
/// <param name="lookat">final lookat</param>
|
/// <param name="lookat">final lookat</param>
|
||||||
public virtual void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
|
public override void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
|
||||||
{
|
{
|
||||||
Hashtable param = new Hashtable();
|
Hashtable param = new Hashtable();
|
||||||
param["avatar_uuid"] = userid.Guid.ToString();
|
param["avatar_uuid"] = userid.Guid.ToString();
|
||||||
|
@ -293,120 +100,12 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Logs off a user on the user server (deprecated as of 2008-08-27)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="UserID">UUID of the user</param>
|
|
||||||
/// <param name="regionID">UUID of the Region</param>
|
|
||||||
/// <param name="regionhandle">regionhandle</param>
|
|
||||||
/// <param name="posx">final position x</param>
|
|
||||||
/// <param name="posy">final position y</param>
|
|
||||||
/// <param name="posz">final position z</param>
|
|
||||||
public virtual void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
|
|
||||||
{
|
|
||||||
LogOffUser(userid, regionid, regionhandle, new Vector3(posx, posy, posz), new Vector3());
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual UserProfileData GetUserProfile(string firstName, string lastName)
|
|
||||||
{
|
|
||||||
return GetUserProfile(firstName + " " + lastName);
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
|
|
||||||
{
|
|
||||||
List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
|
|
||||||
Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9 ]");
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["queryid"] = (string)queryID.ToString();
|
|
||||||
param["avquery"] = objAlphaNumericPattern.Replace(query, String.Empty);
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_avatar_picker_avatar", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
pickerlist = ConvertXMLRPCDataToAvatarPickerList(queryID, respData);
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.Warn("[OGS1 USER SERVICES]: Error when trying to fetch Avatar Picker Response: " +
|
|
||||||
e.Message);
|
|
||||||
// Return Empty picker list (no results)
|
|
||||||
}
|
|
||||||
return pickerlist;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get a user profile from the user server
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="avatarID"></param>
|
|
||||||
/// <returns>null if the request fails</returns>
|
|
||||||
public virtual UserProfileData GetUserProfile(string name)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["avatar_name"] = name;
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
|
|
||||||
return ConvertXMLRPCDataToUserProfile(respData);
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat(
|
|
||||||
"[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Get a user profile from the user server
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="avatarID"></param>
|
|
||||||
/// <returns>null if the request fails</returns>
|
|
||||||
public virtual UserProfileData GetUserProfile(UUID avatarID)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["avatar_uuid"] = avatarID.ToString();
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
|
|
||||||
return ConvertXMLRPCDataToUserProfile(respData);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat(
|
|
||||||
"[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}",
|
|
||||||
e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public virtual void ClearUserAgent(UUID avatarID)
|
|
||||||
{
|
|
||||||
// TODO: implement
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Retrieve the user information for the given master uuid.
|
/// Retrieve the user information for the given master uuid.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uuid"></param>
|
/// <param name="uuid"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual UserProfileData SetupMasterUser(string firstName, string lastName)
|
public override UserProfileData SetupMasterUser(string firstName, string lastName)
|
||||||
{
|
{
|
||||||
return SetupMasterUser(firstName, lastName, String.Empty);
|
return SetupMasterUser(firstName, lastName, String.Empty);
|
||||||
}
|
}
|
||||||
|
@ -416,7 +115,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uuid"></param>
|
/// <param name="uuid"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual UserProfileData SetupMasterUser(string firstName, string lastName, string password)
|
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
|
||||||
{
|
{
|
||||||
UserProfileData profile = GetUserProfile(firstName, lastName);
|
UserProfileData profile = GetUserProfile(firstName, lastName);
|
||||||
return profile;
|
return profile;
|
||||||
|
@ -427,7 +126,7 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uuid"></param>
|
/// <param name="uuid"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public virtual UserProfileData SetupMasterUser(UUID uuid)
|
public override UserProfileData SetupMasterUser(UUID uuid)
|
||||||
{
|
{
|
||||||
UserProfileData data = GetUserProfile(uuid);
|
UserProfileData data = GetUserProfile(uuid);
|
||||||
|
|
||||||
|
@ -440,423 +139,10 @@ namespace OpenSim.Region.Communications.OGS1
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual UUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
|
public override bool VerifySession(UUID userID, UUID sessionID)
|
||||||
{
|
|
||||||
throw new Exception("The method or operation is not implemented.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool ResetUserPassword(string firstName, string lastName, string newPassword)
|
|
||||||
{
|
|
||||||
throw new Exception("The method or operation is not implemented.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool UpdateUserProfile(UserProfileData userProfile)
|
|
||||||
{
|
|
||||||
m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile.");
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["avatar_uuid"] = userProfile.ID.ToString();
|
|
||||||
//param["AllowPublish"] = userProfile.ToString();
|
|
||||||
param["FLImageID"] = userProfile.FirstLifeImage.ToString();
|
|
||||||
param["ImageID"] = userProfile.Image.ToString();
|
|
||||||
//param["MaturePublish"] = MaturePublish.ToString();
|
|
||||||
param["AboutText"] = userProfile.AboutText;
|
|
||||||
param["FLAboutText"] = userProfile.FirstLifeAboutText;
|
|
||||||
//param["ProfileURL"] = userProfile.ProfileURL.ToString();
|
|
||||||
|
|
||||||
param["home_region"] = userProfile.HomeRegion.ToString();
|
|
||||||
param["home_region_id"] = userProfile.HomeRegionID.ToString();
|
|
||||||
|
|
||||||
param["home_pos_x"] = userProfile.HomeLocationX.ToString();
|
|
||||||
param["home_pos_y"] = userProfile.HomeLocationY.ToString();
|
|
||||||
param["home_pos_z"] = userProfile.HomeLocationZ.ToString();
|
|
||||||
param["home_look_x"] = userProfile.HomeLookAtX.ToString();
|
|
||||||
param["home_look_y"] = userProfile.HomeLookAtY.ToString();
|
|
||||||
param["home_look_z"] = userProfile.HomeLookAtZ.ToString();
|
|
||||||
param["user_flags"] = userProfile.UserFlags.ToString();
|
|
||||||
param["god_level"] = userProfile.GodLevel.ToString();
|
|
||||||
param["custom_type"] = userProfile.CustomType.ToString();
|
|
||||||
param["partner"] = userProfile.Partner.ToString();
|
|
||||||
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("update_user_profile", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(GetUserServerURL(userProfile.ID), 3000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
if (respData != null)
|
|
||||||
{
|
|
||||||
if (respData.Contains("returnString"))
|
|
||||||
{
|
|
||||||
if (((string)respData["returnString"]).ToUpper() != "TRUE")
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update user profile, User Server Reported an issue");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update user profile, UserServer didn't understand me!");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update user profile, UserServer didn't understand me!");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
#region IUserServices Friend Methods
|
|
||||||
/// <summary>
|
|
||||||
/// Adds a new friend to the database for XUser
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="friendlistowner">The agent that who's friends list is being added to</param>
|
|
||||||
/// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
|
|
||||||
/// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
|
|
||||||
public virtual void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["ownerID"] = friendlistowner.Guid.ToString();
|
|
||||||
param["friendID"] = friend.Guid.ToString();
|
|
||||||
param["friendPerms"] = perms.ToString();
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("add_new_user_friend", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
if (respData != null)
|
|
||||||
{
|
|
||||||
if (respData.Contains("returnString"))
|
|
||||||
{
|
|
||||||
if ((string)respData["returnString"] == "TRUE")
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to add new friend, User Server Reported an issue");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to add new friend, UserServer didn't understand me!");
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " +
|
|
||||||
e.Message);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Delete friend on friendlistowner's friendlist.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="friendlistowner">The agent that who's friends list is being updated</param>
|
|
||||||
/// <param name="friend">The Ex-friend agent</param>
|
|
||||||
public virtual void RemoveUserFriend(UUID friendlistowner, UUID friend)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["ownerID"] = friendlistowner.Guid.ToString();
|
|
||||||
param["friendID"] = friend.Guid.ToString();
|
|
||||||
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("remove_user_friend", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
if (respData != null)
|
|
||||||
{
|
|
||||||
if (respData.Contains("returnString"))
|
|
||||||
{
|
|
||||||
if ((string)respData["returnString"] == "TRUE")
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to remove friend, User Server Reported an issue");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to remove friend, UserServer didn't understand me!");
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " +
|
|
||||||
e.Message);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Update permissions for friend on friendlistowner's friendlist.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="friendlistowner">The agent that who's friends list is being updated</param>
|
|
||||||
/// <param name="friend">The agent that is getting or loosing permissions</param>
|
|
||||||
/// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
|
|
||||||
public virtual void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["ownerID"] = friendlistowner.Guid.ToString();
|
|
||||||
param["friendID"] = friend.Guid.ToString();
|
|
||||||
param["friendPerms"] = perms.ToString();
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("update_user_friend_perms", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 3000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
if (respData != null)
|
|
||||||
{
|
|
||||||
if (respData.Contains("returnString"))
|
|
||||||
{
|
|
||||||
if ((string)respData["returnString"] == "TRUE")
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update_user_friend_perms, User Server Reported an issue");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update_user_friend_perms, UserServer didn't understand me!");
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Error when trying to update_user_friend_perms: " +
|
|
||||||
e.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
|
|
||||||
public virtual List<FriendListItem> GetUserFriendList(UUID friendlistowner)
|
|
||||||
{
|
|
||||||
List<FriendListItem> buddylist = new List<FriendListItem>();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["ownerID"] = friendlistowner.Guid.ToString();
|
|
||||||
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_user_friend_list", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 8000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
|
|
||||||
if (respData != null && respData.Contains("avcount"))
|
|
||||||
{
|
|
||||||
buddylist = ConvertXMLRPCDataToFriendListItemList(respData);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.Warn("[OGS1 USER SERVICES]: Error when trying to fetch Avatar's friends list: " +
|
|
||||||
e.Message);
|
|
||||||
// Return Empty list (no friends)
|
|
||||||
}
|
|
||||||
return buddylist;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids)
|
|
||||||
{
|
|
||||||
Dictionary<UUID, FriendRegionInfo> result = new Dictionary<UUID, FriendRegionInfo>();
|
|
||||||
|
|
||||||
// ask MessageServer about the current on-/offline status and regions the friends are in
|
|
||||||
ArrayList parameters = new ArrayList();
|
|
||||||
Hashtable map = new Hashtable();
|
|
||||||
|
|
||||||
ArrayList list = new ArrayList();
|
|
||||||
foreach (UUID uuid in uuids)
|
|
||||||
{
|
|
||||||
list.Add(uuid.ToString());
|
|
||||||
list.Add(uuid.ToString());
|
|
||||||
}
|
|
||||||
map["uuids"] = list;
|
|
||||||
|
|
||||||
map["recv_key"] = m_commsManager.NetworkServersInfo.UserRecvKey;
|
|
||||||
map["send_key"] = m_commsManager.NetworkServersInfo.UserSendKey;
|
|
||||||
|
|
||||||
parameters.Add(map);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_presence_info_bulk", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.MessagingURL, 8000);
|
|
||||||
Hashtable respData = resp != null ? (Hashtable)resp.Value : null;
|
|
||||||
|
|
||||||
if (respData == null || respData.ContainsKey("faultMessage"))
|
|
||||||
{
|
|
||||||
m_log.WarnFormat("[OGS1 USER SERVICES]: Contacting MessagingServer about user-regions resulted in error: {0}",
|
|
||||||
respData == null ? "<unknown error>" : respData["faultMessage"]);
|
|
||||||
}
|
|
||||||
else if (!respData.ContainsKey("count"))
|
|
||||||
{
|
|
||||||
m_log.WarnFormat("[OGS1 USER SERVICES]: Wrong format in response for MessagingServer request get_presence_info_bulk: missing 'count' field");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int count = (int)respData["count"];
|
|
||||||
m_log.DebugFormat("[OGS1 USER SERVICES]: Request returned {0} results.", count);
|
|
||||||
for (int i = 0; i < count; ++i)
|
|
||||||
{
|
|
||||||
if (respData.ContainsKey("uuid_" + i) && respData.ContainsKey("isOnline_" + i) && respData.ContainsKey("regionHandle_" + i))
|
|
||||||
{
|
|
||||||
UUID uuid;
|
|
||||||
if (UUID.TryParse((string)respData["uuid_" + i], out uuid))
|
|
||||||
{
|
|
||||||
FriendRegionInfo info = new FriendRegionInfo();
|
|
||||||
info.isOnline = (bool)respData["isOnline_" + i];
|
|
||||||
if (info.isOnline)
|
|
||||||
{
|
|
||||||
// TODO remove this after the next protocol update (say, r7800?)
|
|
||||||
info.regionHandle = Convert.ToUInt64(respData["regionHandle_" + i]);
|
|
||||||
|
|
||||||
// accept missing id
|
|
||||||
if (respData.ContainsKey("regionID_" + i))
|
|
||||||
UUID.TryParse((string)respData["regionID_" + i], out info.regionID);
|
|
||||||
}
|
|
||||||
|
|
||||||
result.Add(uuid, info);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.WarnFormat("[OGS1 USER SERVICES]: Response to get_presence_info_bulk contained an error in entry {0}", i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch friend infos: {0}", e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
m_log.DebugFormat("[OGS1 USER SERVICES]: Returning {0} entries", result.Count);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
/// Appearance
|
|
||||||
public virtual AvatarAppearance GetUserAppearance(UUID user)
|
|
||||||
{
|
|
||||||
AvatarAppearance appearance = null;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = new Hashtable();
|
|
||||||
param["owner"] = user.ToString();
|
|
||||||
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("get_avatar_appearance", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(GetUserServerURL(user), 8000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
|
|
||||||
return ConvertXMLRPCDataToAvatarAppearance(respData);
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat("[OGS1 USER SERVICES]: Network problems when trying to fetch appearance for avatar {0}, {1}", user, e.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return appearance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Hashtable param = appearance.ToHashTable();
|
|
||||||
param["owner"] = user.ToString();
|
|
||||||
|
|
||||||
IList parameters = new ArrayList();
|
|
||||||
parameters.Add(param);
|
|
||||||
XmlRpcRequest req = new XmlRpcRequest("update_avatar_appearance", parameters);
|
|
||||||
XmlRpcResponse resp = req.Send(GetUserServerURL(user), 8000);
|
|
||||||
Hashtable respData = (Hashtable)resp.Value;
|
|
||||||
|
|
||||||
if (respData != null)
|
|
||||||
{
|
|
||||||
if (respData.Contains("returnString"))
|
|
||||||
{
|
|
||||||
if ((string)respData["returnString"] == "TRUE")
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update_user_appearance, User Server Reported an issue");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update_user_appearance, UserServer didn't understand me!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[GRID]: Unable to update_user_appearance, UserServer didn't understand me!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (WebException e)
|
|
||||||
{
|
|
||||||
m_log.Warn("[OGS1 USER SERVICES]: Error when trying to update Avatar's appearance: " +
|
|
||||||
e.Message);
|
|
||||||
// Return Empty list (no friends)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual bool VerifySession(UUID userID, UUID sessionID)
|
|
||||||
{
|
{
|
||||||
m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID);
|
m_log.DebugFormat("[OGS1 USER SERVICES]: Verifying user session for " + userID);
|
||||||
return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID);
|
return AuthClient.VerifySession(GetUserServerURL(userID), userID, sessionID);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual string GetUserServerURL(UUID userID)
|
|
||||||
{
|
|
||||||
return m_commsManager.NetworkServersInfo.UserURL;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -87,6 +87,8 @@ namespace OpenSim.Tests.Common.Mock
|
||||||
return userProfile;
|
return userProfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public UserProfileData GetUserByUri(Uri uri) { return null; }
|
||||||
|
|
||||||
public bool UpdateUserProfile(UserProfileData user)
|
public bool UpdateUserProfile(UserProfileData user)
|
||||||
{
|
{
|
||||||
m_userProfilesByUuid[user.ID] = user;
|
m_userProfilesByUuid[user.ID] = user;
|
||||||
|
|
Loading…
Reference in New Issue