From cc05bdf6aba5d74202cb5863a5d0f5950540e7bd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 26 Feb 2010 08:46:30 -0800 Subject: * Friends out connector completed. Grid login retrieves friends correctly. * Added friends configs to grid .inis --- .../Connectors/Friends/FriendsServiceConnector.cs | 241 +++++++++++++++++++++ 1 file changed, 241 insertions(+) create mode 100644 OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs (limited to 'OpenSim/Services/Connectors/Friends') diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs new file mode 100644 index 0000000..b617138 --- /dev/null +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs @@ -0,0 +1,241 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using log4net; +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection; +using Nini.Config; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Services.Interfaces; +using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; +using OpenSim.Server.Base; +using OpenMetaverse; + +namespace OpenSim.Services.Connectors +{ + public class FriendsServicesConnector : IFriendsService + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + private string m_ServerURI = String.Empty; + + public FriendsServicesConnector() + { + } + + public FriendsServicesConnector(string serverURI) + { + m_ServerURI = serverURI.TrimEnd('/'); + } + + public FriendsServicesConnector(IConfigSource source) + { + Initialise(source); + } + + public virtual void Initialise(IConfigSource source) + { + IConfig gridConfig = source.Configs["FriendsService"]; + if (gridConfig == null) + { + m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); + throw new Exception("Friends connector init error"); + } + + string serviceURI = gridConfig.GetString("FriendsServerURI", + String.Empty); + + if (serviceURI == String.Empty) + { + m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); + throw new Exception("Friends connector init error"); + } + m_ServerURI = serviceURI; + } + + + #region IFriendsService + + public FriendInfo[] GetFriends(UUID PrincipalID) + { + Dictionary sendData = new Dictionary(); + + sendData["PRINCIPALID"] = PrincipalID.ToString(); + sendData["METHOD"] = "getfriends"; + + string reqString = ServerUtils.BuildQueryString(sendData); + + try + { + string reply = SynchronousRestFormsRequester.MakeRequest("POST", + m_ServerURI + "/friends", + reqString); + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if (replyData != null) + { + if (replyData.ContainsKey("result") && (replyData["result"].ToString().ToLower() == "null")) + { + return new FriendInfo[0]; + } + + List finfos = new List(); + Dictionary.ValueCollection finfosList = replyData.Values; + //m_log.DebugFormat("[FRIENDS CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count); + foreach (object f in finfosList) + { + if (f is Dictionary) + { + FriendInfo finfo = new FriendInfo((Dictionary)f); + finfos.Add(finfo); + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received invalid response type {1}", + PrincipalID, f.GetType()); + } + + // Success + return finfos.ToArray(); + } + + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received null response", + PrincipalID); + + } + } + catch (Exception e) + { + m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); + } + + return new FriendInfo[0]; + + } + + public bool StoreFriend(UUID PrincipalID, string Friend, int flags) + { + FriendInfo finfo = new FriendInfo(); + finfo.PrincipalID = PrincipalID; + finfo.Friend = Friend; + finfo.TheirFlags = flags; + + Dictionary sendData = finfo.ToKeyValuePairs(); + + sendData["METHOD"] = "storefriend"; + + string reqString = ServerUtils.BuildQueryString(sendData); + + string reply = string.Empty; + try + { + reply = SynchronousRestFormsRequester.MakeRequest("POST", + m_ServerURI + "/friends", + ServerUtils.BuildQueryString(sendData)); + } + catch (Exception e) + { + m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); + return false; + } + + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if ((replyData != null) && replyData.ContainsKey("Result") && (replyData["Result"] != null)) + { + bool success = false; + Boolean.TryParse(replyData["Result"].ToString(), out success); + return success; + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend {0} {1} received null response", + PrincipalID, Friend); + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend received null reply"); + + return false; + + } + + public bool Delete(UUID PrincipalID, string Friend) + { + Dictionary sendData = new Dictionary(); + sendData["PRINCIPALID"] = PrincipalID.ToString(); + sendData["FRIENDS"] = Friend; + sendData["METHOD"] = "deletefriend"; + + string reqString = ServerUtils.BuildQueryString(sendData); + + string reply = string.Empty; + try + { + reply = SynchronousRestFormsRequester.MakeRequest("POST", + m_ServerURI + "/friends", + ServerUtils.BuildQueryString(sendData)); + } + catch (Exception e) + { + m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); + return false; + } + + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if ((replyData != null) && replyData.ContainsKey("Result") && (replyData["Result"] != null)) + { + bool success = false; + Boolean.TryParse(replyData["Result"].ToString(), out success); + return success; + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend {0} {1} received null response", + PrincipalID, Friend); + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply"); + + return false; + + } + + #endregion + + } +} -- cgit v1.1 From 2af7577fab4707f26f4e8c680a263e25b7e415e9 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 26 Feb 2010 09:01:59 -0800 Subject: Flags on Store(Friend) are supposed to be MyFlags. --- OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Services/Connectors/Friends') diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs index b617138..baefebd 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs @@ -150,7 +150,7 @@ namespace OpenSim.Services.Connectors FriendInfo finfo = new FriendInfo(); finfo.PrincipalID = PrincipalID; finfo.Friend = Friend; - finfo.TheirFlags = flags; + finfo.MyFlags = flags; Dictionary sendData = finfo.ToKeyValuePairs(); -- cgit v1.1 From 25870e80497bdd5823354a7472f0364cfa446888 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 26 Feb 2010 20:35:45 -0800 Subject: * Friendship offers starting to work in the same sim. Not quite right yet. * Added skeleton for out Connectors/Friends/FriendsSimConnector.cs * Moved request handler to its own file --- .../Connectors/Friends/FriendsSimConnector.cs | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs (limited to 'OpenSim/Services/Connectors/Friends') diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs new file mode 100644 index 0000000..94746ef --- /dev/null +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs @@ -0,0 +1,66 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections.Generic; + +using OpenSim.Services.Interfaces; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; + +using OpenMetaverse; + +namespace OpenSim.Services.Connectors.Friends +{ + public class FriendsSimConnector + { + + public bool FriendshipOffered(GridRegion region, UUID userID, UUID friendID, string message) + { + return true; + } + + public bool FriendshipApproved(GridRegion region, UUID userID, UUID friendID) + { + return true; + } + + public bool FriendshipDenied(GridRegion region, UUID userID, UUID friendID) + { + return true; + } + + public bool FriendshipTerminated(GridRegion region, UUID userID, UUID friendID) + { + return true; + } + + public bool GrantRights(GridRegion region, UUID requester, UUID target) + { + return true; + } + } +} -- cgit v1.1 From 1daabc3473aa7696a8ff5d63eb31736ce2158642 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 27 Feb 2010 18:16:31 -0800 Subject: Status notification (online/offline) working for same sim. --- OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'OpenSim/Services/Connectors/Friends') diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 94746ef..081e354 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs @@ -62,5 +62,10 @@ namespace OpenSim.Services.Connectors.Friends { return true; } + + public bool StatusNotify(GridRegion region, UUID userID, UUID friendID, bool online) + { + return true; + } } } -- cgit v1.1 From db24e57cab88217e49c3c564a2c025a44199520e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 28 Feb 2010 08:36:13 -0800 Subject: Friends connectors finished. Status notification working across the board. One last bug: friends online upon login are not being sent to the user. --- .../Connectors/Friends/FriendsSimConnector.cs | 112 +++++++++++++++++++-- 1 file changed, 103 insertions(+), 9 deletions(-) (limited to 'OpenSim/Services/Connectors/Friends') diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 081e354..490c8cf 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs @@ -27,45 +27,139 @@ using System; using System.Collections.Generic; +using System.Reflection; using OpenSim.Services.Interfaces; using GridRegion = OpenSim.Services.Interfaces.GridRegion; +using OpenSim.Server.Base; +using OpenSim.Framework.Servers.HttpServer; using OpenMetaverse; +using log4net; namespace OpenSim.Services.Connectors.Friends { public class FriendsSimConnector { + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public bool FriendshipOffered(GridRegion region, UUID userID, UUID friendID, string message) { - return true; + Dictionary sendData = new Dictionary(); + //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); + //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); + sendData["METHOD"] = "friendship_offered"; + + sendData["FromID"] = userID.ToString(); + sendData["ToID"] = friendID.ToString(); + sendData["Message"] = message; + + return Call(region, sendData); + } - public bool FriendshipApproved(GridRegion region, UUID userID, UUID friendID) + public bool FriendshipApproved(GridRegion region, UUID userID, string userName, UUID friendID) { - return true; + Dictionary sendData = new Dictionary(); + //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); + //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); + sendData["METHOD"] = "friendship_approved"; + + sendData["FromID"] = userID.ToString(); + sendData["FromName"] = userName; + sendData["ToID"] = friendID.ToString(); + + return Call(region, sendData); } - public bool FriendshipDenied(GridRegion region, UUID userID, UUID friendID) + public bool FriendshipDenied(GridRegion region, UUID userID, string userName, UUID friendID) { - return true; + Dictionary sendData = new Dictionary(); + //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); + //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); + sendData["METHOD"] = "friendship_denied"; + + sendData["FromID"] = userID.ToString(); + sendData["FromName"] = userName; + sendData["ToID"] = friendID.ToString(); + + return Call(region, sendData); } public bool FriendshipTerminated(GridRegion region, UUID userID, UUID friendID) { - return true; + Dictionary sendData = new Dictionary(); + //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); + //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); + sendData["METHOD"] = "friendship_terminated"; + + sendData["FromID"] = userID.ToString(); + sendData["ToID"] = friendID.ToString(); + + return Call(region, sendData); } - public bool GrantRights(GridRegion region, UUID requester, UUID target) + public bool GrantRights(GridRegion region, UUID userID, UUID friendID) { - return true; + Dictionary sendData = new Dictionary(); + //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); + //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); + sendData["METHOD"] = "grant_rights"; + + sendData["FromID"] = userID.ToString(); + sendData["ToID"] = friendID.ToString(); + + return Call(region, sendData); } public bool StatusNotify(GridRegion region, UUID userID, UUID friendID, bool online) { - return true; + Dictionary sendData = new Dictionary(); + //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); + //sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString(); + sendData["METHOD"] = "status"; + + sendData["FromID"] = userID.ToString(); + sendData["ToID"] = friendID.ToString(); + sendData["Online"] = online.ToString(); + + return Call(region, sendData); + } + + private bool Call(GridRegion region, Dictionary sendData) + { + string reqString = ServerUtils.BuildQueryString(sendData); + // m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString); + try + { + string url = "http://" + region.ExternalHostName + ":" + region.HttpPort; + string reply = SynchronousRestFormsRequester.MakeRequest("POST", + url + "/friends", + reqString); + if (reply != string.Empty) + { + Dictionary replyData = ServerUtils.ParseXmlResponse(reply); + + if (replyData.ContainsKey("RESULT")) + { + if (replyData["RESULT"].ToString().ToLower() == "true") + return true; + else + return false; + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: reply data does not contain result field"); + + } + else + m_log.DebugFormat("[FRIENDS CONNECTOR]: received empty reply"); + } + catch (Exception e) + { + m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.Message); + } + + return false; } } } -- cgit v1.1 From c6a5ff26fff6a1d0c3ab916a526cf0dd4e4142bc Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 1 Mar 2010 21:32:55 -0800 Subject: Friends rights under control. --- OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenSim/Services/Connectors/Friends') diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 490c8cf..a29ac28 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs @@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.Friends return Call(region, sendData); } - public bool GrantRights(GridRegion region, UUID userID, UUID friendID) + public bool GrantRights(GridRegion region, UUID userID, UUID friendID, int userFlags, int rights) { Dictionary sendData = new Dictionary(); //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); @@ -108,6 +108,8 @@ namespace OpenSim.Services.Connectors.Friends sendData["FromID"] = userID.ToString(); sendData["ToID"] = friendID.ToString(); + sendData["UserFlags"] = userFlags.ToString(); + sendData["Rights"] = rights.ToString(); return Call(region, sendData); } -- cgit v1.1