ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

* re-fixed the utf-16 bug in xmlRpcResponse serialization

Browse Source 
* added LLSDStreamHandler.cs to Caps (Haven't enabled it yet, though)
* removed last traces of old rest handling
This commit is contained in:
lbsa71
2007-07-04 16:28:59 +00:00
parent 6a2588454a
commit 5c32b33a66
17 changed files with 387 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -42,7 +42,6 @@ namespace OpenSim.Framework.Servers
{
protected Thread m_workerThread;
protected HttpListener m_httpListener;
//protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>();
protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
protected Dictionary<string, IStreamHandler> m_streamHandlers = new Dictionary<string, IStreamHandler>();
protected int m_port;
@@ -67,32 +66,6 @@ namespace OpenSim.Framework.Servers
return httpMethod + ":" + path;
}
//public bool AddRestHandler(string method, string path, RestMethod handler)
//{
// //Console.WriteLine("adding new REST handler for path " + path);
// string methodKey = String.Format("{0}: {1}", method, path);
// if (!this.m_restHandlers.ContainsKey(methodKey))
// {
// this.m_restHandlers.Add(methodKey, new RestMethodEntry(path, handler));
// return true;
// }
// //must already have a handler for that path so return false
// return false;
//}
//public bool RemoveRestHandler(string method, string path)
//{
// string methodKey = String.Format("{0}: {1}", method, path);
// if (this.m_restHandlers.ContainsKey(methodKey))
// {
// this.m_restHandlers.Remove(methodKey);
// return true;
// }
// return false;
//}
public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
{
if (!this.m_rpcHandlers.ContainsKey(method))
@@ -105,76 +78,6 @@ namespace OpenSim.Framework.Servers
return false;
}
protected virtual string ProcessXMLRPCMethod(string methodName, XmlRpcRequest request)
{
XmlRpcResponse response;
XmlRpcMethod method;
if (this.m_rpcHandlers.TryGetValue(methodName, out method))
{
response = method(request);
}
else
{
response = new XmlRpcResponse();
Hashtable unknownMethodError = new Hashtable();
unknownMethodError["reason"] = "XmlRequest"; ;
unknownMethodError["message"] = "Unknown Rpc request";
unknownMethodError["login"] = "false";
response.Value = unknownMethodError;
}
return XmlRpcResponseSerializer.Singleton.Serialize(response);
}
//protected virtual string ParseREST(string request, string path, string method)
//{
// string response;
// string requestKey = String.Format("{0}: {1}", method, path);
// string bestMatch = String.Empty;
// foreach (string currentKey in m_restHandlers.Keys)
// {
// if (requestKey.StartsWith(currentKey))
// {
// if (currentKey.Length > bestMatch.Length)
// {
// bestMatch = currentKey;
// }
// }
// }
// RestMethodEntry restMethodEntry;
// if (m_restHandlers.TryGetValue(bestMatch, out restMethodEntry))
// {
// RestMethod restMethod = restMethodEntry.RestMethod;
// string param = path.Substring(restMethodEntry.Path.Length);
// response = restMethod(request, path, param);
// }
// else
// {
// response = String.Empty;
// }
// return response;
//}
protected virtual string ParseXMLRPC(string requestBody)
{
string responseString = String.Empty;
XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
string methodName = request.MethodName;
responseString = ProcessXMLRPCMethod(methodName, request);
return responseString;
}
public virtual void HandleRequest(Object stateinfo)
{
@@ -203,7 +106,7 @@ namespace OpenSim.Framework.Servers
}
else
{
HandleLegacyRequests(request, response);
HandleXmlRpcRequests(request, response);
}
}
@@ -234,64 +137,54 @@ namespace OpenSim.Framework.Servers
}
}
private void HandleLegacyRequests(HttpListenerRequest request, HttpListenerResponse response)
private void HandleXmlRpcRequests(HttpListenerRequest request, HttpListenerResponse response)
{
Stream body = request.InputStream;
Stream requestStream = request.InputStream;
Encoding encoding = Encoding.UTF8;
StreamReader reader = new StreamReader(body, encoding);
StreamReader reader = new StreamReader(requestStream, encoding);
string requestBody = reader.ReadToEnd();
body.Close();
reader.Close();
requestStream.Close();
//Console.WriteLine(request.HttpMethod + " " + request.RawUrl + " Http/" + request.ProtocolVersion.ToString() + " content type: " + request.ContentType);
//Console.WriteLine(requestBody);
XmlRpcRequest xmlRprcRequest = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
string responseString = "";
// Console.WriteLine("new request " + request.ContentType +" at "+ request.RawUrl);
switch (request.ContentType)
string methodName = xmlRprcRequest.MethodName;
XmlRpcResponse xmlRpcResponse;
XmlRpcMethod method;
if (this.m_rpcHandlers.TryGetValue(methodName, out method))
{
case "text/xml":
// must be XML-RPC, so pass to the XML-RPC parser
responseString = ParseXMLRPC(requestBody);
responseString = Regex.Replace(responseString, "utf-16", "utf-8");
response.AddHeader("Content-type", "text/xml");
break;
//case "application/xml":
//case "application/octet-stream":
// // probably LLSD we hope, otherwise it should be ignored by the parser
// // responseString = ParseLLSDXML(requestBody);
// responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
// response.AddHeader("Content-type", "application/xml");
// break;
//case "application/x-www-form-urlencoded":
// // a form data POST so send to the REST parser
// responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
// response.AddHeader("Content-type", "text/html");
// break;
//case null:
// // 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;
xmlRpcResponse = method(xmlRprcRequest);
}
else
{
xmlRpcResponse = new XmlRpcResponse();
Hashtable unknownMethodError = new Hashtable();
unknownMethodError["reason"] = "XmlRequest"; ;
unknownMethodError["message"] = "Unknown Rpc Request ["+methodName+"]";
unknownMethodError["login"] = "false";
xmlRpcResponse.Value = unknownMethodError;
}
response.AddHeader("Content-type", "text/xml");
string responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
// This must be absolutely fuggliest hack in this project. Don't just stand there, DO SOMETHING!
responseString = Regex.Replace(responseString, "utf-16", "utf-8");
byte[] buffer = Encoding.UTF8.GetBytes(responseString);
Stream output = response.OutputStream;
response.SendChunked = false;
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
output.Write(buffer, 0, buffer.Length);
output.Close();
response.OutputStream.Write(buffer, 0, buffer.Length);
response.OutputStream.Close();
}
public void Start()

