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

add harder restrictions to llGiveInventoryList. permissions per item as giveinventory, target avatar must see the prim region. Add 3seconds delay

master
UbitUmarov 2020-02-27 23:10:16 +00:00
parent 7ef657c415
commit 22e201bb49
1 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -7762,32 +7762,74 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (!UUID.TryParse(destination, out destID)) if (!UUID.TryParse(destination, out destID))
return; return;
SceneObjectPart destsop = null;
ScenePresence sp = null;
bool isNotOwner = true;
if (!World.TryGetSceneObjectPart(destID, out destsop))
{
if (!World.TryGetScenePresence(destID, out sp))
{
// we could check if it is a grid user and allow the transfer as in older code
// but that increases security risk
Error("llGiveInventoryList", "Unable to give list, destination not found");
ScriptSleep(100);
return;
}
isNotOwner = sp.UUID != m_host.OwnerID;
}
List<UUID> itemList = new List<UUID>(); List<UUID> itemList = new List<UUID>();
foreach (Object item in inventory.Data) foreach (Object item in inventory.Data)
{ {
string rawItemString = item.ToString(); string rawItemString = item.ToString();
TaskInventoryItem taskItem = null;
UUID itemID; if (UUID.TryParse(rawItemString, out UUID itemID))
if (UUID.TryParse(rawItemString, out itemID)) taskItem = m_host.Inventory.GetInventoryItem(itemID);
else
taskItem = m_host.Inventory.GetInventoryItem(rawItemString);
if(taskItem == null)
continue;
if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
continue;
if (destsop != null)
{ {
itemList.Add(itemID); if(!World.Permissions.CanDoObjectInvToObjectInv(taskItem, m_host, destsop))
continue;
} }
else else
{ {
TaskInventoryItem taskItem = m_host.Inventory.GetInventoryItem(rawItemString); if(isNotOwner)
{
if (taskItem != null) if ((taskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
itemList.Add(taskItem.ItemID); continue;
}
} }
itemList.Add(taskItem.ItemID);
} }
if (itemList.Count == 0) if (itemList.Count == 0)
{
Error("llGiveInventoryList", "Unable to give list, no items found");
ScriptSleep(100);
return; return;
}
UUID folderID = m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); UUID folderID = m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList);
if (folderID == UUID.Zero) if (folderID == UUID.Zero)
{
Error("llGiveInventoryList", "Unable to give list");
ScriptSleep(100);
return;
}
if (destsop != null)
return; return;
if (m_TransferModule != null) if (m_TransferModule != null)
@ -7807,6 +7849,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
} }
ScriptSleep(destsop == null ? 3000 : 100);
} }
public void llSetVehicleType(int type) public void llSetVehicleType(int type)