Added REST-handler interface for the http server and changed the Admin Web front end to one.

OpenGridServices.UserServer/OpenGridServices.UserServer.csproj

@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
     <ProjectGuid>{36895293-A627-42EC-BA77-6AF6F5A4A7DF}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenGridServices.UserServer</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>OpenGridServices.UserServer</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,7 +61,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">
@@ -86,9 +93,6 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleCmds.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="Main.cs">
       <SubType>Code</SubType>
     </Compile>

OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build

@@ -11,7 +11,6 @@
             <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ConsoleCmds.cs" />
                 <include name="Main.cs" />
                 <include name="UserHttp.cs" />
                 <include name="Properties/AssemblyInfo.cs" />

OpenSim.RegionServer/CAPS/AdminWebFront.cs

@@ -0,0 +1,164 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+
+namespace OpenSim.CAPS
+{
+    public class AdminWebFront : IRestHandler
+    {
+        private string AdminPage;
+        private string NewAccountForm;
+        private string LoginForm;
+        private string passWord = "Admin";
+
+        public AdminWebFront(string password)
+        {
+            passWord = password;
+            LoadAdminPage();
+        }
+
+        public string HandleREST(string requestBody, string requestURL, string requestMethod)
+        {
+            string responseString = "";
+            try
+            {
+                switch (requestURL)
+                {
+                    case "/Admin":
+                        if (requestMethod == "GET")
+                        {
+                            responseString = AdminPage;
+                        }
+                        break;
+                    case "/Admin/Accounts":
+                        if (requestMethod == "GET")
+                        {
+                            responseString = "<p> Account management </p>";
+                            responseString += "<br> ";
+                            responseString += "<p> Create New Account </p>";
+                            responseString += NewAccountForm;
+                        }
+                        break;
+                    case "/Admin/Clients":
+                        if (requestMethod == "GET")
+                        {
+                            responseString = " <p> Listing connected Clients </p>";
+                            OpenSim.world.Avatar TempAv;
+                            foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys)
+                            {
+                                if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
+                                {
+                                    TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
+                                    responseString += "<p>";
+                                    responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
+                                    responseString += "</p>";
+                                }
+                            }
+                        }
+                        break;
+                    case "/Admin/NewAccount":
+                        if (requestMethod == "POST")
+                        {
+                            string[] comp = new string[10];
+                            string[] passw = new string[3];
+                            string delimStr = "&";
+                            char[] delimiter = delimStr.ToCharArray();
+                            string delimStr2 = "=";
+                            char[] delimiter2 = delimStr2.ToCharArray();
+
+                            //Console.WriteLine(requestBody);
+                            comp = requestBody.Split(delimiter);
+                            passw = comp[3].Split(delimiter2);
+                            if (passw[1] == passWord)
+                            {
+                                responseString = "<p> New Account created </p>";
+                            }
+                            else
+                            {
+                                responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
+                                responseString += "<br><br>" + LoginForm;
+                            }
+                        }
+                        break;
+                    case "/Admin/Login":
+                        if (requestMethod == "POST")
+                        {
+                            // Console.WriteLine(requestBody);
+                            if (requestBody == passWord)
+                            {
+                                responseString = "<p> Login Successful </p>";
+                            }
+                            else
+                            {
+                                responseString = "<p> Password Error </p>";
+                                responseString += "<p> Please Login with the correct password </p>";
+                                responseString += "<br><br> " + LoginForm;
+                            }
+                        }
+                        break;
+                    case "/Admin/Welcome":
+                        if (requestMethod == "GET")
+                        {
+                            responseString = "Welcome to the OpenSim Admin Page";
+                            responseString += "<br><br><br> " + LoginForm;
+
+                        }
+                        break;
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+            return responseString;
+        }
+
+        private void LoadAdminPage()
+        {
+            try
+            {
+                StreamReader SR;
+                string lines;
+                AdminPage = "";
+                NewAccountForm = "";
+                LoginForm = "";
+                SR = File.OpenText("testadmin.htm");
+
+                while (!SR.EndOfStream)
+                {
+                    lines = SR.ReadLine();
+                    AdminPage += lines + "\n";
+
+                }
+                SR.Close();
+
+                SR = File.OpenText("newaccountform.htm");
+
+                while (!SR.EndOfStream)
+                {
+                    lines = SR.ReadLine();
+                    NewAccountForm += lines + "\n";
+
+                }
+                SR.Close();
+
+                SR = File.OpenText("login.htm");
+
+                while (!SR.EndOfStream)
+                {
+                    lines = SR.ReadLine();
+                    LoginForm += lines + "\n";
+
+                }
+                SR.Close();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+
+        }
+
+    }
+}

OpenSim.RegionServer/CAPS/IRestHandler.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.CAPS
+{
+    public interface IRestHandler
+    {
+        string HandleREST(string requestBody, string requestURL, string requestMethod);
+    }
+}

OpenSim.RegionServer/CAPS/SimHttp.cs

@@ -48,17 +48,13 @@ namespace OpenSim.CAPS
     {
         public Thread HTTPD;
         public HttpListener Listener;
-        private string AdminPage;
+        private Dictionary<string, IRestHandler> restHandlers = new Dictionary<string, IRestHandler>();
-        private string NewAccountForm;
-        private string LoginForm;
-        private string passWord = "Admin";
 
         public SimCAPSHTTPServer()
         {
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server");
             HTTPD = new Thread(new ThreadStart(StartHTTP));
             HTTPD.Start();
-            LoadAdminPage();
         }
 
         public void StartHTTP()
@@ -84,7 +80,18 @@ namespace OpenSim.CAPS
             }
         }
 
-        private string ParseXMLRPC(string requestBody)
+        public bool AddRestHandler(string path, IRestHandler handler)
+        {
+            if (!this.restHandlers.ContainsKey(path))
+            {
+                this.restHandlers.Add(path, handler);
+                return true;
+            }
+
+            //must already have a handler for that path so return false
+            return false;
+        }
+        protected virtual string ParseXMLRPC(string requestBody)
         {
             try
             {
@@ -116,104 +123,34 @@ namespace OpenSim.CAPS
             return "";
         }
 
-        private string ParseREST(string requestBody, string requestURL, string requestMethod)
+        protected virtual string ParseREST(string requestBody, string requestURL, string requestMethod)
         {
+            string[] path;
+            string pathDelimStr = "/";
+            char[] pathDelimiter = pathDelimStr.ToCharArray();
+            path = requestURL.Split(pathDelimiter);
+
             string responseString = "";
-            try
-            {
-                switch (requestURL)
-                {
-                    case "/Admin/Accounts":
-                        if (requestMethod == "GET")
-                        {
-                            responseString = "<p> Account management </p>";
-                            responseString += "<br> ";
-                            responseString += "<p> Create New Account </p>";
-                            responseString += NewAccountForm;
-                        }
-                        break;
-                    case "/Admin/Clients":
-                        if (requestMethod == "GET")
-                        {
-                            responseString = " <p> Listing connected Clients </p>";
-                            OpenSim.world.Avatar TempAv;
-                            foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys)
-                            {
-                                if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
-                                {
-                                    TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
-                                    responseString += "<p>";
-                                    responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
-                                    responseString += "</p>";
-                                }
-                            }
-                        }
-                        break;
-                    case "/Admin/NewAccount":
-                        if (requestMethod == "POST")
-                        {
-                            string[] comp = new string[10];
-                            string[] passw = new string[3];
-                            string delimStr = "&";
-                            char[] delimiter = delimStr.ToCharArray();
-                            string delimStr2 = "=";
-                            char[] delimiter2 = delimStr2.ToCharArray();
             
-                            //Console.WriteLine(requestBody);
+            //path[0] should be empty so we are interested in path[1]
-                            comp = requestBody.Split(delimiter);
+            if (path.Length > 1)
-                            passw = comp[3].Split(delimiter2);
-                            if (passw[1] == passWord)
             {
-                                responseString = "<p> New Account created </p>";
+                if ((path[1] != "") && (this.restHandlers.ContainsKey(path[1])))
-                            }
-                            else
                 {
-                                responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
+                    responseString = this.restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod);
-                                responseString += "<br><br>" + LoginForm;
                 }
             }
-                        break;
-                    case "/Admin/Login":
-                        if (requestMethod == "POST")
-                        {
-                            // Console.WriteLine(requestBody);
-                            if (requestBody == passWord)
-                            {
-                                responseString = "<p> Login Successful </p>";
-                            }
-                            else
-                            {
-                                responseString = "<p> Password Error </p>";
-                                responseString += "<p> Please Login with the correct password </p>";
-                                responseString += "<br><br> " + LoginForm;
-                            }
-                        }
-                        break;
-                    case "/Admin/Welcome":
-                        if (requestMethod == "GET")
-                        {
-                            responseString = "Welcome to the OpenSim Admin Page";
-                            responseString += "<br><br><br> " + LoginForm;
-
-                        }
-                        break;
-                }
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
            
             return responseString;
         }
 
-        private string ParseLLSDXML(string requestBody)
+        protected virtual string ParseLLSDXML(string requestBody)
         {
             // dummy function for now - IMPLEMENT ME!
             return "";
         }
 
-        public void HandleRequest(Object stateinfo)
+        public virtual void HandleRequest(Object stateinfo)
         {
             // Console.WriteLine("new http incoming");
             HttpListenerContext context = (HttpListenerContext)stateinfo;
@@ -258,17 +195,9 @@ namespace OpenSim.CAPS
                     break;
 
                 case null:
-                    if ((request.HttpMethod == "GET") && (request.RawUrl == "/Admin"))
-                    {
-                        responseString = AdminPage;
-                        response.AddHeader("Content-type", "text/html");
-                    }
-                    else
-                    {
                     // must be REST or invalid crap, so pass to the REST parser
                     responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
                     response.AddHeader("Content-type", "text/html");
-                    }
                     break;
 
             }
@@ -280,52 +209,6 @@ namespace OpenSim.CAPS
             output.Write(buffer, 0, buffer.Length);
             output.Close();
         }
