* Add line to log notifying of inventory -> user grid server trust failure

* add code comments

2 files changed, 36 insertions, 4 deletions

diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 3c79844..1ed349f 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -150,7 +150,9 @@ namespace OpenSim.Framework.Servers
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
         private CheckIdentityMethod m_smethod;
 
-        public RestDeserialiseSecureHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, CheckIdentityMethod smethod)
+        public RestDeserialiseSecureHandler(
+             string httpMethod, string path, 
+             RestDeserialiseMethod<TRequest, TResponse> method, CheckIdentityMethod smethod)
             : base(httpMethod, path)
         {
             m_smethod = smethod;
@@ -186,7 +188,18 @@ namespace OpenSim.Framework.Servers
     public class RestDeserialiseTrustedHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
         where TRequest : new()
     {
+        /// <summary>
+        /// The operation to perform once trust has been established.
+        /// </summary>
+        /// <param name="httpMethod"></param>
+        /// <param name="path"></param>
+        /// <param name="method"></param>
+        /// <param name="tmethod"></param>
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
+            
+        /// <summary>
+        /// The method used to check whether a request is trusted.
+        /// </summary>
         private CheckTrustedSourceMethod m_tmethod;
 
         public RestDeserialiseTrustedHandler(string httpMethod, string path, RestDeserialiseMethod<TRequest, TResponse> method, CheckTrustedSourceMethod tmethod)
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 46841c3..643cf4d 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -66,11 +66,16 @@ namespace OpenSim.Grid.InventoryServer
             m_userserver_url = userserver_url;
         }
 
+        /// <summary>
+        /// Check that the source of an inventory request is one that we trust.
+        /// </summary>
+        /// <param name="peer"></param>
+        /// <returns></returns>
         public bool CheckTrustSource(IPEndPoint peer)
         {
             if (m_doLookup)
             {
-                m_log.InfoFormat("[GRID AGENT INVENTORY]: checking trusted source {0}", peer.ToString());
+                m_log.InfoFormat("[GRID AGENT INVENTORY]: Checking trusted source {0}", peer);
                 UriBuilder ub = new UriBuilder(m_userserver_url);
                 IPAddress[] uaddrs = Dns.GetHostAddresses(ub.Host);
                 foreach (IPAddress uaddr in uaddrs)
@@ -79,7 +84,12 @@ namespace OpenSim.Grid.InventoryServer
                     {
                         return true;
                     }
-                }
+                }                
+                
+                m_log.WarnFormat(
+                    "[GRID AGENT INVENTORY]: Rejecting request since source {0} was not in the list of trusted sources", 
+                    peer);    
+                
                 return false;
             }
             else
@@ -88,11 +98,19 @@ namespace OpenSim.Grid.InventoryServer
             }
         }
 
+        /// <summary>
+        /// Check that the source of an inventory request for a particular agent is a current session belonging to
+        /// that agent.
+        /// </summary>
+        /// <param name="session_id"></param>
+        /// <param name="avatar_id"></param>
+        /// <returns></returns>
         public bool CheckAuthSession(string session_id, string avatar_id)
         {
             if (m_doLookup)
             {
                 m_log.InfoFormat("[GRID AGENT INVENTORY]: checking authed session {0} {1}", session_id, avatar_id);
+                
                 if (m_session_cache.getCachedSession(session_id, avatar_id) == null)
                 {
                     // cache miss, ask userserver
@@ -119,7 +137,8 @@ namespace OpenSim.Grid.InventoryServer
                     m_log.Info("[GRID AGENT INVENTORY]: got authed session from cache");
                     return true;
                 }
-                m_log.Info("[GRID AGENT INVENTORY]: unknown session_id, request rejected");
+                
+                m_log.Warn("[GRID AGENT INVENTORY]: unknown session_id, request rejected");
                 return false;
             }
             else