Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

5 files changed, 27 insertions, 275 deletions

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 004311f..47d22b9 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -57,13 +57,10 @@ namespace OpenSim.Services.HypergridService
         private static IUserAccountService m_UserAccountService;
         private static IUserAgentService m_UserAgentService;
         private static ISimulationService m_SimulationService;
-        private static IGridUserService m_GridUserService;
 
-        private static string m_AllowedClients = string.Empty;
-        private static string m_DeniedClients = string.Empty;
+        protected string m_AllowedClients = string.Empty;
+        protected string m_DeniedClients = string.Empty;
         private static bool m_ForeignAgentsAllowed = true;
-        private static List<string> m_ForeignsAllowedExceptions = new List<string>();
-        private static List<string> m_ForeignsDisallowedExceptions = new List<string>();
 
         private static UUID m_ScopeID;
         private static bool m_AllowTeleportsToAnyRegion;
@@ -85,9 +82,8 @@ namespace OpenSim.Services.HypergridService
                 string gridService = serverConfig.GetString("GridService", String.Empty);
                 string presenceService = serverConfig.GetString("PresenceService", String.Empty);
                 string simulationService = serverConfig.GetString("SimulationService", String.Empty);
-                string gridUserService = serverConfig.GetString("GridUserService", String.Empty);
 
-                // These are mandatory, the others aren't
+                // These 3 are mandatory, the others aren't
                 if (gridService == string.Empty || presenceService == string.Empty)
                     throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
                 
@@ -107,8 +103,6 @@ namespace OpenSim.Services.HypergridService
                     m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
                 if (homeUsersService != string.Empty)
                     m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
-                if (gridUserService != string.Empty)
-                    m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
 
                 if (simService != null)
                     m_SimulationService = simService;
@@ -119,9 +113,6 @@ namespace OpenSim.Services.HypergridService
                 m_DeniedClients = serverConfig.GetString("DeniedClients", string.Empty);
                 m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true);
 
-                LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_ForeignsAllowedExceptions);
-                LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_ForeignsDisallowedExceptions);
-
                 if (m_GridService == null || m_PresenceService == null || m_SimulationService == null)
                     throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
 
@@ -134,15 +125,6 @@ namespace OpenSim.Services.HypergridService
         {
         }
 
-        protected void LoadDomainExceptionsFromConfig(IConfig config, string variable, List<string> exceptions)
-        {
-            string value = config.GetString(variable, string.Empty);
-            string[] parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-            foreach (string s in parts)
-                exceptions.Add(s.Trim());
-        }
-
         public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason)
         {
             regionID = UUID.Zero;
@@ -278,27 +260,18 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[GATEKEEPER SERVICE]: User is ok");
 
             //
-            // Foreign agents allowed? Exceptions?
+            // Foreign agents allowed
             //
-            if (account == null) 
+            if (account == null && !m_ForeignAgentsAllowed)
             {
-                bool allowed = m_ForeignAgentsAllowed;
-
-                if (m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsAllowedExceptions))
-                        allowed = false;
-
-                if (!m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsDisallowedExceptions))
-                    allowed = true;
-
-                if (!allowed)
-                {
-                    reason = "Destination does not allow visitors from your world";
-                    m_log.InfoFormat("[GATEKEEPER SERVICE]: Foreign agents are not permitted {0} {1} @ {2}. Refusing service.",
-                        aCircuit.firstname, aCircuit.lastname, aCircuit.ServiceURLs["HomeURI"]);
-                    return false;
-                }
+                reason = "Unauthorized";
+                m_log.InfoFormat("[GATEKEEPER SERVICE]: Foreign agents are not permitted {0} {1}. Refusing service.",
+                    aCircuit.firstname, aCircuit.lastname);
+                return false;
             }
 
+            // May want to authorize
+
             bool isFirstLogin = false;
             //
             // Login the presence, if it's not there yet (by the login service)
@@ -307,8 +280,7 @@ namespace OpenSim.Services.HypergridService
             if (presence != null) // it has been placed there by the login service
                 isFirstLogin = true;
 
-            else
-            {
+            else 
                 if (!m_PresenceService.LoginAgent(aCircuit.AgentID.ToString(), aCircuit.SessionID, aCircuit.SecureSessionID))
                 {
                     reason = "Unable to login presence";
@@ -318,26 +290,6 @@ namespace OpenSim.Services.HypergridService
                 }
                 m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence ok");
 
-                // Also login foreigners with GridUser service
-                if (m_GridUserService != null && account == null)
-                {
-                    string userId = aCircuit.AgentID.ToString();
-                    string first = aCircuit.firstname, last = aCircuit.lastname;
-                    if (last.StartsWith("@"))
-                    {
-                        string[] parts = aCircuit.firstname.Split('.');
-                        if (parts.Length >= 2)
-                        {
-                            first = parts[0];
-                            last = parts[1];
-                        }
-                    }
-
-                    userId += ";" + aCircuit.ServiceURLs["HomeURI"] + ";" + first + " " + last;
-                    m_GridUserService.LoggedIn(userId);
-                }
-            }
-
             //
             // Get the region
             //
