Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 29 insertions, 38 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
index d7198f0..a49952c 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
@@ -26,66 +26,57 @@
  */
 
 using System;
-using OpenMetaverse;
-using log4net;
-using System.Reflection;
-using OpenSim.Framework;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Net;
 
-namespace OpenSim.Region.Framework.Scenes.Scripting
+namespace OpenSim.Framework.ServiceAuth
 {
-    public class NullScriptHost : IScriptHost
+    public class CompoundAuthentication : IServiceAuth
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public string Name { get { return "Compound"; } }
 
-        private Vector3 m_pos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
+        private List<IServiceAuth> m_authentications = new List<IServiceAuth>();
 
-        public string Name
-        {
-            get { return "Object"; }
-            set { }
-        }
+        public int Count { get { return m_authentications.Count; } }
 
-        public string SitName
+        public List<IServiceAuth> GetAuthentors()
         {
-            get { return String.Empty; }
-            set { }
+            return new List<IServiceAuth>(m_authentications);
         }
 
-        public string TouchName
+        public void AddAuthenticator(IServiceAuth auth)
         {
-            get { return String.Empty; }
-            set { }
+            m_authentications.Add(auth);
         }
 
-        public string Description
+        public void RemoveAuthenticator(IServiceAuth auth)
         {
-            get { return String.Empty; }
-            set { }
+            m_authentications.Remove(auth);
         }
 
-        public UUID UUID
+        public void AddAuthorization(NameValueCollection headers) 
         {
-            get { return UUID.Zero; }
+            foreach (IServiceAuth auth in m_authentications)
+                auth.AddAuthorization(headers);
         }
 
-        public UUID OwnerID
+        public bool Authenticate(string data)
         {
-            get { return UUID.Zero; }
+            return m_authentications.TrueForAll(a => a.Authenticate(data));
         }
 
-        public UUID CreatorID
+        public bool Authenticate(NameValueCollection requestHeaders, AddHeaderDelegate d, out HttpStatusCode statusCode)
         {
-            get { return UUID.Zero; }
-        }
+            foreach (IServiceAuth auth in m_authentications)
+            {
+                if (!auth.Authenticate(requestHeaders, d, out statusCode))
+                    return false;
+            }
 
-        public Vector3 AbsolutePosition
-        {
-            get { return m_pos; }
-        }
-
-        public void SetText(string text, Vector3 color, double alpha)
-        {
-            m_log.Warn("Tried to SetText "+text+" on NullScriptHost");
+            statusCode = HttpStatusCode.OK;
+            return true;
         }
     }
-}
+}
\ No newline at end of file