-
-        private void LoadAdminPage()
-        {
-            try
-            {
-                StreamReader SR;
-                string lines;
-                AdminPage = "";
-                NewAccountForm = "";
-                LoginForm = "";
-                SR = File.OpenText("testadmin.htm");
-
-                while (!SR.EndOfStream)
-                {
-                    lines = SR.ReadLine();
-                    AdminPage += lines + "\n";
-
-                }
-                SR.Close();
-
-                SR = File.OpenText("newaccountform.htm");
-
-                while (!SR.EndOfStream)
-                {
-                    lines = SR.ReadLine();
-                    NewAccountForm += lines + "\n";
-
-                }
-                SR.Close();
-
-                SR = File.OpenText("login.htm");
-
-                while (!SR.EndOfStream)
-                {
-                    lines = SR.ReadLine();
-                    LoginForm += lines + "\n";
-
-                }
-                SR.Close();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e.ToString());
-            }
-
-        }
     }
 
 

OpenSim.RegionServer/OpenSim.RegionServer.csproj

@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
     <ProjectGuid>{4171D545-81F5-4C64-AD29-6D7414C38181}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenSim.RegionServer</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>OpenSim.RegionServer</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,13 +61,15 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System">
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
@@ -103,6 +111,8 @@
     <Compile Include="AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="CAPS\AdminWebFront.cs" />
