Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

5 files changed, 226 insertions, 6 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index aeba35f..a6f4e47 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -126,11 +126,10 @@ namespace OpenSim.Server.Base
                     m_Config = new IniConfigSource(iniFile);
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                System.Console.WriteLine("Error reading from config source {0}",
-                        iniFile);
-                Thread.CurrentThread.Abort();
+                System.Console.WriteLine("Error reading from config source.  {0}", e.Message);
+                Environment.Exit(1);
             }
 
             // Merge the configuration from the command line into the
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index df571fa..9b80245 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -26,7 +26,11 @@
  */
 
 using System;
+using System.IO;
 using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
@@ -67,6 +71,129 @@ namespace OpenSim.Server.Handlers.Asset
             server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete));
+
+            MainConsole.Instance.Commands.AddCommand("kfs", false,
+                    "show asset",
+                    "show asset <ID>",
+                    "Show asset information",
+                    HandleShowAsset);
+
+            MainConsole.Instance.Commands.AddCommand("kfs", false,
+                    "delete asset",
+                    "delete asset <ID>",
+                    "Delete asset from database",
+                    HandleDeleteAsset);
+
+            MainConsole.Instance.Commands.AddCommand("kfs", false,
+                    "dump asset",
+                    "dump asset <ID>",
+                    "Dump asset to a file",
+                    "The filename is the same as the ID given.",
+                    HandleDumpAsset);
+        }
+
+        void HandleDeleteAsset(string module, string[] args)
+        {
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output("Syntax: delete asset <ID>");
+                return;
+            }
+
+            AssetBase asset = m_AssetService.Get(args[2]);
+
+            if (asset == null || asset.Data.Length == 0)
+            {
+                MainConsole.Instance.Output("Asset not found");
+                return;
+            }
+
+            m_AssetService.Delete(args[2]);
+
+            //MainConsole.Instance.Output("Asset deleted");
+            // TODO: Implement this
+
+            MainConsole.Instance.Output("Asset deletion not supported by database");
+        }
+
+        void HandleDumpAsset(string module, string[] args)
+        {
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output("Usage is dump asset <ID>");
+                return;
+            }
+
+            UUID assetId;
+            string rawAssetId = args[2];
+
+            if (!UUID.TryParse(rawAssetId, out assetId))
+            {
+                MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
+                return;
+            }
+            
+            AssetBase asset = m_AssetService.Get(assetId.ToString());
+            if (asset == null)
+            {                
+                MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
+                return;                
+            }
+            
+            string fileName = rawAssetId;
+            
+            using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
+            {
+                using (BinaryWriter bw = new BinaryWriter(fs))
+                {
+                    bw.Write(asset.Data);
+                }
+            }   
+            
+            MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName);
+        }
+
+        void HandleShowAsset(string module, string[] args)
+        {
+            if (args.Length < 3)
+            {
+                MainConsole.Instance.Output("Syntax: show asset <ID>");
+                return;
+            }
+
+            AssetBase asset = m_AssetService.Get(args[2]);
+
+            if (asset == null || asset.Data.Length == 0)
+            {
+                MainConsole.Instance.Output("Asset not found");
+                return;
+            }
+
+            int i;
+
+            MainConsole.Instance.OutputFormat("Name: {0}", asset.Name);
+            MainConsole.Instance.OutputFormat("Description: {0}", asset.Description);
+            MainConsole.Instance.OutputFormat("Type: {0} (type number = {1})", (AssetType)asset.Type, asset.Type);
+            MainConsole.Instance.OutputFormat("Content-type: {0}", asset.Metadata.ContentType);
+            MainConsole.Instance.OutputFormat("Size: {0} bytes", asset.Data.Length);
+            MainConsole.Instance.OutputFormat("Temporary: {0}", asset.Temporary ? "yes" : "no");
+            MainConsole.Instance.OutputFormat("Flags: {0}", asset.Metadata.Flags);
+
+            for (i = 0 ; i < 5 ; i++)
+            {
+                int off = i * 16;
+                if (asset.Data.Length <= off)
+                    break;
+                int len = 16;
+                if (asset.Data.Length < off + len)
+                    len = asset.Data.Length - off;
+
+                byte[] line = new byte[len];
+                Array.Copy(asset.Data, off, line, 0, len);
+
+                string text = BitConverter.ToString(line);
+                MainConsole.Instance.Output(String.Format("{0:x4}: {1}", off, text));
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index 645a77f..965a54e 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -37,13 +37,14 @@ using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Server.Handlers.Grid
 {
     public class GridInfoHandlers
     {
         private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+        private IConfigSource m_Config;
         private Hashtable _info = new Hashtable();
 
         /// <summary>
@@ -59,6 +60,7 @@ namespace OpenSim.Server.Handlers.Grid
         /// </remarks>
         public GridInfoHandlers(IConfigSource configSource)
         {
+            m_Config = configSource;
             loadGridInfo(configSource);
         }
 
@@ -142,5 +144,53 @@ namespace OpenSim.Server.Handlers.Grid
 
             return sb.ToString();
         }
+
+        /// <summary>
+        /// Get GridInfo in json format: Used bu the OSSL osGetGrid*
+        /// Adding the SRV_HomeIRI to the kvp returned for use in scripts
+        /// </summary>
+        /// <returns>
+        /// json string
+        /// </returns>
+        /// <param name='request'>
+        /// Request.
+        /// </param>
+        /// <param name='path'>
+        ///  /json_grid_info
+        /// </param>
+        /// <param name='param'>
+        /// Parameter.
+        /// </param>
+        /// <param name='httpRequest'>
+        /// Http request.
+        /// </param>
+        /// <param name='httpResponse'>
+        /// Http response.
+        /// </param>
+        public string JsonGetGridInfoMethod(string request, string path, string param,
+                                            IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            string HomeURI = String.Empty;
+            IConfig cfg = m_Config.Configs["LoginService"];
+
+            if (null != cfg)
+            {
+                HomeURI = cfg.GetString("SRV_HomeURI", HomeURI);
+            }
+
+            OSDMap map = new OSDMap();
+
+            foreach (string k in _info.Keys)
+            {
+                map[k] = OSD.FromString(_info[k].ToString());
+            }
+
+            if (!String.IsNullOrEmpty(HomeURI))
+            {
+                map["home"] = OSD.FromString(HomeURI);
+            }
+
+            return OSDParser.SerializeJsonString(map).ToString();
+        }
     }
 }
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
index 8472d34..f9b5915 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoServerInConnector.cs
@@ -48,6 +48,8 @@ namespace OpenSim.Server.Handlers.Grid
 
             server.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info",
                                                                handlers.RestGetGridInfoMethod));