@@ -441,27 +393,6 @@ namespace OpenSim.Services.HypergridService
 
         #region Misc
 
-        private bool IsException(AgentCircuitData aCircuit, List<string> exceptions)
-        {
-            bool exception = false;
-            if (exceptions.Count > 0) // we have exceptions
-            {
-                // Retrieve the visitor's origin
-                string userURL = aCircuit.ServiceURLs["HomeURI"].ToString();
-                if (!userURL.EndsWith("/"))
-                    userURL += "/";
-
-                if (exceptions.Find(delegate(string s)
-                {
-                    if (!s.EndsWith("/"))
-                        s += "/";
-                    return s == userURL;
-                }) != null)
-                    exception = true;
-            }
-
-            return exception;
-        }
 
         #endregion
     }
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs
index 84dec8d..db98166 100644
--- a/OpenSim/Services/HypergridService/HGAssetService.cs
+++ b/OpenSim/Services/HypergridService/HGAssetService.cs
@@ -58,8 +58,6 @@ namespace OpenSim.Services.HypergridService
 
         private UserAccountCache m_Cache;
 
-        private AssetPermissions m_AssetPerms;
-
         public HGAssetService(IConfigSource config, string configName) : base(config, configName)
         {
             m_log.Debug("[HGAsset Service]: Starting");
@@ -82,10 +80,6 @@ namespace OpenSim.Services.HypergridService
             m_HomeURL = assetConfig.GetString("HomeURI", m_HomeURL);
 
             m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
-
-            // Permissions
-            m_AssetPerms = new AssetPermissions(assetConfig);
-
         }
 
         #region IAssetService overrides
@@ -96,9 +90,6 @@ namespace OpenSim.Services.HypergridService
             if (asset == null)
                 return null;
 
-            if (!m_AssetPerms.AllowedExport(asset.Type))
-                return null;
-
             if (asset.Metadata.Type == (sbyte)AssetType.Object)
                 asset.Data = AdjustIdentifiers(asset.Data); ;
 
@@ -121,27 +112,16 @@ namespace OpenSim.Services.HypergridService
 
         public override byte[] GetData(string id)
         {
-            AssetBase asset = Get(id);
-
-            if (asset == null)
-                return null;
+            byte[] data = base.GetData(id);
 
-            if (!m_AssetPerms.AllowedExport(asset.Type))
+            if (data == null)
                 return null;
 
-            return asset.Data;
+            return AdjustIdentifiers(data);
         }
 
         //public virtual bool Get(string id, Object sender, AssetRetrieved handler)
 
-        public override string Store(AssetBase asset)
-        {
-            if (!m_AssetPerms.AllowedImport(asset.Type))
-                return string.Empty;
-
-            return base.Store(asset);
-        }
-
         public override bool Delete(string id)
         {
             // NOGO
diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index a8bcfb2..98423d7 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -397,7 +397,7 @@ namespace OpenSim.Services.HypergridService
                     if (region != null)
                     {
                         m_log.DebugFormat("[HGFRIENDS SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline"));
-                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online);
+                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online);
                     }
                 }
             }
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 784f136..6e4b68c 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -56,12 +56,10 @@ namespace OpenSim.Services.HypergridService
 
         private string m_HomeURL;
         private IUserAccountService m_UserAccountService;
-        private IAvatarService m_AvatarService;
 
 //        private UserAccountCache m_Cache;
 
         private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>();
-        private ExpiringCache<UUID, AvatarAppearance> m_Appearances = new ExpiringCache<UUID, AvatarAppearance>();
 
         public HGSuitcaseInventoryService(IConfigSource config, string configName)
             : base(config, configName)
@@ -71,7 +69,7 @@ namespace OpenSim.Services.HypergridService
                 m_ConfigName = configName;
 
             if (m_Database == null)
-                m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: m_Database is null!");
+                m_log.WarnFormat("[XXX]: m_Database is null!");
 
             //
             // Try reading the [InventoryService] section, if it exists
@@ -79,6 +77,7 @@ namespace OpenSim.Services.HypergridService
             IConfig invConfig = config.Configs[m_ConfigName];
             if (invConfig != null)
             {
+                // realm = authConfig.GetString("Realm", realm);
                 string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty);
                 if (userAccountsDll == string.Empty)
                     throw new Exception("Please specify UserAccountsService in HGInventoryService configuration");
@@ -88,14 +87,8 @@ namespace OpenSim.Services.HypergridService
                 if (m_UserAccountService == null)
                     throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
 
