brought zircon branch into trunk

6 files changed, 157 insertions, 20 deletions

diff --git a/ogs/userserver/src/ConsoleCmds.cs b/OGS/userserver/src/ConsoleCmds.cs
index f2568fc..f2568fc 100644
--- a/ogs/userserver/src/ConsoleCmds.cs
+++ b/OGS/userserver/src/ConsoleCmds.cs
diff --git a/ogs/userserver/src/Main.cs b/OGS/userserver/src/Main.cs
index 40ef916..7e5308e 100644
--- a/ogs/userserver/src/Main.cs
+++ b/OGS/userserver/src/Main.cs
@@ -33,6 +33,9 @@ using System.Collections.Generic;
 using System.Text;

 using libsecondlife;

 using ServerConsole;

+using OpenSim.Framework.User;

+using OpenSim.Framework.Sims;

+using OpenSim.Framework.Inventory;

 

 namespace OpenGridServices

 {

@@ -73,16 +76,17 @@ namespace OpenGridServices
                 public void Startup() {

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Please press enter to retain default settings");

 

-                        this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");

+            this.GridURL=ServerConsole.MainConsole.Instance.CmdPrompt("Grid URL: ");

                         this.GridSendKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to send to grid: ");

                         this.GridRecvKey=ServerConsole.MainConsole.Instance.CmdPrompt("Key to expect from grid: ");

                 

                         this.DefaultStartupMsg=ServerConsole.MainConsole.Instance.CmdPrompt("Default startup message for clients [Welcome to OGS!] :","Welcome to OGS!");

-

+           

                         ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Creating user profile manager");

                         _profilemanager = new UserProfileManager();

                         _profilemanager.InitUserProfiles();

-        

+            _profilemanager.SetKeys(GridSendKey, GridRecvKey, GridURL, DefaultStartupMsg);

+

                 

                         string tempfirstname;

                         string templastname;

diff --git a/ogs/userserver/src/OGS-UserServer.csproj b/OGS/userserver/src/OGS-UserServer.csproj
index f6737c8..f4fa8b6 100644
--- a/ogs/userserver/src/OGS-UserServer.csproj
+++ b/OGS/userserver/src/OGS-UserServer.csproj
@@ -48,21 +48,16 @@
     <Compile Include="Main.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

     <Compile Include="UserHttp.cs" />

-    <Compile Include="UserProfiles.cs" />

-    <Compile Include="Util.cs" />

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">

+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>

+      <Name>OpenSim.Framework</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">

       <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>

       <Name>ServerConsole</Name>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

 </Project>
\ No newline at end of file
diff --git a/ogs/userserver/src/OGS-UserServer.csproj.user b/OGS/userserver/src/OGS-UserServer.csproj.user
index 9c0b2d9..aa75a3d 100644
--- a/ogs/userserver/src/OGS-UserServer.csproj.user
+++ b/OGS/userserver/src/OGS-UserServer.csproj.user
@@ -1,14 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <PublishUrlHistory>publish\</PublishUrlHistory>

-    <InstallUrlHistory>

-    </InstallUrlHistory>

-    <SupportUrlHistory>

-    </SupportUrlHistory>

-    <UpdateUrlHistory>

-    </UpdateUrlHistory>

-    <BootstrapperUrlHistory>

-    </BootstrapperUrlHistory>

     <ApplicationRevision>0</ApplicationRevision>

     <FallbackCulture>en-US</FallbackCulture>

     <VerifyUploadedFiles>false</VerifyUploadedFiles>

diff --git a/ogs/userserver/src/Properties/AssemblyInfo.cs b/OGS/userserver/src/Properties/AssemblyInfo.cs
index 5d5ce8d..5d5ce8d 100644
--- a/ogs/userserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/userserver/src/Properties/AssemblyInfo.cs
diff --git a/OGS/userserver/src/UserHttp.cs b/OGS/userserver/src/UserHttp.cs
new file mode 100644
index 0000000..ce3cfcd
--- /dev/null
+++ b/OGS/userserver/src/UserHttp.cs
@@ -0,0 +1,146 @@
+/*

+Copyright (c) OpenGrid project, http://osgrid.org/

+

+

+* All rights reserved.

+*

+* 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 <organization> 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 <copyright holder> ``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 <copyright holder> 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 System.Text;

+using Nwc.XmlRpc;

+using System.Threading;

+using System.Text.RegularExpressions;

+using System.Net;

+using System.IO;

+using System.Collections;

+using System.Collections.Generic;

+using libsecondlife;

+using ServerConsole;

+using OpenSim.Framework.User;

+using OpenSim.Framework.Sims;

+using OpenSim.Framework.Inventory;

+

+namespace OpenGridServices

+{

+        public class UserHTTPServer {

+                public Thread HTTPD;

+                public HttpListener Listener;

+        

+                public UserHTTPServer() {

+                        ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");

+                        HTTPD = new Thread(new ThreadStart(StartHTTP));

+                        HTTPD.Start();

+                }

+

+                public void StartHTTP() {

+                        ServerConsole.MainConsole.Instance.WriteLine("UserHttp.cs:StartHTTP() - Spawned main thread OK");

+                        Listener = new HttpListener();

+

+                        Listener.Prefixes.Add("http://+:8002/userserver/");

+                        Listener.Prefixes.Add("http://+:8002/usersessions/");

+                        Listener.Start();

+

+                        HttpListenerContext context;

+                        while(true) {

+                                context = Listener.GetContext();

+                                ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);

+                        }

+                }

+

+                static string ParseXMLRPC(string requestBody) {

+            return OpenGridServices.OpenUser_Main.userserver._profilemanager.ParseXMLRPC(requestBody);

+                }

+                

+                static string ParseREST(HttpListenerRequest www_req) {

+                        Console.WriteLine("INCOMING REST - " + www_req.RawUrl);

+        

+                        char[] splitter  = {'/'};

+                        string[] rest_params = www_req.RawUrl.Split(splitter);

+                        string req_type = rest_params[1];       // First part of the URL is the type of request - usersessions/userprofiles/inventory/blabla

+                        switch(req_type) {

+                                case "usersessions":

+                                        LLUUID sessionid = new LLUUID(rest_params[2]);  // get usersessions/sessionid

+                                        if(www_req.HttpMethod=="DELETE") {

+                                                foreach (libsecondlife.LLUUID UUID in OpenUser_Main.userserver._profilemanager.UserProfiles.Keys) {

+                                                        if(OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID==sessionid) {

+                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSessionID=null;

+                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].CurrentSecureSessionID=null;

+                                                                OpenUser_Main.userserver._profilemanager.UserProfiles[UUID].Circuits.Clear();

+                                                        }

+                                                }

+

+                                        }

+                                        return "OK";

+                                break;

+                        }

+

+                        return "";

+                }

+

+

+                static void HandleRequest(Object  stateinfo) {

+                        HttpListenerContext context=(HttpListenerContext)stateinfo;

+                

+                        HttpListenerRequest request = context.Request;

+                        HttpListenerResponse response = context.Response;

+

+                        response.KeepAlive=false;

+                        response.SendChunked=false;

+

+                        System.IO.Stream body = request.InputStream;

+                        System.Text.Encoding encoding = System.Text.Encoding.UTF8;

+                        System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);

+   

+                        string requestBody = reader.ReadToEnd();

+                        body.Close();

+                        reader.Close();

+

+                        string responseString="";

+                        switch(request.ContentType) {

+                                case "text/xml":

+                                        // must be XML-RPC, so pass to the XML-RPC parser

+                                        

+                                        responseString=ParseXMLRPC(requestBody);

+                                        response.AddHeader("Content-type","text/xml");  

+                                break;

+                                

+                                case "text/plaintext":

+                                        responseString=ParseREST(request);

+                                        response.AddHeader("Content-type","text/plaintext");

+                                break;

+                        }

+        

+        

+                        byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);

+                        System.IO.Stream output = response.OutputStream;

+                        response.SendChunked=false;

+                        response.ContentLength64=buffer.Length;

+                        output.Write(buffer,0,buffer.Length);

+                        output.Close();

+                }

+        }

+

+

+}