A pretty major restructuring of the simian method invocations in order to

service access capabilities. In conjunction with the corresponding Simian
updates, this enables explicit per-simulator capability-based access to
grid services. That enables grid owners to add or revoke access to the grid
on a simulator by simulator basis.

1 files changed, 114 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index 847319c..a4dd36c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -26,8 +26,122 @@
  */
 
 using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Reflection;
+
+using log4net;
 using Mono.Addins;
 using Nini.Config;
 
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
 [assembly: Addin("SimianGrid", "1.0")]
 [assembly: AddinDependency("OpenSim", "0.5")]
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianExternalCapsModule")]
+    public class SimianGrid : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IConfig m_config = null;
+        private bool m_enabled = true;
+
+        private String m_simianURL;
+        
+#region IRegionModule Members
+
+        public string Name
+        {
+            get { return this.GetType().Name; }
+        }
+
+           
+        public void Initialise(IConfigSource config)
+        {
+            try 
+            {
+                m_config = config.Configs["SimianGrid"];
+               
+                if (m_config != null)
+                {
+                    m_simianURL = m_config.GetString("SimianServiceURL");
+                    if (String.IsNullOrEmpty(m_simianURL))
+                        m_log.ErrorFormat("[SimianGrid] service URL is not defined");
+                    
+                    InitialiseSimCap();
+                    SimulatorCapability = SimulatorCapability.Trim();
+                    m_log.WarnFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[SimianExternalCaps] initialization error: {0}",e.Message);
+                return;
+            }
+        }
+
+        public void PostInitialise() { }
+        public void Close() { }
+        public void AddRegion(Scene scene) { }
+        public void RemoveRegion(Scene scene) { }
+        public void RegionLoaded(Scene scene) { }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        ///<summary>
+        /// Try a variety of methods for finding the simian simulator capability; first check the
+        /// configuration itself, then look for a file that contains the cap, then finally look 
+        /// for an environment variable that contains it.
+        ///</summary>
+        private void InitialiseSimCap()
+        {
+            if (m_config.Contains("SimulatorCapability"))
+            {
+                SimulatorCapability = m_config.GetString("SimulatorCapability");
+                return;
+            }
+            
+            if (m_config.Contains("SimulatorCapabilityFile"))
+            {
+                String filename = m_config.GetString("SimulatorCapabilityFile");
+                if (System.IO.File.Exists(filename))
+                {
+                    SimulatorCapability = System.IO.File.ReadAllText(filename);
+                    return;
+                }
+            }
+            
+            if (m_config.Contains("SimulatorCapabilityVariable"))
+            {
+                String envname = m_config.GetString("SimulatorCapabilityVariable");
+                String envvalue = System.Environment.GetEnvironmentVariable(envname);
+                if (envvalue != null)
+                {
+                    SimulatorCapability = envvalue;
+                    return;
+                }
+            }
+
+            m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability");
+        }
+        
+#endregion
+        public static String SimulatorCapability = UUID.Zero.ToString();
+        public static OSDMap PostToService(string url, NameValueCollection data)
+        {
+            data["cap"] = SimulatorCapability;
+            return WebUtil.PostToService(url, data);
+        }
+    }
+}