6
OpenSim/Framework/Servers/BaseStreamHandler.cs
View File

@@ -7,19 +7,19 @@ namespace OpenSim.Framework.Servers
{
public abstract class BaseStreamHandler : IStreamHandler
{
public string ContentType
virtual public string ContentType
{
get { return "application/xml"; }
}
private string m_httpMethod;
public string HttpMethod
virtual public string HttpMethod
{
get { return m_httpMethod; }
}
private string m_path;
public string Path
virtual public string Path
{
get { return m_path; }
}

37
OpenSim/Framework/Servers/ILlsdMethodHandler.cs
View File

@@ -1,37 +0,0 @@
/*
* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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.
*
*/
namespace OpenSim.Framework.Servers
{
public interface ILlsdMethodHandler
{
string Handle(string request, string path);
}
}

32
OpenSim/Framework/Servers/LlsdMethod.cs
View File

@@ -1,32 +0,0 @@
/*
* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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.
*
*/
namespace OpenSim.Framework.Servers
{
public delegate TResponse LlsdMethod<TResponse, TRequest>( TRequest request );
}

9
OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
View File

@@ -99,21 +99,12 @@
<Compile Include="CheckSumServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ILlsdMethodHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IStreamHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LlsdMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RestMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RestMethodEntry.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RestStreamHandler.cs">
<SubType>Code</SubType>
</Compile>

3
OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
View File

@@ -14,11 +14,8 @@
<include name="BaseHttpServer.cs" />
<include name="BaseStreamHandler.cs" />
<include name="CheckSumServer.cs" />
<include name="ILlsdMethodHandler.cs" />
<include name="IStreamHandler.cs" />
<include name="LlsdMethod.cs" />
<include name="RestMethod.cs" />
<include name="RestMethodEntry.cs" />
<include name="RestStreamHandler.cs" />
<include name="UDPServerBase.cs" />
<include name="XmlRpcMethod.cs" />

27
OpenSim/Framework/Servers/RestMethodEntry.cs
View File

@@ -1,27 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework.Servers
{
public class RestMethodEntry
{
private string m_path;
public string Path
{
get { return m_path; }
}
private RestMethod m_restMethod;
public RestMethod RestMethod
{
get { return m_restMethod; }
}
public RestMethodEntry(string path, RestMethod restMethod)
{
m_path = path;
m_restMethod = restMethod;
}
}
}

2
OpenSim/Framework/UserManager/LoginResponse.cs
View File

@@ -222,7 +222,9 @@ namespace OpenSim.Framework.UserManagement
responseData["sim_port"] =(Int32) this.SimPort;
responseData["sim_ip"] = this.SimAddress;
MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
responseData["agent_id"] = this.AgentID.ToStringHyphenated();
responseData["session_id"] = this.SessionID.ToStringHyphenated();
responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();