add OSSL option PermissionErrortoOwner (true or false). if true ossl functions permission errors will only be sent to prim owner, defaul false: send all around

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

@@ -146,6 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected ISoundModule m_SoundModule = null;
         internal IConfig m_osslconfig;
         internal TimeZoneInfo PSTTimeZone = null;
+        internal bool m_PermissionErrortoOwner = false;
 
         public void Initialize(
             IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item)
@@ -167,10 +168,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED");
             }
 
-            m_ScriptDelayFactor =
+            m_PermissionErrortoOwner = m_osslconfig.GetBoolean("PermissionErrorToOwner", m_PermissionErrortoOwner);
-                    m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
+
-            m_ScriptDistanceFactor =
+            m_ScriptDelayFactor =  m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f);
-                    m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f);
+            m_ScriptDistanceFactor = m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f);
 
             string risk = m_osslconfig.GetString("OSFunctionThreatLevel", "VeryLow");
             switch (risk)
@@ -286,7 +287,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             if (!m_OSFunctionsEnabled)
-                OSSLError("permission denied.  All OS functions are disabled."); // throws
+                OSSLError("permission denied. All unsafe OSSL funtions disabled"); // throws
         }
 
         // Returns if the function is allowed. Throws a script exception if not allowed.
@@ -294,15 +295,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             if (!m_OSFunctionsEnabled)
-                OSSLError(String.Format("{0} permission denied.  All OS functions are disabled.", function)); // throws
+            {
+                if (m_PermissionErrortoOwner)
+                    throw new ScriptException("(OWNER)OSSL Permission Error: All unsafe OSSL funtions disabled");
+                else
+                    throw new ScriptException("OSSL Permission Error: All unsafe OSSL funtions disabled");
+            }
 
             string reasonWhyNot = CheckThreatLevelTest(level, function);
             if (!String.IsNullOrEmpty(reasonWhyNot))
             {
-                OSSLError(reasonWhyNot);
+                if (m_PermissionErrortoOwner)
+                    throw new ScriptException("(OWNER)OSSL Permission Error: " + reasonWhyNot);
+                else
+                    throw new ScriptException("OSSL Permission Error: " + reasonWhyNot);
             }
         }
-
             // Check to see if function is allowed. Returns an empty string if function permitted
             //     or a string explaining why this function can't be used.
         private string CheckThreatLevelTest(ThreatLevel level, string function)
@@ -386,16 +394,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 // Allow / disallow by threat level
                 if (level > m_MaxThreatLevel)
-                    return
+                    return String.Empty;
-                        String.Format(
+                return String.Format(
                             "{0} permission denied.  Allowed threat level is {1} but function threat level is {2}.",
                             function, m_MaxThreatLevel, level);
             }
-            else
+
-            {
+            if(m_FunctionPerms[function].AllowedOwners.Count == 0 && m_FunctionPerms[function].AllowedCreators.Count == 0)
-                if (!m_FunctionPerms[function].AllowedOwners.Contains(UUID.Zero))
+                return String.Format("{0} disabled in region configuration", function);
-                {
+
-                    // Not anyone. Do detailed checks
+            if (m_FunctionPerms[function].AllowedOwners.Contains(UUID.Zero)) // always allowed
+                return String.Empty;
+
             if (m_FunctionPerms[function].AllowedOwners.Contains(m_host.OwnerID))
             {
                 // prim owner is in the list of allowed owners
@@ -404,17 +414,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             UUID ownerID = m_item.OwnerID;
 
-                    //OSSL only may be used if object is in the same group as the parcel
-                    if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER"))
-                    {
-                        ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
-
-                        if (land.LandData.GroupID == m_item.GroupID && land.LandData.GroupID != UUID.Zero)
-                        {
-                            return String.Empty;
-                        }
-                    }
-
             //Only Parcelowners may use the function
             if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_OWNER"))
             {
@@ -426,6 +425,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
+            //OSSL only may be used if object is in the same group as the parcel
+            if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("PARCEL_GROUP_MEMBER"))
+            {
+                ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition);
+
+                if (land.LandData.GroupID == m_item.GroupID && land.LandData.GroupID != UUID.Zero)
+                {
+                    return String.Empty;
+                }
+            }
+
             //Only Estate Managers may use the function
             if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("ESTATE_MANAGER"))
             {
@@ -445,7 +455,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-
             //Only grid gods may use the function
             if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD"))
             {
@@ -482,11 +491,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (m_item.CreatorID != ownerID)
             {
                 if ((m_item.CurrentPermissions & (uint)PermissionMask.Modify) != 0)
-                            return String.Format("{0} permission denied. Script permissions error.", function);
+                    return String.Format("{0} permission denied. Script creator is not prim owner.", function);
 
             }
-                }
+
-            }
             return String.Empty;
         }
 

OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

@@ -928,16 +928,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                         {
                             try
                             {
-
                                 if(e.InnerException != null && e.InnerException is ScriptException)
                                 {
-                                    string text = e.InnerException.Message +
+                                    bool toowner = false;
-                                                "(script: " + ScriptName +
+                                    string text = e.InnerException.Message;
+                                    if(text.StartsWith("(OWNER)"))
+                                    {
+                                        text = text.Substring(7);
+                                        toowner = true;
+                                    }
+                                    text +=     "(script: " + ScriptName +
                                                 " event: " + data.EventName +
                                                 " primID:" + Part.UUID.ToString() +
                                                 " at " + Part.AbsolutePosition + ")";
                                     if (text.Length > 1000)
                                         text = text.Substring(0, 1000);
+                                    if (toowner)
+                                    {
+                                        ScenePresence sp = Engine.World.GetScenePresence(Part.OwnerID);
+                                        if (sp != null && !sp.IsNPC)
+                                            Engine.World.SimChatToAgent(Part.OwnerID, Utils.StringToBytes(text), 0x7FFFFFFF, Part.AbsolutePosition,
+                                                                                   Part.Name, Part.UUID, false);
+                                    }
+                                    else
                                         Engine.World.SimChat(Utils.StringToBytes(text),
                                                            ChatTypeEnum.DebugChannel, 2147483647,
                                                            Part.AbsolutePosition,

OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs

@@ -539,10 +539,18 @@ namespace OpenSim.Region.ScriptEngine.Yengine
         private void SendScriptErrorMessage(Exception e, ScriptEventCode ev)
         {
             StringBuilder msg = new StringBuilder();
-
+            bool toowner = false;
             msg.Append("YEngine: ");
             if (e.Message != null)
-                msg.Append(e.Message);
+            {
+                string text = e.Message;
+                if (text.StartsWith("(OWNER)"))
+                {
+                    text = text.Substring(7);
+                    toowner = true;
+                }
+                msg.Append(text);
+            }
 
             msg.Append(" (script: ");
             msg.Append(m_Item.Name);
@@ -563,8 +571,16 @@ namespace OpenSim.Region.ScriptEngine.Yengine
             if (msgst.Length > 1000)
                 msgst = msgst.Substring(0, 1000);
 
+            if (toowner)
+            {
+                ScenePresence sp = m_Engine.World.GetScenePresence(m_Part.OwnerID);
+                if (sp != null && !sp.IsNPC)
+                    m_Engine.World.SimChatToAgent(m_Part.OwnerID, Utils.StringToBytes(msgst), 0x7FFFFFFF, m_Part.AbsolutePosition,
+                                                           m_Part.Name, m_Part.UUID, false);
+            }
+            else
                 m_Engine.World.SimChat(Utils.StringToBytes(msgst),
-                                                           ChatTypeEnum.DebugChannel, 2147483647,
+                                                           ChatTypeEnum.DebugChannel, 0x7FFFFFFF,
                                                            m_Part.AbsolutePosition,
                                                            m_Part.Name, m_Part.UUID, false);
             m_log.Debug(string.Format(

bin/config-include/osslEnable.ini

@@ -16,6 +16,9 @@
   ; The setting enable_windlight = true must also be enabled in the [LightShare] section.
   AllowLightShareFunctions = true
 
+  ; Send function permission error to owner if true, to all if false
+  PermissionErrorToOwner = false
+  
   ; Function Threat level
   ; Several functions have a predefined threat level, one of:  None, VeryLow, Low, Moderate, High, VeryHigh, Severe.
   ; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
@@ -64,7 +67,7 @@
   
   ; The threat level also can be replaced by lines of the form
   ; Creators__FunctionName = comma separated list of UUIDs
-  ; this will enable the function for users that are creators and owners of the prim
+  ; this will enable the function for users that are the script creators and owners of the prim
 
 
 ; *************************************************