Merge branch 'master' of opensimulator.org:/var/git/opensim

3 files changed, 176 insertions, 18 deletions

diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
index 84dadf2..f93c120 100644
--- a/OpenSim/Tests/Permissions/Common.cs
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -1,6 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Threading;
 using Nini.Config;
 using NUnit.Framework;
@@ -10,7 +35,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Region.CoreModules.Avatar.Inventory.Transfer;
 using OpenSim.Region.CoreModules.Framework.InventoryAccess;
-using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
 using PermissionMask = OpenSim.Framework.PermissionMask;
@@ -67,7 +91,7 @@ namespace OpenSim.Tests.Permissions
         /// - 6 simple boxes inworld belonging to A0 and with Next Owner perms:
         ///   C, CT, MC, MCT, MT, T
         /// - Copies of all of these boxes in A0's inventory in the Objects folder
-        /// - One additional box in A0's inventory which is a copy of MCT, but 
+        /// - One additional box inworld and in A0's inventory which is a copy of MCT, but 
         ///   with C removed in inventory. This one is called MCT-C
         /// </summary>
         private void SetUpBasicEnvironment()
@@ -140,7 +164,7 @@ namespace OpenSim.Tests.Permissions
             PrintPerms(box);
             AssertPermissions(nextOwnerPerms, (PermissionMask)box.RootPart.NextOwnerMask, box.OwnerID.ToString().Substring(34) + " : " + box.Name);
 
-            TakeCopyToInventory(box);
+            TakeCopyToInventory(0, box);
 
         }
 
@@ -218,14 +242,14 @@ namespace OpenSim.Tests.Permissions
             return so;
         }
 
-        public void TakeCopyToInventory(SceneObjectGroup sog)
+        public void TakeCopyToInventory(int userIndex, SceneObjectGroup sog)
         {
-            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(m_Scene.InventoryService, sog.OwnerID, "Objects");
+            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(m_Scene.InventoryService, m_Avatars[userIndex].UUID, "Objects");
             Assert.That(objsFolder, Is.Not.Null);
 
             List<uint> localIds = new List<uint>(); localIds.Add(sog.LocalId);
             // This is an async operation
-            m_Scene.DeRezObjects((IClientAPI)m_Avatars[0].ClientView, localIds, sog.UUID, DeRezAction.TakeCopy, objsFolder.ID);
+            m_Scene.DeRezObjects((IClientAPI)m_Avatars[userIndex].ClientView, localIds, m_Avatars[userIndex].UUID, DeRezAction.TakeCopy, objsFolder.ID);
         }
 
         public InventoryItemBase GetItemFromInventory(UUID userID, string folderName, string itemName)
@@ -262,6 +286,26 @@ namespace OpenSim.Tests.Permissions
             return clone;
         }
 
