OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

object CanMove is for in scene SOGs Icleints and SPs and permitions module is NOT a shared module

httptests
UbitUmarov 2017-01-19 12:35:00 +00:00
parent fe9a785ecc
commit 673bd37219
5 changed files with 57 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -1420,28 +1420,21 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return GenericEstatePermission(user); return GenericEstatePermission(user);
} }
private bool CanMoveObject(UUID objectID, UUID moverID, Scene scene) private bool CanMoveObject(SceneObjectGroup sog, ScenePresence sp)
{ {
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
return false;
if (m_bypassPermissions) if (m_bypassPermissions)
{ {
SceneObjectPart part = scene.GetSceneObjectPart(objectID); if (sog.OwnerID != sp.UUID && sog.IsAttachment)
if(part == null)
return false; return false;
if (part.OwnerID != moverID)
{
if (part.ParentGroup.IsDeleted || part.ParentGroup.IsAttachment)
return false;
}
return m_bypassPermissionsValue; return m_bypassPermissionsValue;
} }
SceneObjectGroup sog = scene.GetGroupByPrim(objectID); uint perms = GetObjectPermissions(sp, sog, true);
if (sog == null)
return false;
uint perms = GetObjectPermissions(moverID, sog, true);
if((perms & (uint)PermissionMask.Move) == 0) if((perms & (uint)PermissionMask.Move) == 0)
return false; return false;
return true; return true;

6
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -325,7 +325,7 @@ namespace OpenSim.Region.Framework.Scenes
if(group == null || group.IsDeleted) if(group == null || group.IsDeleted)
return; return;
if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.) if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.)
{ {
group.GrabMovement(objectID, offset, pos, remoteClient); group.GrabMovement(objectID, offset, pos, remoteClient);
} }
@ -386,7 +386,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(objectID); SceneObjectGroup group = GetGroupByPrim(objectID);
if (group != null) if (group != null)
{ {
if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.) if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.)
{ {
group.SpinStart(remoteClient); group.SpinStart(remoteClient);
} }
@ -404,7 +404,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(objectID); SceneObjectGroup group = GetGroupByPrim(objectID);
if (group != null) if (group != null)
{ {
if (Permissions.CanMoveObject(group.UUID, remoteClient.AgentId))// && PermissionsMngr.) if (Permissions.CanMoveObject(group, remoteClient))// && PermissionsMngr.)
{ {
group.SpinMovement(rotation, remoteClient); group.SpinMovement(rotation, remoteClient);
} }

13
OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes
public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition); public delegate bool DuplicateObjectHandler(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition);
public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene); public delegate bool EditObjectHandler(UUID objectID, UUID editorID, Scene scene);
public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene); public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID, Scene scene);
public delegate bool MoveObjectHandler(UUID objectID, UUID moverID, Scene scene); public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp);
public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene); public delegate bool ObjectEntryHandler(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene);
public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene); public delegate bool ReturnObjectsHandler(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene);
public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene); public delegate bool InstantMessageHandler(UUID user, UUID target, Scene startScene);
@ -450,15 +450,22 @@ namespace OpenSim.Region.Framework.Scenes
#endregion #endregion
#region MOVE OBJECT #region MOVE OBJECT
public bool CanMoveObject(UUID objectID, UUID moverID) public bool CanMoveObject(SceneObjectGroup sog, IClientAPI client)
{ {
if(sog == null || client == null)
return false;
ScenePresence sp = client.SceneAgent as ScenePresence;
if(sp == null)
return false;
MoveObjectHandler handler = OnMoveObject; MoveObjectHandler handler = OnMoveObject;
if (handler != null) if (handler != null)
{ {
Delegate[] list = handler.GetInvocationList(); Delegate[] list = handler.GetInvocationList();
foreach (MoveObjectHandler h in list) foreach (MoveObjectHandler h in list)
{ {
if (h(objectID, moverID, m_scene) == false) if (h(sog, sp) == false)
return false; return false;
} }
} }

61
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -1379,7 +1379,7 @@ namespace OpenSim.Region.Framework.Scenes
if ((data.change & (ObjectChangeType.Position | ObjectChangeType.Rotation)) != 0) if ((data.change & (ObjectChangeType.Position | ObjectChangeType.Rotation)) != 0)
{ {
// Are we allowed to move it? // Are we allowed to move it?
if (m_parentScene.Permissions.CanMoveObject(grp.UUID, remoteClient.AgentId)) if (m_parentScene.Permissions.CanMoveObject(grp, remoteClient))
{ {
// Strip all but move and rotation from request // Strip all but move and rotation from request
data.change &= (ObjectChangeType.Group | ObjectChangeType.Position | ObjectChangeType.Rotation); data.change &= (ObjectChangeType.Group | ObjectChangeType.Position | ObjectChangeType.Rotation);
@ -1474,7 +1474,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group != null) if (group != null)
{ {
if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
{ {
group.UpdateSingleRotation(rot, localID); group.UpdateSingleRotation(rot, localID);
} }
@ -1492,7 +1492,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group != null) if (group != null)
{ {
if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
{ {
group.UpdateSingleRotation(rot, pos, localID); group.UpdateSingleRotation(rot, pos, localID);
} }
@ -1510,7 +1510,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group != null) if (group != null)
{ {
if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
{ {
group.UpdateGroupRotationR(rot); group.UpdateGroupRotationR(rot);
} }
@ -1529,7 +1529,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group != null) if (group != null)
{ {
if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId)) if (m_parentScene.Permissions.CanMoveObject(group, remoteClient))
{ {
group.UpdateGroupRotationPR(pos, rot); group.UpdateGroupRotationPR(pos, rot);
} }
@ -1547,7 +1547,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = GetGroupByPrim(localID); SceneObjectGroup group = GetGroupByPrim(localID);
if (group != null) if (group != null)
{ {
if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) || group.IsAttachment) if (m_parentScene.Permissions.CanMoveObject(group, remoteClient) || group.IsAttachment)
{ {
group.UpdateSinglePosition(pos, localID); group.UpdateSinglePosition(pos, localID);
} }
@ -1561,17 +1561,6 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="pos"></param> /// <param name="pos"></param>
/// <param name="remoteClient"></param> /// <param name="remoteClient"></param>
public void UpdatePrimGroupPosition(uint localId, Vector3 pos, IClientAPI remoteClient) public void UpdatePrimGroupPosition(uint localId, Vector3 pos, IClientAPI remoteClient)
{
UpdatePrimGroupPosition(localId, pos, remoteClient.AgentId);
}
/// <summary>
/// Update the position of the given group.
/// </summary>
/// <param name="localId"></param>
/// <param name="pos"></param>
/// <param name="updatingAgentId"></param>
public void UpdatePrimGroupPosition(uint localId, Vector3 pos, UUID updatingAgentId)
{ {
SceneObjectGroup group = GetGroupByPrim(localId); SceneObjectGroup group = GetGroupByPrim(localId);
@ -1589,7 +1578,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
else else
{ {
if (m_parentScene.Permissions.CanMoveObject(group.UUID, updatingAgentId) if (m_parentScene.Permissions.CanMoveObject(group, remoteClient)
&& m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos))
{ {
group.UpdateGroupPosition(pos); group.UpdateGroupPosition(pos);
@ -2025,27 +2014,9 @@ namespace OpenSim.Region.Framework.Scenes
protected internal void MakeObjectSearchable(IClientAPI remoteClient, bool IncludeInSearch, uint localID) protected internal void MakeObjectSearchable(IClientAPI remoteClient, bool IncludeInSearch, uint localID)
{ {
UUID user = remoteClient.AgentId; SceneObjectGroup sog = GetGroupByPrim(localID);
UUID objid = UUID.Zero; if(sog == null)
SceneObjectPart obj = null; return;
EntityBase[] entityList = GetEntities();
foreach (EntityBase ent in entityList)
{
if (ent is SceneObjectGroup)
{
SceneObjectGroup sog = ent as SceneObjectGroup;
foreach (SceneObjectPart part in sog.Parts)
{
if (part.LocalId == localID)
{
objid = part.UUID;
obj = part;
}
}
}
}
//Protip: In my day, we didn't call them searchable objects, we called them limited point-to-point joints //Protip: In my day, we didn't call them searchable objects, we called them limited point-to-point joints
//aka ObjectFlags.JointWheel = IncludeInSearch //aka ObjectFlags.JointWheel = IncludeInSearch
@ -2062,15 +2033,15 @@ namespace OpenSim.Region.Framework.Scenes
// libomv will complain about PrimFlags.JointWheel being // libomv will complain about PrimFlags.JointWheel being
// deprecated, so we // deprecated, so we
#pragma warning disable 0612 #pragma warning disable 0612
if (IncludeInSearch && m_parentScene.Permissions.CanEditObject(objid, user)) if (IncludeInSearch && m_parentScene.Permissions.CanEditObject(sog.UUID, remoteClient.AgentId))
{ {
obj.ParentGroup.RootPart.AddFlag(PrimFlags.JointWheel); sog.RootPart.AddFlag(PrimFlags.JointWheel);
obj.ParentGroup.HasGroupChanged = true; sog.HasGroupChanged = true;
} }
else if (!IncludeInSearch && m_parentScene.Permissions.CanMoveObject(objid,user)) else if (!IncludeInSearch && m_parentScene.Permissions.CanMoveObject(sog, remoteClient))
{ {
obj.ParentGroup.RootPart.RemFlag(PrimFlags.JointWheel); sog.RootPart.RemFlag(PrimFlags.JointWheel);
obj.ParentGroup.HasGroupChanged = true; sog.HasGroupChanged = true;
} }
#pragma warning restore 0612 #pragma warning restore 0612
} }

37
OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
View File

@ -157,29 +157,28 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Cross // Cross
sceneA.SceneGraph.UpdatePrimGroupPosition( sceneA.SceneGraph.UpdatePrimGroupPosition(
so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), userId); so1.LocalId, new Vector3(so1StartPos.X, so1StartPos.Y - 20, so1StartPos.Z), sp1SceneA.ControllingClient);
// crossing is async // crossing is async
Thread.Sleep(500); Thread.Sleep(500);
SceneObjectGroup so1PostCross; SceneObjectGroup so1PostCross;
{ ScenePresence sp1SceneAPostCross = sceneA.GetScenePresence(userId);
ScenePresence sp1SceneAPostCross = sceneA.GetScenePresence(userId); Assert.IsTrue(sp1SceneAPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly false");
Assert.IsTrue(sp1SceneAPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly false");
ScenePresence sp1SceneBPostCross = sceneB.GetScenePresence(userId); ScenePresence sp1SceneBPostCross = sceneB.GetScenePresence(userId);
TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient); TestClient sceneBTc = ((TestClient)sp1SceneBPostCross.ControllingClient);
sceneBTc.CompleteMovement(); sceneBTc.CompleteMovement();
Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true"); Assert.IsFalse(sp1SceneBPostCross.IsChildAgent, "sp1SceneAPostCross.IsChildAgent unexpectedly true");
Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject); Assert.IsTrue(sp1SceneBPostCross.IsSatOnObject);
Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id), "uck");
so1PostCross = sceneB.GetSceneObjectGroup(so1Id);
Assert.NotNull(so1PostCross);
Assert.AreEqual(1, so1PostCross.GetSittingAvatarsCount());
Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id), "uck");
so1PostCross = sceneB.GetSceneObjectGroup(so1Id);
Assert.NotNull(so1PostCross);
Assert.AreEqual(1, so1PostCross.GetSittingAvatarsCount());
}
Vector3 so1PostCrossPos = so1PostCross.AbsolutePosition; Vector3 so1PostCrossPos = so1PostCross.AbsolutePosition;
@ -187,7 +186,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Recross // Recross
sceneB.SceneGraph.UpdatePrimGroupPosition( sceneB.SceneGraph.UpdatePrimGroupPosition(
so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), userId); so1PostCross.LocalId, new Vector3(so1PostCrossPos.X, so1PostCrossPos.Y + 20, so1PostCrossPos.Z), sp1SceneBPostCross.ControllingClient);
// crossing is async // crossing is async
Thread.Sleep(500); Thread.Sleep(500);
@ -255,13 +254,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
lmmA.EventManagerOnNoLandDataFromStorage(); lmmA.EventManagerOnNoLandDataFromStorage();
lmmB.EventManagerOnNoLandDataFromStorage(); lmmB.EventManagerOnNoLandDataFromStorage();
AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
TestClient tc = new TestClient(acd, sceneA);
List<TestClient> destinationTestClients = new List<TestClient>();
EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
ScenePresence sp1SceneA = SceneHelpers.AddScenePresence(sceneA, tc, acd);
SceneObjectGroup so1 = SceneHelpers.AddSceneObject(sceneA, 1, userId, "", sceneObjectIdTail); SceneObjectGroup so1 = SceneHelpers.AddSceneObject(sceneA, 1, userId, "", sceneObjectIdTail);
UUID so1Id = so1.UUID; UUID so1Id = so1.UUID;
so1.AbsolutePosition = new Vector3(128, 10, 20); so1.AbsolutePosition = new Vector3(128, 10, 20);
// Cross with a negative value. We must make this call rather than setting AbsolutePosition directly // Cross with a negative value. We must make this call rather than setting AbsolutePosition directly
// because only this will execute permission checks in the source region. // because only this will execute permission checks in the source region.
sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), userId); sceneA.SceneGraph.UpdatePrimGroupPosition(so1.LocalId, new Vector3(128, -10, 20), sp1SceneA.ControllingClient);
// crossing is async // crossing is async
Thread.Sleep(500); Thread.Sleep(500);