-                string avatarDll = invConfig.GetString("AvatarService", string.Empty);
-                if (avatarDll == string.Empty)
-                    throw new Exception("Please specify AvatarService in HGInventoryService configuration");
-
-                m_AvatarService = ServerUtils.LoadPlugin<IAvatarService>(avatarDll, args);
-                if (m_AvatarService == null)
-                    throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
-
+                // legacy configuration [obsolete]
+                m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty);
                 // Preferred
                 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
 
@@ -301,7 +294,7 @@ namespace OpenSim.Services.HypergridService
 
         public override bool AddFolder(InventoryFolderBase folder)
         {
-            //m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID);
+            m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: AddFolder {0} {1}", folder.Name, folder.ParentID);
             // Let's do a bit of sanity checking, more than the base service does
             // make sure the given folder's parent folder exists under the suitcase tree of this user
 
@@ -323,7 +316,7 @@ namespace OpenSim.Services.HypergridService
 
         public override bool UpdateFolder(InventoryFolderBase folder)
         {
-            //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
+            m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Update folder {0}, version {1}", folder.ID, folder.Version);
             if (!IsWithinSuitcaseTree(folder.Owner, folder.ID))
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: folder {0} not within Suitcase tree", folder.Name);
@@ -401,7 +394,7 @@ namespace OpenSim.Services.HypergridService
                 return null;
             }
 
-            if (!IsWithinSuitcaseTree(it.Owner, it.Folder) && !IsPartOfAppearance(it.Owner, it.ID))
+            if (!IsWithinSuitcaseTree(it.Owner, it.Folder))
             {
                 m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Item {0} (folder {1}) is not within Suitcase",
                     it.Name, it.Folder);
@@ -460,15 +453,6 @@ namespace OpenSim.Services.HypergridService
 
             if (folders != null && folders.Length > 0)
                 return folders[0];
-
-            // OK, so the RootFolder type didn't work. Let's look for any type with parent UUID.Zero.
-            folders = m_Database.GetFolders(
-                new string[] { "agentID", "folderName", "parentFolderID" },
-                new string[] { principalID.ToString(), "My Inventory", UUID.Zero.ToString() });
-
-            if (folders != null && folders.Length > 0)
-                return folders[0];
-
             return null;
         }
 
@@ -565,52 +549,6 @@ namespace OpenSim.Services.HypergridService
             else return true;
         }
         #endregion
-
-        #region Avatar Appearance
-
-        private AvatarAppearance GetAppearance(UUID principalID)
-        {
-            AvatarAppearance a = null;
-            if (m_Appearances.TryGetValue(principalID, out a))
-                return a;
-
-            a = m_AvatarService.GetAppearance(principalID);
-            m_Appearances.AddOrUpdate(principalID, a, 5 * 60); // 5minutes
-            return a;
-        }
-
-        private bool IsPartOfAppearance(UUID principalID, UUID itemID)
-        {
-            AvatarAppearance a = GetAppearance(principalID);
-
-            if (a == null)
-                return false;
-
-            // Check wearables (body parts and clothes)
-            for (int i = 0; i < a.Wearables.Length; i++)
-            {
-                for (int j = 0; j < a.Wearables[i].Count; j++)
-                {
-                    if (a.Wearables[i][j].ItemID == itemID)
-                    {
-                        //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is a wearable", itemID); 
-                        return true;
-                    }
-                }
-            }
-
-            // Check attachments
-            if (a.GetAttachmentForItem(itemID) != null)
-            {
-                //m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: item {0} is an attachment", itemID); 
-                return true;
-            }
-
-            return false;
-        }
-
-        #endregion
-
     }
 
 }
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 416ad16..a49993c 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -77,10 +77,6 @@ namespace OpenSim.Services.HypergridService
 
         protected static bool m_BypassClientVerification;
 
-        private static Dictionary<int, bool> m_ForeignTripsAllowed = new Dictionary<int, bool>();
-        private static Dictionary<int, List<string>> m_TripsAllowedExceptions = new Dictionary<int, List<string>>();
-        private static Dictionary<int, List<string>> m_TripsDisallowedExceptions = new Dictionary<int, List<string>>();
-
         public UserAgentService(IConfigSource config) : this(config, null)
         {
         }
@@ -125,12 +121,6 @@ namespace OpenSim.Services.HypergridService
                 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
                 m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(userAccountService, args);
 
-                m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0);
-
-                LoadTripPermissionsFromConfig(serverConfig, "ForeignTripsAllowed");
-                LoadDomainExceptionsFromConfig(serverConfig, "AllowExcept", m_TripsAllowedExceptions);
-                LoadDomainExceptionsFromConfig(serverConfig, "DisallowExcept", m_TripsDisallowedExceptions);
-
                 m_GridName = serverConfig.GetString("ExternalName", string.Empty);
                 if (m_GridName == string.Empty)
                 {
@@ -140,43 +130,10 @@ namespace OpenSim.Services.HypergridService
                 if (!m_GridName.EndsWith("/"))
                     m_GridName = m_GridName + "/";
 
+                m_LevelOutsideContacts = serverConfig.GetInt("LevelOutsideContacts", 0);
             }
         }
 