+        public void DeleteObjectsFolders()
+        {
+            // Delete everything in A2 and A3's Objects folders, so we can restart
+            for (int i = 1; i < 3; i++)
+            {
+                InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(Common.TheScene.InventoryService, Common.TheAvatars[i].UUID, "Objects");
+                Assert.That(objsFolder, Is.Not.Null);
+
+                List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
+                List<UUID> ids = new List<UUID>();
+                foreach (InventoryItemBase it in items)
+                    ids.Add(it.ID);
+
+                Common.TheScene.InventoryService.DeleteItems(Common.TheAvatars[i].UUID, ids);
+                items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
+                Assert.That(items.Count, Is.EqualTo(0), "A" + (i + 1));
+            }
+
+        }
+
         public string IdStr(InventoryItemBase item)
         {
             return item.Owner.ToString().Substring(34) + " : " + item.Name;
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index 3ca711a..c68bbdf 100644
--- a/OpenSim/Tests/Permissions/DirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -25,20 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using Nini.Config;
 using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Permissions;
-using OpenSim.Region.CoreModules.Avatar.Inventory.Transfer;
-using OpenSim.Region.CoreModules.Framework.InventoryAccess;
-using OpenSim.Region.Framework.Scenes.Serialization;
-using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
 using PermissionMask = OpenSim.Framework.PermissionMask;
 
@@ -54,6 +44,7 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
+            Common.TheInstance.DeleteObjectsFolders();
         }
 
         /// <summary>
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
new file mode 100644
index 0000000..7d8027f
--- /dev/null
+++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using System.Threading;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using PermissionMask = OpenSim.Framework.PermissionMask;
+
+namespace OpenSim.Tests.Permissions
+{
+    /// <summary>
+    /// Basic scene object tests (create, read and delete but not update).
+    /// </summary>
+    [TestFixture]
+    public class IndirectTransferTests
+    {
+
+        [SetUp]
+        public void SetUp()
+        {
+            Common.TheInstance.DeleteObjectsFolders();
+        }
+
+        /// <summary>
+        /// Test giving simple objecta with various combinations of next owner perms.
+        /// </summary>
+        [Test]
+        public void SimpleTakeCopy()
+        {
+            TestHelpers.InMethod();
+
+            // The Objects folder of A2
+            InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(Common.TheScene.InventoryService, Common.TheAvatars[1].UUID, "Objects");
+
+            // C, CT, MC, MCT, MT, T
+            string[] names = new string[6] { "Box C", "Box CT", "Box MC", "Box MCT", "Box MT", "Box T" };
+            PermissionMask[] perms = new PermissionMask[6] {
+                    PermissionMask.Copy,
+                    PermissionMask.Copy | PermissionMask.Transfer,
+                    PermissionMask.Modify | PermissionMask.Copy,
+                    PermissionMask.Modify | PermissionMask.Copy | PermissionMask.Transfer,
+                    PermissionMask.Modify | PermissionMask.Transfer,
+                    PermissionMask.Transfer
+            };
+
+            // Try A2 takes copies of objects that cannot be copied. 
+            for (int i = 0; i < 6; i++)
+                TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]);
+            Thread.Sleep(5000);
+
+            List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID);
+            Assert.That(items.Count, Is.EqualTo(0));
+
+            // A1 makes the objects copyable
+            for (int i = 0; i < 6; i++)
+                MakeCopyable(Common.TheScene.GetSceneObjectGroups(), names[i]);
+
+            // Try A2 takes copies of objects that can be copied. 
+            for (int i = 0; i < 6; i++)
+                TakeOneBox(Common.TheScene.GetSceneObjectGroups(), names[i], perms[i]);
+            Thread.Sleep(5000);
+
+            items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[1].UUID, objsFolder.ID);
+            Assert.That(items.Count, Is.EqualTo(6));
+
+            for (int i = 0; i < 6; i++)
+            {
+                InventoryItemBase item = Common.TheInstance.GetItemFromInventory(Common.TheAvatars[1].UUID, "Objects", names[i]);
+                Assert.That(item, Is.Not.Null);
+                Common.TheInstance.AssertPermissions(perms[i], (PermissionMask)item.BasePermissions, Common.TheInstance.IdStr(item));
+            }
+        }
+
+        private void TakeOneBox(List<SceneObjectGroup> objs, string name, PermissionMask mask)
+        {
+            SceneObjectGroup box = objs.Find(sog => sog.Name == name && sog.OwnerID == Common.TheAvatars[0].UUID);
+            Assert.That(box, Is.Not.Null, name);
+
+            // A2's inventory (index 1)
+            Common.TheInstance.TakeCopyToInventory(1, box);
+        }
+
+        private void MakeCopyable(List<SceneObjectGroup> objs, string name)
+        {
+            SceneObjectGroup box = objs.Find(sog => sog.Name == name && sog.OwnerID == Common.TheAvatars[0].UUID);
+            Assert.That(box, Is.Not.Null, name);
+
+            // field = 8 is Everyone 
+            // set = 1 means add the permission; set = 0 means remove permission
+            Common.TheScene.HandleObjectPermissionsUpdate((IClientAPI)Common.TheAvatars[0].ClientView, Common.TheAvatars[0].UUID,
+                Common.TheAvatars[0].ControllingClient.SessionId, 8, box.LocalId, (uint)PermissionMask.Copy, 1);
+            Common.TheInstance.PrintPerms(box);
+        }
+    }
+}
\ No newline at end of file