+    <Compile Include="CAPS\IRestHandler.cs" />
     <Compile Include="ConsoleCmds.cs">
       <SubType>Code</SubType>
     </Compile>

OpenSim.RegionServer/OpenSim.RegionServer.dll.build

@@ -23,6 +23,8 @@
                 <include name="VersionInfo.cs" />
                 <include name="Assets/AssetCache.cs" />
                 <include name="Assets/InventoryCache.cs" />
+                <include name="CAPS/AdminWebFront.cs" />
+                <include name="CAPS/IRestHandler.cs" />
                 <include name="CAPS/SimHttp.cs" />
                 <include name="types/Mesh.cs" />
                 <include name="types/Triangle.cs" />

OpenSim.RegionServer/OpenSimMain.cs

@@ -114,6 +114,7 @@ namespace OpenSim
 
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
             OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer();
+            OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin"));
 
             timer1.Enabled = true;
             timer1.Interval = 100;

bin/login.htm

@@ -1,5 +1,5 @@
 <form action="javascript:setpass();" name="logon" id="logon">
-<p> Admin PassWord: <input type="password" id="Adminpss" size="17" maxlength="34"> </P>
+<p> Admin Password: <input type="password" id="Adminpss" size="17" maxlength="34"> </P>
 <input type="button" name="button" value="Login" 
    onclick="javascript:setpass(this.parentNode);">
 </form>