5 files changed, 565 insertions, 74 deletions

diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index 490a13a..47bc860 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -86,14 +86,14 @@ namespace OpenSim.Server.Handlers.Authentication
 
         private byte[] DoPlainMethods(string body)
         {
-            Dictionary<string, string> request =
+            Dictionary<string, object> request =
                     ServerUtils.ParseQueryString(body);
 
             int lifetime = 30;
 
             if (request.ContainsKey("LIFETIME"))
             {
-                lifetime = Convert.ToInt32(request["LIFETIME"]);
+                lifetime = Convert.ToInt32(request["LIFETIME"].ToString());
                 if (lifetime > 30)
                     lifetime = 30;
             }
@@ -103,12 +103,12 @@ namespace OpenSim.Server.Handlers.Authentication
             if (!request.ContainsKey("PRINCIPAL"))
                 return FailureResult();
 
-            string method = request["METHOD"];
+            string method = request["METHOD"].ToString();
 
             UUID principalID;
             string token;
 
-            if (!UUID.TryParse(request["PRINCIPAL"], out principalID))
+            if (!UUID.TryParse(request["PRINCIPAL"].ToString(), out principalID))
                 return FailureResult();
 
             switch (method)
@@ -117,7 +117,7 @@ namespace OpenSim.Server.Handlers.Authentication
                 if (!request.ContainsKey("PASSWORD"))
                     return FailureResult();
                 
-                token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"], lifetime);
+                token = m_AuthenticationService.Authenticate(principalID, request["PASSWORD"].ToString(), lifetime);
 
                 if (token != String.Empty)
                     return SuccessResult(token);
@@ -126,7 +126,7 @@ namespace OpenSim.Server.Handlers.Authentication
                 if (!request.ContainsKey("TOKEN"))
                     return FailureResult();
                 
-                if (m_AuthenticationService.Verify(principalID, request["TOKEN"], lifetime))
+                if (m_AuthenticationService.Verify(principalID, request["TOKEN"].ToString(), lifetime))
                     return SuccessResult();
 
                 return FailureResult();
@@ -134,7 +134,7 @@ namespace OpenSim.Server.Handlers.Authentication
                 if (!request.ContainsKey("TOKEN"))
                     return FailureResult();
 
-                if (m_AuthenticationService.Release(principalID, request["TOKEN"]))
+                if (m_AuthenticationService.Release(principalID, request["TOKEN"].ToString()))
                     return SuccessResult();
 
                 return FailureResult();
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 433ed0b..d99b791 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -69,13 +69,13 @@ namespace OpenSim.Server.Handlers.Grid
 
             try
             {
-                Dictionary<string, string> request =
+                Dictionary<string, object> request =
                         ServerUtils.ParseQueryString(body);
 
                 if (!request.ContainsKey("METHOD"))
                     return FailureResult();
 
-                string method = request["METHOD"];
+                string method = request["METHOD"].ToString();
 
                 switch (method)
                 {
@@ -117,22 +117,22 @@ namespace OpenSim.Server.Handlers.Grid
 
         #region Method-specific handlers
 
-        byte[] Register(Dictionary<string, string> request)
+        byte[] Register(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;
             if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region");
 
             int versionNumberMin = 0, versionNumberMax = 0;
             if (request.ContainsKey("VERSIONMIN"))
-                Int32.TryParse(request["VERSIONMIN"], out versionNumberMin);
+                Int32.TryParse(request["VERSIONMIN"].ToString(), out versionNumberMin);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no minimum protocol version in request to register region");
 
             if (request.ContainsKey("VERSIONMAX"))
-                Int32.TryParse(request["VERSIONMAX"], out versionNumberMax);
+                Int32.TryParse(request["VERSIONMAX"].ToString(), out versionNumberMax);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
 
@@ -147,8 +147,8 @@ namespace OpenSim.Server.Handlers.Grid
             GridRegion rinfo = null;
             try
             {
-                foreach (KeyValuePair<string, string> kvp in request)
-                    rinfoData[kvp.Key] = kvp.Value;
+                foreach (KeyValuePair<string, object> kvp in request)
+                    rinfoData[kvp.Key] = kvp.Value.ToString();
                 rinfo = new GridRegion(rinfoData);
             }
             catch (Exception e)
@@ -166,11 +166,11 @@ namespace OpenSim.Server.Handlers.Grid
                 return FailureResult();
         }
 
-        byte[] Deregister(Dictionary<string, string> request)
+        byte[] Deregister(Dictionary<string, object> request)
         {
             UUID regionID = UUID.Zero;
-            if (request["REGIONID"] != null)
-                UUID.TryParse(request["REGIONID"], out regionID);
+            if (request.ContainsKey("REGIONID"))
+                UUID.TryParse(request["REGIONID"].ToString(), out regionID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no regionID in request to deregister region");
 
@@ -183,17 +183,17 @@ namespace OpenSim.Server.Handlers.Grid
 
         }
 
-        byte[] GetNeighbours(Dictionary<string, string> request)
+        byte[] GetNeighbours(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
 
             UUID regionID = UUID.Zero;
-            if (request["REGIONID"] != null)
-                UUID.TryParse(request["REGIONID"], out regionID);
+            if (request.ContainsKey("REGIONID"))
+                UUID.TryParse(request["REGIONID"].ToString(), out regionID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
 
@@ -221,17 +221,17 @@ namespace OpenSim.Server.Handlers.Grid
 
         }
 
-        byte[] GetRegionByUUID(Dictionary<string, string> request)
+        byte[] GetRegionByUUID(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
 
             UUID regionID = UUID.Zero;
-            if (request["REGIONID"] != null)
-                UUID.TryParse(request["REGIONID"], out regionID);
+            if (request.ContainsKey("REGIONID"))
+                UUID.TryParse(request["REGIONID"].ToString(), out regionID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
 
@@ -250,21 +250,21 @@ namespace OpenSim.Server.Handlers.Grid
             return encoding.GetBytes(xmlString);
         }
 
-        byte[] GetRegionByPosition(Dictionary<string, string> request)
+        byte[] GetRegionByPosition(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by position");
 
             int x = 0, y = 0;
-            if (request["X"] != null)
-                Int32.TryParse(request["X"], out x);
+            if (request.ContainsKey("X"))
+                Int32.TryParse(request["X"].ToString(), out x);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no X in request to get region by position");
-            if (request["Y"] != null)
-                Int32.TryParse(request["Y"], out y);
+            if (request.ContainsKey("Y"))
+                Int32.TryParse(request["Y"].ToString(), out y);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no Y in request to get region by position");
 
@@ -283,17 +283,17 @@ namespace OpenSim.Server.Handlers.Grid
             return encoding.GetBytes(xmlString);
         }
 
-        byte[] GetRegionByName(Dictionary<string, string> request)
+        byte[] GetRegionByName(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region by name");
 
             string regionName = string.Empty;
-            if (request["NAME"] != null)
-                regionName = request["NAME"];
+            if (request.ContainsKey("NAME"))
+                regionName = request["NAME"].ToString();
             else
                 m_log.WarnFormat("[GRID HANDLER]: no name in request to get region by name");
 
@@ -312,23 +312,23 @@ namespace OpenSim.Server.Handlers.Grid
             return encoding.GetBytes(xmlString);
         }
 
-        byte[] GetRegionsByName(Dictionary<string, string> request)
+        byte[] GetRegionsByName(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;
-            if (request["SCOPEID"] != null)
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get regions by name");
 
             string regionName = string.Empty;
-            if (request["NAME"] != null)
-                regionName = request["NAME"];
+            if (request.ContainsKey("NAME"))
+                regionName = request["NAME"].ToString();
             else
                 m_log.WarnFormat("[GRID HANDLER]: no NAME in request to get regions by name");
 
             int max = 0;
-            if (request["MAX"] != null)
-                Int32.TryParse(request["MAX"], out max);
+            if (request.ContainsKey("MAX"))
+                Int32.TryParse(request["MAX"].ToString(), out max);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no MAX in request to get regions by name");
 
@@ -355,30 +355,30 @@ namespace OpenSim.Server.Handlers.Grid
             return encoding.GetBytes(xmlString);
         }
 
-        byte[] GetRegionRange(Dictionary<string, string> request)
+        byte[] GetRegionRange(Dictionary<string, object> request)
         {
             //m_log.DebugFormat("[GRID HANDLER]: GetRegionRange");
             UUID scopeID = UUID.Zero;
             if (request.ContainsKey("SCOPEID"))
-                UUID.TryParse(request["SCOPEID"], out scopeID);
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region range");
 
             int xmin = 0, xmax = 0, ymin = 0, ymax = 0;
             if (request.ContainsKey("XMIN"))
-                Int32.TryParse(request["XMIN"], out xmin);
+                Int32.TryParse(request["XMIN"].ToString(), out xmin);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no XMIN in request to get region range");
             if (request.ContainsKey("XMAX"))
-                Int32.TryParse(request["XMAX"], out xmax);
+                Int32.TryParse(request["XMAX"].ToString(), out xmax);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no XMAX in request to get region range");
             if (request.ContainsKey("YMIN"))
-                Int32.TryParse(request["YMIN"], out ymin);
+                Int32.TryParse(request["YMIN"].ToString(), out ymin);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no YMIN in request to get region range");
             if (request.ContainsKey("YMAX"))
-                Int32.TryParse(request["YMAX"], out ymax);
+                Int32.TryParse(request["YMAX"].ToString(), out ymax);
             else
                 m_log.WarnFormat("[GRID HANDLER]: no YMAX in request to get region range");
 
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 2558fa0..11adc4a 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -68,18 +68,30 @@ namespace OpenSim.Server.Handlers.Presence
 
             try
             {
-                Dictionary<string, string> request =
+                Dictionary<string, object> request =
                         ServerUtils.ParseQueryString(body);
 
                 if (!request.ContainsKey("METHOD"))
                     return FailureResult();
 
-                string method = request["METHOD"];
+                string method = request["METHOD"].ToString();
 
                 switch (method)
                 {
+                    case "login":
+                        return LoginAgent(request);
+                    case "logout":
+                        return LogoutAgent(request);
+                    case "logoutregion":
+                        return LogoutRegionAgents(request);
                     case "report":
                         return Report(request);
+                    case "getagent":
+                        return GetAgent(request);
+                    case "getagents":
+                        return GetAgents(request);
+                    case "sethome":
+                        return SetHome(request);
                 }
                 m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
             }
@@ -92,38 +104,153 @@ namespace OpenSim.Server.Handlers.Presence
 
         }
 
-        byte[] Report(Dictionary<string, string> request)
+        byte[] LoginAgent(Dictionary<string, object> request)
         {
-            PresenceInfo info = new PresenceInfo();
-            info.Data = new Dictionary<string, string>();
+            string user = String.Empty;
+            UUID session = UUID.Zero;
+            UUID ssession = UUID.Zero;
 
-            if (request["PrincipalID"] == null || request["RegionID"] == null)
+            if (!request.ContainsKey("UserID") || !request.ContainsKey("SessionID"))
                 return FailureResult();
 
-            if (!UUID.TryParse(request["PrincipalID"].ToString(),
-                    out info.PrincipalID))
+            user = request["UserID"].ToString();
+
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
                 return FailureResult();
 
-            if (!UUID.TryParse(request["RegionID"].ToString(),
-                    out info.RegionID))
+            if (request.ContainsKey("SecureSessionID"))
+                // If it's malformed, we go on with a Zero on it
+                UUID.TryParse(request["SecureSessionID"].ToString(), out ssession);
+
+            if (m_PresenceService.LoginAgent(user, session, ssession))
+                return SuccessResult();
+
+            return FailureResult();
+        }
+
+        byte[] LogoutAgent(Dictionary<string, object> request)
+        {
+            UUID session = UUID.Zero;
+
+            if (!request.ContainsKey("SessionID"))
                 return FailureResult();
 
-            foreach (KeyValuePair<string, string> kvp in request)
-            {
-                if (kvp.Key == "METHOD" ||
-                        kvp.Key == "PrincipalID" ||
-                        kvp.Key == "RegionID")
-                    continue;
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
+                return FailureResult();
 
-                info.Data[kvp.Key] = kvp.Value;
-            }
+            if (m_PresenceService.LogoutAgent(session))
+                return SuccessResult();
+
+            return FailureResult();
+        }
+
+        byte[] LogoutRegionAgents(Dictionary<string, object> request)
+        {
+            UUID region = UUID.Zero;
+
+            if (!request.ContainsKey("RegionID"))
+                return FailureResult();
 
-            if (m_PresenceService.Report(info))
+            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
+                return FailureResult();
+
+            if (m_PresenceService.LogoutRegionAgents(region))
                 return SuccessResult();
 
             return FailureResult();
         }
+        
+        byte[] Report(Dictionary<string, object> request)
+        {
+            UUID session = UUID.Zero;
+            UUID region = UUID.Zero;
+            Vector3 position = new Vector3(128, 128, 70);
+            Vector3 look = Vector3.Zero;
+
+            if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID"))
+                return FailureResult();
+
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
+                return FailureResult();
+
+            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
+                return FailureResult();
+
+            if (request.ContainsKey("position"))
+                Vector3.TryParse(request["position"].ToString(), out position);
+
+            if (request.ContainsKey("lookAt"))
+                Vector3.TryParse(request["lookAt"].ToString(), out look);
+            
+            if (m_PresenceService.ReportAgent(session, region, position, look))
+                return SuccessResult();
+
+            return FailureResult();
+        }
+
+        byte[] GetAgent(Dictionary<string, object> request)
+        {
+            UUID session = UUID.Zero;
+
+            if (!request.ContainsKey("SessionID"))
+                return FailureResult();
 
+            if (!UUID.TryParse(request["SessionID"].ToString(), out session))
+                return FailureResult();
+
+            PresenceInfo pinfo = m_PresenceService.GetAgent(session);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if (pinfo == null)
+                result["result"] = "null";
+            else
+                result["result"] = pinfo.ToKeyValuePairs();
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        byte[] GetAgents(Dictionary<string, object> request)
+        {
+
+            string[] userIDs;
+
+            if (!request.ContainsKey("uuids"))
+                return FailureResult();
+
+            if (!(request["uuids"] is List<string>))
+            {
+                m_log.DebugFormat("[PRESENCE HANDLER]: GetAgents input argument was of unexpected type {0}", request["uuids"].GetType().ToString());
+                return FailureResult();
+            }
+
+            userIDs = ((List<string>)request["uuids"]).ToArray();
+
+            PresenceInfo[] pinfos = m_PresenceService.GetAgents(userIDs);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((pinfos == null) || ((pinfos != null) && (pinfos.Length == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (PresenceInfo pinfo in pinfos)
+                {
+                    Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs();
+                    result["presence" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        
         private byte[] SuccessResult()
         {
             XmlDocument doc = new XmlDocument();
@@ -138,7 +265,7 @@ namespace OpenSim.Server.Handlers.Presence
 
             doc.AppendChild(rootElement);
 
-            XmlElement result = doc.CreateElement("", "Result", "");
+            XmlElement result = doc.CreateElement("", "result", "");
             result.AppendChild(doc.CreateTextNode("Success"));
 
             rootElement.AppendChild(result);
@@ -160,7 +287,7 @@ namespace OpenSim.Server.Handlers.Presence
 
             doc.AppendChild(rootElement);
 
-            XmlElement result = doc.CreateElement("", "Result", "");
+            XmlElement result = doc.CreateElement("", "result", "");
             result.AppendChild(doc.CreateTextNode("Failure"));
 
             rootElement.AppendChild(result);
@@ -178,5 +305,32 @@ namespace OpenSim.Server.Handlers.Presence
 
             return ms.ToArray();
         }
+
+        byte[] SetHome(Dictionary<string, object> request)
+        {
+            UUID region = UUID.Zero;
+            Vector3 position = new Vector3(128, 128, 70);
+            Vector3 look = Vector3.Zero;
+
+            if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID"))
+                return FailureResult();
+
+            string user = request["UserID"].ToString();
+
+            if (!UUID.TryParse(request["RegionID"].ToString(), out region))
+                return FailureResult();
+
+            if (request.ContainsKey("position"))
+                Vector3.TryParse(request["position"].ToString(), out position);
+
+            if (request.ContainsKey("lookAt"))
+                Vector3.TryParse(request["lookAt"].ToString(), out look);
+            
+            if (m_PresenceService.SetHomeLocation(user, region, position, look))
+                return SuccessResult();
+
+            return FailureResult();
+        }
+
     }
 }
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
new file mode 100644
index 0000000..f17a8de
--- /dev/null
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+
+namespace OpenSim.Server.Handlers.UserAccounts
+{
+    public class UserAccountServiceConnector : ServiceConnector
+    {
+        private IUserAccountService m_UserAccountService;
+        private string m_ConfigName = "UserAccountService";
+
+        public UserAccountServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
+
+            string service = serverConfig.GetString("LocalServiceModule",
+                    String.Empty);
+
+            if (service == String.Empty)
+                throw new Exception("No LocalServiceModule in config file");
+
+            Object[] args = new Object[] { config };
+            m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(service, args);
+
+            server.AddStreamHandler(new UserAccountServerPostHandler(m_UserAccountService));
+        }
+    }
+}
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
new file mode 100644
index 0000000..a92148c
--- /dev/null
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using Nini.Config;
+using log4net;
+using System;
+using System.Reflection;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Serialization;
+using System.Collections.Generic;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+
+namespace OpenSim.Server.Handlers.UserAccounts
+{
+    public class UserAccountServerPostHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IUserAccountService m_UserAccountService;
+
+        public UserAccountServerPostHandler(IUserAccountService service) :
+                base("POST", "/accounts")
+        {
+            m_UserAccountService = service;
+        }
+
+        public override byte[] Handle(string path, Stream requestData,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
+            body = body.Trim();
+
+            // We need to check the authorization header
+            //httpRequest.Headers["authorization"] ...
+
+            //m_log.DebugFormat("[XXX]: query String: {0}", body);
+
+            try
+            {
+                Dictionary<string, object> request =
+                        ServerUtils.ParseQueryString(body);
+
+                if (!request.ContainsKey("METHOD"))
+                    return FailureResult();
+
+                string method = request["METHOD"].ToString();
+
+                switch (method)
+                {
+                    case "getaccount":
+                        return GetAccount(request);
+                    case "getaccounts":
+                        return GetAccounts(request);
+                    case "createaccount":
+                        return CreateAccount(request);
+                    case "setaccount":
+                        return SetAccount(request);
+                }
+                m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[PRESENCE HANDLER]: Exception {0}" + e);
+            }
+
+            return FailureResult();
+
+        }
+
+        byte[] GetAccount(Dictionary<string, object> request)
+        {
+            UserAccount account = null;
+            UUID scopeID = UUID.Zero;
+            Dictionary<string, object> result = new Dictionary<string, object>();
+
+            if (!request.ContainsKey("ScopeID"))
+            {
+                result["result"] = "null";
+                return ResultToBytes(result);
+            }
+
+            if (!UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
+            {
+                result["result"] = "null";
+                return ResultToBytes(result);
+            }
+
+            if (request.ContainsKey("UserID") && request["UserID"] != null)
+            {
+                UUID userID;
+                if (UUID.TryParse(request["UserID"].ToString(), out userID))
+                    account = m_UserAccountService.GetUserAccount(scopeID, userID);
+            }
+
+            else if (request.ContainsKey("Email") && request["Email"] != null)
+                account = m_UserAccountService.GetUserAccount(scopeID, request["Email"].ToString());
+
+            else if (request.ContainsKey("FirstName") && request.ContainsKey("LastName") &&
+                request["FirstName"] != null && request["LastName"] != null)
+                account = m_UserAccountService.GetUserAccount(scopeID, request["FirstName"].ToString(), request["LastName"].ToString());
+
+            if (account == null)
+                result["result"] = "null";
+            else
+                result["result"] = account.ToKeyValuePairs();
+
+            return ResultToBytes(result);
+        }
+
+        byte[] GetAccounts(Dictionary<string, object> request)
+        {
+            if (!request.ContainsKey("ScopeID") || !request.ContainsKey("query"))
+                return FailureResult();
+
+            UUID scopeID = UUID.Zero;
+            if (!UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
+                return FailureResult();
+
+            string query = request["query"].ToString();
+
+            List<UserAccount> accounts = m_UserAccountService.GetUserAccounts(scopeID, query);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((accounts == null) || ((accounts != null) && (accounts.Count == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (UserAccount acc in accounts)
+                {
+                    Dictionary<string, object> rinfoDict = acc.ToKeyValuePairs();
+                    result["account" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+        byte[] CreateAccount(Dictionary<string, object> request)
+        {
+            if (!request.ContainsKey("account"))
+                return FailureResult();
+            if (request["account"] == null)
+                return FailureResult();
+            if (!(request["account"] is Dictionary<string, object>))
+                return FailureResult();
+
+            UserAccount account = new UserAccount((Dictionary<string, object>) request["account"]);
+
+            if (m_UserAccountService.CreateUserAccount(account))
+                return SuccessResult();
+
+            return FailureResult();
+        }
+
+        byte[] SetAccount(Dictionary<string, object> request)
+        {
+            if (!request.ContainsKey("account"))
+                return FailureResult();
+            if (request["account"] == null)
+                return FailureResult();
+            if (!(request["account"] is Dictionary<string, object>))
+                return FailureResult();
+
+            UserAccount account = new UserAccount((Dictionary<string, object>)request["account"]);
+
+            if (m_UserAccountService.SetUserAccount(account))
+                return SuccessResult();
+
+            return FailureResult();
+        }
+
+        private byte[] SuccessResult()
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "result", "");
+            result.AppendChild(doc.CreateTextNode("Success"));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] FailureResult()
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "result", "");
+            result.AppendChild(doc.CreateTextNode("Failure"));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] DocToBytes(XmlDocument doc)
+        {
+            MemoryStream ms = new MemoryStream();
+            XmlTextWriter xw = new XmlTextWriter(ms, null);
+            xw.Formatting = Formatting.Indented;
+            doc.WriteTo(xw);
+            xw.Flush();
+
+            return ms.ToArray();
+        }
+
+        private byte[] ResultToBytes(Dictionary<string, object> result)
+        {
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
+
+    }
+}