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

OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar. 

OSSL permissions are now controlled in OpenSim.ini.
integration
Oren Hurvitz 2012-04-23 19:18:28 +03:00 committed by Justin Clark-Casey (justincc)
parent 0da8fe3124
commit 8a65f5a70d
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -351,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID ownerID = ti.OwnerID; UUID ownerID = ti.OwnerID;
//OSSL only may be used if objet is in the same group as the parcel //OSSL only may be used if object is in the same group as the parcel
if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER")) if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER"))
{ {
ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
@ -729,11 +729,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// For safety, we add another permission check here, and don't rely only on the standard OSSL permissions
if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
{ {
MainConsole.Instance.RunCommand(command); MainConsole.Instance.RunCommand(command);
return true; return true;
} }
return false; return false;
} }
@ -2825,21 +2827,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID)) World.ForEachRootScenePresence(delegate(ScenePresence sp)
{ {
World.ForEachRootScenePresence(delegate(ScenePresence sp) if (sp.Firstname == FirstName && sp.Lastname == SurName)
{ {
if (sp.Firstname == FirstName && sp.Lastname == SurName) // kick client...
{ if (alert != null)
// kick client... sp.ControllingClient.Kick(alert);
if (alert != null)
sp.ControllingClient.Kick(alert);
// ...and close on our side // ...and close on our side
sp.Scene.IncomingCloseAgent(sp.UUID); sp.Scene.IncomingCloseAgent(sp.UUID);
} }
}); });
}
} }
public void osCauseDamage(string avatar, double damage) public void osCauseDamage(string avatar, double damage)