cosmetics

OpenSim/ApplicationPlugins/LoadRegions/EstateLoaderFileSystem.cs

@@ -28,16 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
 
 namespace OpenSim.ApplicationPlugins.LoadRegions
 {
@@ -63,25 +58,30 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
         {
             string estateConfigPath = Path.Combine(Util.configDir(), "Estates");
 
+            IConfig startupConfig = m_configSource.Configs["Startup"];
+            if(startupConfig == null)
+                return;
+
+            estateConfigPath = startupConfig.GetString("regionload_estatesdir", estateConfigPath).Trim();
+            if(string.IsNullOrWhiteSpace(estateConfigPath))
+                return;
+
+            if (!Directory.Exists(estateConfigPath))
+                return; // if nothing there, don't bother
+
+            string[] iniFiles = null;
             try
             {
-                IConfig startupConfig = m_configSource.Configs["Startup"];
-                estateConfigPath = startupConfig.GetString("regionload_estatesdir", estateConfigPath).Trim();
+                iniFiles = Directory.GetFiles(estateConfigPath, "*.ini");
             }
-            catch (Exception)
+            catch
             {
-                // No INI setting recorded.
-            }
-
-            if (Directory.Exists(estateConfigPath) == false)
-            {
-                Directory.CreateDirectory(estateConfigPath);
+                m_log.Info("[ESTATE LOADER FILE SYSTEM]: could not open " + estateConfigPath);
+                return;
             }
 
-            string[] iniFiles = Directory.GetFiles(estateConfigPath, "*.ini");
-
             // No Estate.ini Found
-            if (iniFiles.Length == 0)
+            if (iniFiles == null || iniFiles.Length == 0)
                 return;
 
             m_log.InfoFormat("[ESTATE LOADER FILE SYSTEM]: Loading estate config files from {0}", estateConfigPath);
@@ -93,19 +93,37 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             {
                 m_log.InfoFormat("[ESTATE LOADER FILE SYSTEM]: Loading config file {0}", file);
 
-                IConfigSource source = new IniConfigSource(file);
+                IConfigSource source = null;
+                try
+                {
+                    source = new IniConfigSource(file);
+                }
+                catch
+                {
+                    m_log.InfoFormat("[ESTATE LOADER FILE SYSTEM]: failed to parse file {0}", file);
+                }
+
+                if(source == null)
+                    continue;
 
                 foreach (IConfig config in source.Configs)
                 {
                     // Read Estate Config From Source File
                     string estateName = config.Name;
-                    string ownerString = config.GetString("Owner", string.Empty);
+                    if (string.IsNullOrWhiteSpace(estateName))
+                        continue;
 
-                    if (UUID.TryParse(ownerString, out UUID estateOwner) == false)
-                        estateOwner = UUID.Zero;
+                    if (estateName.Length > 64) // need check this and if utf8 is valid
+                    {
+                        m_log.InfoFormat("[ESTATE LOADER FILE SYSTEM]: Estate name {0} is too large, ignoring", estateName);
+                        continue;
+                    }
 
-                    // Check Name Is Valid
-                    if (estateName == string.Empty || estateOwner == UUID.Zero)
+                    string ownerString = config.GetString("Owner", string.Empty);
+                    if (string.IsNullOrWhiteSpace(ownerString))
+                        continue;
+
+                    if (!UUID.TryParse(ownerString, out UUID estateOwner) || estateOwner == UUID.Zero)
                         continue;
 
                     // Check If Estate Exists (Skip If So)
@@ -130,7 +148,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                     i++;
                 }
             }
-
         }
     }
 }

OpenSim/Region/Application/OpenSimBase.cs

@@ -1042,13 +1042,13 @@ namespace OpenSim
 
             //##
             // Target Estate Specified in Region.ini
-            string targetEstateName = regInfo.GetSetting("TargetEstate");
+            string targetEstateIDstr = regInfo.GetSetting("TargetEstate");
 
-            if (targetEstateName != null && targetEstateName != string.Empty)
+            if (!string.IsNullOrWhiteSpace(targetEstateIDstr))
             {
                 bool targetEstateJoined = false;
 
-                if (Int32.TryParse(targetEstateName, out int targetEstateID) && targetEstateID > 99)
+                if (Int32.TryParse(targetEstateIDstr, out int targetEstateID) && targetEstateID > 99)
                 {
                     // Attempt to join the target estate given in Config by ID
                     foreach (EstateSettings estate in estates)
@@ -1065,12 +1065,8 @@ namespace OpenSim
                 else
                 {
                     // Attempt to join the target estate given in Config by name
-                    EstateSettings targetEstate;
-                    
-                    if (estatesByName.ContainsKey(targetEstateName))
+                    if (estatesByName.TryGetValue(targetEstateIDstr, out EstateSettings targetEstate))
                     {
-                        targetEstate = estatesByName[targetEstateName];
-
                         if (EstateDataService.LinkRegion(regInfo.RegionID, (int)targetEstate.EstateID))
                             targetEstateJoined = true;
                     }
@@ -1080,7 +1076,7 @@ namespace OpenSim
                     return true; // need to update the database
                 else
                     m_log.ErrorFormat(
-                        "[OPENSIM BASE]: Joining target estate specified in region config {0} failed", targetEstateName);
+                        "[OPENSIM BASE]: Joining target estate specified in region config {0} failed", targetEstateIDstr);
             }
             //##
 
@@ -1091,13 +1087,9 @@ namespace OpenSim
 
                 if (defaultEstateName != null)
                 {
-                    EstateSettings defaultEstate;
                     bool defaultEstateJoined = false;
-
-                    if (estatesByName.ContainsKey(defaultEstateName))
+                    if (estatesByName.TryGetValue(defaultEstateName, out EstateSettings defaultEstate))
                     {
-                        defaultEstate = estatesByName[defaultEstateName];
-
                         if (EstateDataService.LinkRegion(regInfo.RegionID, (int)defaultEstate.EstateID))
                             defaultEstateJoined = true;
                     }
@@ -1129,8 +1121,7 @@ namespace OpenSim
                 }
                 else
                 {
-                    string response
-                        = MainConsole.Instance.Prompt(
+                    string response = MainConsole.Instance.Prompt(
                             string.Format(
                                 "Do you wish to join region {0} to an existing estate (yes/no)?", regInfo.RegionName),
                                 "yes",