1 files changed, 18 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
index ec5af2b..5eda8ab 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
@@ -46,24 +46,27 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected XEstateModule m_EstateModule;
+        protected EstateModule m_EstateModule;
         protected Object m_RequestLock = new Object();
+        private string token;
 
-        public EstateRequestHandler(XEstateModule fmodule)
+        public EstateRequestHandler(EstateModule fmodule, string _token)
                 : base("POST", "/estate")
         {
             m_EstateModule = fmodule;
+            token = _token;
         }
 
         protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            StreamReader sr = new StreamReader(requestData);
-            string body = sr.ReadToEnd();
-            sr.Close();
+            string body;
+            using(StreamReader sr = new StreamReader(requestData))
+                body = sr.ReadToEnd();
+
             body = body.Trim();
 
-            m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
+            // m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
 
             try
             {
@@ -75,6 +78,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     if (!request.ContainsKey("METHOD"))
                         return FailureResult();
 
+                    if (!request.ContainsKey("TOKEN"))
+                        return FailureResult();
+
+                    string reqToken = request["TOKEN"].ToString();
+                    request.Remove("TOKEN");
+
+                    if(token != reqToken)
+                        return FailureResult();
+
                     string method = request["METHOD"].ToString();
                     request.Remove("METHOD");