HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.

OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs

@@ -38,7 +38,7 @@ using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
 using OpenSim.Server.Base;
 using OpenMetaverse;
 
-namespace OpenSim.Services.Connectors
+namespace OpenSim.Services.Connectors.Friends
 {
     public class FriendsServicesConnector : IFriendsService
     {
@@ -144,10 +144,17 @@ namespace OpenSim.Services.Connectors
 
         }
 
-        public bool StoreFriend(UUID PrincipalID, string Friend, int flags)
+        public bool StoreFriend(string PrincipalID, string Friend, int flags)
         {
             FriendInfo finfo = new FriendInfo();
-            finfo.PrincipalID = PrincipalID;
+            try
+            {
+                finfo.PrincipalID = new UUID(PrincipalID);
+            }
+            catch
+            {
+                return false;
+            }
             finfo.Friend = Friend;
             finfo.MyFlags = flags;
 

OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs

@@ -0,0 +1,175 @@
+/*
+ * 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.Services.Interfaces;
+using OpenSim.Services.Connectors.Friends;
+using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors.Hypergrid
+{
+    public class HGFriendsServicesConnector 
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+        private string m_ServiceKey = String.Empty;
+        private UUID m_SessionID;
+
+        public HGFriendsServicesConnector()
+        {
+        }
+
+        public HGFriendsServicesConnector(string serverURI, UUID sessionID, string serviceKey)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+            m_ServiceKey = serviceKey;
+            m_SessionID = sessionID;
+        }
+
+        #region IFriendsService
+
+        public FriendInfo[] GetFriends(UUID PrincipalID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+
+            sendData["PRINCIPALID"] = PrincipalID.ToString();
+            sendData["METHOD"] = "getfriends";
+            sendData["KEY"] = m_ServiceKey;
+            sendData["SESSIONID"] = m_SessionID.ToString();
+
+            string reqString = ServerUtils.BuildQueryString(sendData);
+
+            try
+            {
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/hgfriends",
+                        reqString);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if (replyData != null)
+                    {
+                        if (replyData.ContainsKey("result") && (replyData["result"].ToString().ToLower() == "null"))
+                        {
+                        return new FriendInfo[0];
+                        }
+
+                        List<FriendInfo> finfos = new List<FriendInfo>();
+                        Dictionary<string, object>.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<string, object>)
+                            {
+                                FriendInfo finfo = new FriendInfo((Dictionary<string, object>)f);
+                                finfos.Add(finfo);
+                            }
+                            else
+                                m_log.DebugFormat("[HGFRIENDS CONNECTOR]: GetFriends {0} received invalid response type {1}",
+                                    PrincipalID, f.GetType());
+                        }
+
+                        // Success
+                        return finfos.ToArray();
+                    }
+                
+                    else
+                        m_log.DebugFormat("[HGFRIENDS CONNECTOR]: GetFriends {0} received null response",
+                            PrincipalID);
+
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
+            }
+
+            return new FriendInfo[0];
+
+        }
+
+        public bool NewFriendship(UUID PrincipalID, string Friend)
+        {
+            FriendInfo finfo = new FriendInfo();
+            finfo.PrincipalID = PrincipalID;
+            finfo.Friend = Friend;
+
+            Dictionary<string, object> sendData = finfo.ToKeyValuePairs();
+
+            sendData["METHOD"] = "newfriendship";
+            sendData["KEY"] = m_ServiceKey;
+            sendData["SESSIONID"] = m_SessionID.ToString();
+
+            string reply = string.Empty;
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        m_ServerURI + "/hgfriends",
+                        ServerUtils.BuildQueryString(sendData));
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
+                return false;
+            }
+
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> 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("[HGFRIENDS CONNECTOR]: StoreFriend {0} {1} received null response",
+                        PrincipalID, Friend);
+            }
+            else
+                m_log.DebugFormat("[HGFRIENDS CONNECTOR]: StoreFriend received null reply");
+
+            return false;
+
+        }
+
+        #endregion
+    }
+}

OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs

@@ -127,7 +127,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return array;
         }
 
-        public bool StoreFriend(UUID principalID, string friend, int flags)
+        public bool StoreFriend(string principalID, string friend, int flags)
         {
             if (String.IsNullOrEmpty(m_serverUrl))
                 return true;

OpenSim/Services/Friends/FriendsService.cs

@@ -43,17 +43,16 @@ namespace OpenSim.Services.Friends
         {
         }
 
-        public FriendInfo[] GetFriends(UUID PrincipalID)
+        public virtual FriendInfo[] GetFriends(UUID PrincipalID)
         {
             FriendsData[] data = m_Database.GetFriends(PrincipalID);
-
             List<FriendInfo> info = new List<FriendInfo>();
 
             foreach (FriendsData d in data)
             {
                 FriendInfo i = new FriendInfo();
 
-                i.PrincipalID = d.PrincipalID;
+                i.PrincipalID = new UUID(d.PrincipalID);
                 i.Friend = d.Friend;
                 i.MyFlags = Convert.ToInt32(d.Data["Flags"]);
                 i.TheirFlags = Convert.ToInt32(d.Data["TheirFlags"]);
@@ -64,7 +63,7 @@ namespace OpenSim.Services.Friends
             return info.ToArray();
         }
 
-        public bool StoreFriend(UUID PrincipalID, string Friend, int flags)
+        public virtual bool StoreFriend(string PrincipalID, string Friend, int flags)
         {
             FriendsData d = new FriendsData();
 
@@ -76,7 +75,7 @@ namespace OpenSim.Services.Friends
             return m_Database.Store(d);
         }
 
-        public bool Delete(UUID PrincipalID, string Friend)
+        public virtual bool Delete(UUID PrincipalID, string Friend)
         {
             return m_Database.Delete(PrincipalID, Friend);
         }

OpenSim/Services/HypergridService/HGFriendsService.cs

@@ -0,0 +1,95 @@
+/*
+ * 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 OpenMetaverse;
+using OpenSim.Framework;
+using System;
+using System.Collections.Generic;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Friends;
+using OpenSim.Data;
+using Nini.Config;
+using log4net;
+using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
+
+namespace OpenSim.Services.HypergridService
+{
+    public class HGFriendsService : FriendsService, IFriendsService
+    {
+        public HGFriendsService(IConfigSource config) : base(config)
+        {
+        }
+
+        /// <summary>
+        /// Overrides base. 
+        /// Storing new friendships from the outside is a tricky, sensitive operation, and it 
+        /// needs to be done under certain restrictions.
+        /// First of all, if the friendship already exists, this is a no-op. In other words, 
+        /// we cannot change just the flags, it needs to be a new friendship.
+        /// Second, we store it as flags=0 always, independent of what the caller sends. The
+        /// owner of the friendship needs to confirm when it gets back home.
+        /// </summary>
+        /// <param name="PrincipalID"></param>
+        /// <param name="Friend"></param>
+        /// <param name="flags"></param>
+        /// <returns></returns>
+        public override bool StoreFriend(string PrincipalID, string Friend, int flags)
+        {
+            UUID userID;
+            if (UUID.TryParse(PrincipalID, out userID))
+            {
+                FriendsData[] friendsData = m_Database.GetFriends(userID);
+                List<FriendsData> fList = new List<FriendsData>(friendsData);
+                if (fList.Find(delegate(FriendsData fdata)
+                    {
+                        return fdata.Friend == Friend;
+                    }) != null)
+                    return false;
+            }
+
+            FriendsData d = new FriendsData();
+            d.PrincipalID = PrincipalID;
+            d.Friend = Friend;
+            d.Data = new Dictionary<string, string>();
+            d.Data["Flags"] = "0";
+
+            return m_Database.Store(d);
+        }
+
+        /// <summary>
+        /// Overrides base. Cannot delete friendships while away from home.
+        /// </summary>
+        /// <param name="PrincipalID"></param>
+        /// <param name="Friend"></param>
+        /// <returns></returns>
+        public override bool Delete(UUID PrincipalID, string Friend)
+        {
+            return false;
+        }
+
+    }
+}

OpenSim/Services/Interfaces/IFriendsService.cs

@@ -74,7 +74,7 @@ namespace OpenSim.Services.Interfaces
     public interface IFriendsService
     {
         FriendInfo[] GetFriends(UUID PrincipalID);
-        bool StoreFriend(UUID PrincipalID, string Friend, int flags);
+        bool StoreFriend(string PrincipalID, string Friend, int flags);
         bool Delete(UUID PrincipalID, string Friend);
     }
 }

OpenSim/Services/LLLoginService/LLLoginResponse.cs

@@ -621,7 +621,19 @@ namespace OpenSim.Services.LLLoginService
                 if (finfo.TheirFlags == -1)
                     continue;
                 LLLoginResponse.BuddyList.BuddyInfo buddyitem = new LLLoginResponse.BuddyList.BuddyInfo(finfo.Friend);
-                buddyitem.BuddyID = finfo.Friend;
+                // finfo.Friend may not be a simple uuid
+                UUID friendID = UUID.Zero;
+                if (UUID.TryParse(finfo.Friend, out friendID))
+                    buddyitem.BuddyID = finfo.Friend;
+                else
+                {
+                    string tmp;
+                    if (Util.ParseUniversalUserIdentifier(finfo.Friend, out friendID, out tmp, out tmp, out tmp))
+                        buddyitem.BuddyID = friendID.ToString();
+                    else
+                        // junk entry
+                        continue;
+                }
                 buddyitem.BuddyRightsHave = (int)finfo.TheirFlags;
                 buddyitem.BuddyRightsGiven = (int)finfo.MyFlags;
                 buddylistreturn.AddNewBuddy(buddyitem);