+            server.AddStreamHandler(new RestStreamHandler("GET", "/json_grid_info",
+                                                          handlers.JsonGetGridInfoMethod));
             server.AddXmlRPCHandler("get_grid_info", handlers.XmlRpcGridInfoMethod);
         }
 
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index 4c0d52e..bf21255 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -88,6 +88,8 @@ namespace OpenSim.Server.Handlers.GridUser
                         return SetPosition(request);
                     case "getgriduserinfo":
                         return GetGridUserInfo(request);
+                    case "getgriduserinfos":
+                        return GetGridUserInfos(request);
                 }
                 m_log.DebugFormat("[GRID USER HANDLER]: unknown method request: {0}", method);
             }
@@ -193,6 +195,46 @@ namespace OpenSim.Server.Handlers.GridUser
 
         }
 
+        byte[] GetGridUserInfos(Dictionary<string, object> request)
+        {
+
+            string[] userIDs;
+
+            if (!request.ContainsKey("AgentIDs"))
+            {
+                m_log.DebugFormat("[GRID USER HANDLER]: GetGridUserInfos called without required uuids argument");
+                return FailureResult();
+            }
+
+            if (!(request["AgentIDs"] is List<string>))
+            {
+                m_log.DebugFormat("[GRID USER HANDLER]: GetGridUserInfos input argument was of unexpected type {0}", request["uuids"].GetType().ToString());
+                return FailureResult();
+            }
+
+            userIDs = ((List<string>)request["AgentIDs"]).ToArray();
+
+            GridUserInfo[] pinfos = m_GridUserService.GetGridUserInfo(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 (GridUserInfo pinfo in pinfos)
+                {
+                    Dictionary<string, object> rinfoDict = pinfo.ToKeyValuePairs();
+                    result["griduser" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
         private bool UnpackArgs(Dictionary<string, object> request, out string user, out UUID region, out Vector3 position, out Vector3 lookAt)
         {
             user = string.Empty;