fix previous media interact serverside checking. perform very basic serverside url whitelist checks

at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work

1 files changed, 25 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 3a690af..7f6f851 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
 
-            List<string> modules=new List<string>(permissionModules.Split(','));
+            List<string> modules = new List<string>(permissionModules.Split(','));
 
             if (!modules.Contains("DefaultPermissionsModule"))
                 return;
@@ -399,6 +399,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 m_log.Warn("[PERMISSIONS]: Groups module not found, group permissions will not work");        
             
             m_moapModule = m_scene.RequestModuleInterface<IMoapModule>();
+            
+            // This log line will be commented out when no longer required for debugging
+            if (m_moapModule == null)
+                m_log.Warn("[PERMISSIONS]: Media on a prim module not found, media on a prim permissions will not work");                    
         }
 
         public void Close()
@@ -1901,7 +1905,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         }
         
         private bool CanControlPrimMedia(UUID agentID, UUID primID, int face)
-        {
+        {            
+//            m_log.DebugFormat(
+//                "[PERMISSONS]: Performing CanControlPrimMedia check with agentID {0}, primID {1}, face {2}",
+//                agentID, primID, face);
+            
             if (null == m_moapModule)
                 return false;
             
@@ -1909,17 +1917,25 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (null == part)
                 return false;
             
-            MediaEntry me = m_moapModule.GetMediaEntry(part, face);
+            MediaEntry me = m_moapModule.GetMediaEntry(part, face);                                  
             
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
             
+            m_log.DebugFormat(
+                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", 
+                agentID, primID, face, me.ControlPermissions);
+            
             return GenericPrimMediaPermission(part, agentID, me.ControlPermissions);
         }  
         
         private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face)
         {
+//            m_log.DebugFormat(
+//                "[PERMISSONS]: Performing CanInteractWithPrimMedia check with agentID {0}, primID {1}, face {2}",
+//                agentID, primID, face);
+            
             if (null == m_moapModule)
                 return false;
             
@@ -1933,13 +1949,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (null == me)
                 return true;
             
+            m_log.DebugFormat(
+                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", 
+                agentID, primID, face, me.InteractPermissions);            
+            
             return GenericPrimMediaPermission(part, agentID, me.InteractPermissions);
         }          
         
         private bool GenericPrimMediaPermission(SceneObjectPart part, UUID agentID, MediaPermission perms)
         {
-            if (IsAdministrator(agentID))
-                return true;            
+//            if (IsAdministrator(agentID))
+//                return true;            
             
             if ((perms & MediaPermission.Anyone) == MediaPermission.Anyone)
                 return true;