2 files changed, 276 insertions, 34 deletions

diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
index e8b9fc3..f17a8de 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
@@ -26,51 +26,36 @@
  */
 
 using System;
-using System.Reflection;
 using Nini.Config;
-using OpenSim.Data;
+using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
-using System.Collections.Generic;
-using OpenMetaverse;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.Services.UserAccountService
+namespace OpenSim.Server.Handlers.UserAccounts
 {
-    public class UserAccountService : UserAccountServiceBase, IUserAccountService
+    public class UserAccountServiceConnector : ServiceConnector
     {
-        public UserAccountService(IConfigSource config) : base(config)
-        {
-        }
+        private IUserAccountService m_UserAccountService;
+        private string m_ConfigName = "UserAccountService";
 
-        public UserAccount GetUserAccount(UUID scopeID, string firstName,
-                string lastName)
+        public UserAccountServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            return null;
-        }
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
-        {
-            return null;
-        }
+            string service = serverConfig.GetString("LocalServiceModule",
+                    String.Empty);
 
-        public bool SetHomePosition(UserAccount data, UUID regionID, UUID regionSecret)
-        {
-            return false;
-        }
+            if (service == String.Empty)
+                throw new Exception("No LocalServiceModule in config file");
 
-        public bool SetUserAccount(UserAccount data, UUID principalID, string token)
-        {
-            return false;
-        }
-
-        public bool CreateUserAccount(UserAccount data, UUID principalID, string token)
-        {
-            return false;
-        }
+            Object[] args = new Object[] { config };
+            m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(service, args);
 
-        public List<UserAccount> GetUserAccount(UUID scopeID,
-                string query)
-        {
-            return null;
+            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..544ffea
--- /dev/null
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -0,0 +1,257 @@
+/*
+ * 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 "setaccount":
+                        return StoreAccount(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[] StoreAccount(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.StoreUserAccount(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);
+        }
+
+
+    }
+}