-        protected void LoadTripPermissionsFromConfig(IConfig config, string variable)
-        {
-            foreach (string keyName in config.GetKeys())
-            {
-                if (keyName.StartsWith(variable + "_Level_"))
-                {
-                    int level = 0;
-                    if (Int32.TryParse(keyName.Replace(variable + "_Level_", ""), out level))
-                        m_ForeignTripsAllowed.Add(level, config.GetBoolean(keyName, true));
-                }
-            }
-        }
-
-        protected void LoadDomainExceptionsFromConfig(IConfig config, string variable, Dictionary<int, List<string>> exceptions)
-        {
-            foreach (string keyName in config.GetKeys())
-            {
-                if (keyName.StartsWith(variable + "_Level_"))
-                {
-                    int level = 0;
-                    if (Int32.TryParse(keyName.Replace(variable + "_Level_", ""), out level) && !exceptions.ContainsKey(level))
-                    {
-                        exceptions.Add(level, new List<string>());
-                        string value = config.GetString(keyName, string.Empty);
-                        string[] parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-                        foreach (string s in parts)
-                            exceptions[level].Add(s.Trim());
-                    }
-                }
-            }
-        }
-
-
         public GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt)
         {
             position = new Vector3(128, 128, 0); lookAt = Vector3.UnitY;
@@ -209,39 +166,13 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 
                 agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI);
 
-            string gridName = gatekeeper.ServerURI;
-
-            UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, agentCircuit.AgentID);
-            if (account == null)
+            if (m_UserAccountService.GetUserAccount(UUID.Zero, agentCircuit.AgentID) == null)
             {
                 m_log.WarnFormat("[USER AGENT SERVICE]: Someone attempted to lauch a foreign user from here {0} {1}", agentCircuit.firstname, agentCircuit.lastname);
                 reason = "Forbidden to launch your agents from here";
                 return false;
             }
 
-            // Is this user allowed to go there?
-            if (m_GridName != gridName)
-            {
-                if (m_ForeignTripsAllowed.ContainsKey(account.UserLevel))
-                {
-                    bool allowed = m_ForeignTripsAllowed[account.UserLevel];
-
-                    if (m_ForeignTripsAllowed[account.UserLevel] && IsException(gridName, account.UserLevel, m_TripsAllowedExceptions))
-                        allowed = false;
-
-                    if (!m_ForeignTripsAllowed[account.UserLevel] && IsException(gridName, account.UserLevel, m_TripsDisallowedExceptions))
-                        allowed = true;
-
-                    if (!allowed)
-                    {
-                        reason = "Your world does not allow you to visit the destination";
-                        m_log.InfoFormat("[USER AGENT SERVICE]: Agents not permitted to visit {0}. Refusing service.", gridName);
-                        return false;
-                    }
-                }
-            }
-
-
             // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination
             GridRegion region = new GridRegion(gatekeeper);
             region.ServerURI = gatekeeper.ServerURI;
@@ -258,6 +189,7 @@ namespace OpenSim.Services.HypergridService
             
             bool success = false;
             string myExternalIP = string.Empty;
+            string gridName = gatekeeper.ServerURI;
 
             m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}", m_GridName, gridName);
 
@@ -502,7 +434,7 @@ namespace OpenSim.Services.HypergridService
                     if (region != null)
                     {
                         m_log.DebugFormat("[USER AGENT SERVICE]: Remote Notify to region {0}, user {1} is {2}", region.RegionName, foreignUserID, (online ? "online" : "offline"));
-                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID.ToString(), online);
+                        m_FriendsSimConnector.StatusNotify(region, foreignUserID, userID, online);
                     }
                 }
             }
@@ -654,35 +586,6 @@ namespace OpenSim.Services.HypergridService
             else
                 return UUID.Zero;
         }
-
-        #region Misc
-
-        private bool IsException(string dest, int level, Dictionary<int, List<string>> exceptions)
-        {
-            if (!exceptions.ContainsKey(level))
-                return false;
-
-            bool exception = false;
-            if (exceptions[level].Count > 0) // we have exceptions
-            {
-                string destination = dest;
-                if (!destination.EndsWith("/"))
-                    destination += "/";
-
-                if (exceptions[level].Find(delegate(string s)
-                {
-                    if (!s.EndsWith("/"))
-                        s += "/";
-                    return s == destination;
-                }) != null)
-                    exception = true;
-            }
-
-            return exception;
-        }
-
-        #endregion
-
     }
 
     class TravelingAgentInfo