From 9090a907692e7deaafd79150bf6482507be86d55 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 16 Aug 2009 03:48:16 +1000
Subject: * Beginnings of a Security Credential system in MRM. This will
 eventually lead to trusted execution of untrusted MRMs.

---
 .../Region/OptionalModules/Scripting/Minimodule/MRMModule.cs   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 5ed9af3..0cc7930 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -166,8 +166,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host)
         {
-            world = new World(m_scene);
-            host = new Host(new SOPObject(m_scene, localID), m_scene, new ExtensionHandler(m_extensions), m_microthreads);
+            // UUID should be changed to object owner.
+            UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+            SEUser securityUser = new SEUser(owner, "Name Unassigned");
+            SecurityCredential creds = new SecurityCredential(securityUser);
+
+            world = new World(m_scene, creds);
+            host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions),
+                            m_microthreads);
         }
 
         public void InitializeMRM(MRMBase mmb, uint localID, UUID itemID)
-- 
cgit v1.1


From 8621dc405e2f0f1ea81baa52ec124d8b362a2abf Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 16 Aug 2009 21:23:39 +1000
Subject: * Fixes potential NulRef in MRM Security Checks.

---
 OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs')

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 0cc7930..6daae29 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             // UUID should be changed to object owner.
             UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
             SEUser securityUser = new SEUser(owner, "Name Unassigned");
-            SecurityCredential creds = new SecurityCredential(securityUser);
+            SecurityCredential creds = new SecurityCredential(securityUser, m_scene);
 
             world = new World(m_scene, creds);
             host = new Host(new SOPObject(m_scene, localID, creds), m_scene, new ExtensionHandler(m_extensions),
-- 
cgit v1.1