OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xmlrpc and josonrpc only allowed on uri root, and only those there

master
UbitUmarov 2020-04-26 23:05:27 +01:00
parent 6050eff683
commit 8900d1139e
1 changed files with 129 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -607,9 +607,31 @@ namespace OpenSim.Framework.Servers.HttpServer
//m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl);
Culture.SetCurrentCulture(); Culture.SetCurrentCulture();
string path = request.UriPath; string path = request.UriPath;
if (path != "/" && TryGetSimpleStreamHandler(path, out ISimpleStreamHandler hdr)) if (path == "/")
{
if (request.ContentType == "application/json-rpc")
{
if (DebugLevel >= 3)
LogIncomingToContentTypeHandler(request);
HandleJsonRpcRequests(request, response);
requestEndTick = Environment.TickCount;
response.Send();
return;
}
if (DebugLevel >= 3)
LogIncomingToXmlRpcHandler(request);
// generic login request.
HandleXmlRpcRequests(request, response);
requestEndTick = Environment.TickCount;
response.Send();
return;
}
if (TryGetSimpleStreamHandler(path, out ISimpleStreamHandler hdr))
{ {
hdr.Handle(request, response); hdr.Handle(request, response);
if (request.InputStream != null && request.InputStream.CanRead) if (request.InputStream != null && request.InputStream.CanRead)
@ -707,17 +729,9 @@ namespace OpenSim.Framework.Servers.HttpServer
buffer = HandleLLSDRequests(request, response); buffer = HandleLLSDRequests(request, response);
break; break;
case "application/json-rpc":
if (DebugLevel >= 3)
LogIncomingToContentTypeHandler(request);
buffer = HandleJsonRpcRequests(request, response);
break;
case "text/xml": case "text/xml":
case "application/xml": case "application/xml":
case "application/json": case "application/json":
default: default:
//m_log.Info("[Debug BASE HTTP SERVER]: in default handler"); //m_log.Info("[Debug BASE HTTP SERVER]: in default handler");
// Point of note.. the DoWeHaveA methods check for an EXACT path // Point of note.. the DoWeHaveA methods check for an EXACT path
@ -741,14 +755,6 @@ namespace OpenSim.Framework.Servers.HttpServer
buffer = HandleHTTPRequest(request, response); buffer = HandleHTTPRequest(request, response);
} }
else
{
if (DebugLevel >= 3)
LogIncomingToXmlRpcHandler(request);
// generic login request.
buffer = HandleXmlRpcRequests(request, response);
}
break; break;
} }
@ -1062,7 +1068,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="response"></param> /// <param name="response"></param>
private byte[] HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response) private void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
{ {
String requestBody; String requestBody;
@ -1090,9 +1096,6 @@ namespace OpenSim.Framework.Servers.HttpServer
//m_log.Debug(requestBody); //m_log.Debug(requestBody);
requestBody = requestBody.Replace("<base64></base64>", ""); requestBody = requestBody.Replace("<base64></base64>", "");
string responseString = String.Empty;
XmlRpcRequest xmlRprcRequest = null;
bool gridproxy = false; bool gridproxy = false;
if (requestBody.Contains("encoding=\"utf-8")) if (requestBody.Contains("encoding=\"utf-8"))
{ {
@ -1106,6 +1109,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
XmlRpcRequest xmlRprcRequest = null;
try try
{ {
xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody); xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody);
@ -1129,17 +1133,25 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
if (xmlRprcRequest != null) if(xmlRprcRequest == null)
{ {
response.StatusCode = (int)HttpStatusCode.NotFound;
response.KeepAlive = false;
return;
}
string methodName = xmlRprcRequest.MethodName; string methodName = xmlRprcRequest.MethodName;
if (methodName != null) if (string.IsNullOrWhiteSpace(methodName))
{ {
xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1] response.StatusCode = (int)HttpStatusCode.NotFound;
XmlRpcResponse xmlRpcResponse; response.KeepAlive = false;
return;
}
XmlRpcMethod method; XmlRpcMethod method;
bool methodWasFound; bool methodWasFound;
bool keepAlive = false; bool keepAlive = false;
lock (m_rpcHandlers) lock (m_rpcHandlers)
{ {
methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method); methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method);
@ -1147,6 +1159,8 @@ namespace OpenSim.Framework.Servers.HttpServer
keepAlive = m_rpcHandlersKeepAlive[methodName]; keepAlive = m_rpcHandlersKeepAlive[methodName];
} }
XmlRpcResponse xmlRpcResponse;
xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1]
if (methodWasFound) if (methodWasFound)
{ {
xmlRprcRequest.Params.Add(request.Url); // Param[2] xmlRprcRequest.Params.Add(request.Url); // Param[2]
@ -1196,61 +1210,42 @@ namespace OpenSim.Framework.Servers.HttpServer
xmlRpcResponse.SetFault(-32603, errorMessage); xmlRpcResponse.SetFault(-32603, errorMessage);
} }
// if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here
response.KeepAlive = keepAlive;
response.AddHeader("Access-Control-Allow-Origin", "*"); response.AddHeader("Access-Control-Allow-Origin", "*");
} }
else else
{ {
xmlRpcResponse = new XmlRpcResponse(); xmlRpcResponse = new XmlRpcResponse();
// Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php // Code set in accordance with http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
xmlRpcResponse.SetFault( xmlRpcResponse.SetFault(
XmlRpcErrorCodes.SERVER_ERROR_METHOD, XmlRpcErrorCodes.SERVER_ERROR_METHOD,
String.Format("Requested method [{0}] not found", methodName)); String.Format("Requested method [{0}] not found", methodName));
} }
response.KeepAlive = keepAlive;
response.ContentType = "text/xml"; response.ContentType = "text/xml";
//string responseString = String.Empty;
using (MemoryStream outs = new MemoryStream()) using (MemoryStream outs = new MemoryStream())
{
using (XmlTextWriter writer = new XmlTextWriter(outs, UTF8NoBOM)) using (XmlTextWriter writer = new XmlTextWriter(outs, UTF8NoBOM))
{ {
writer.Formatting = Formatting.None; writer.Formatting = Formatting.None;
XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse); XmlRpcResponseSerializer.Singleton.Serialize(writer, xmlRpcResponse);
writer.Flush(); writer.Flush();
outs.Flush(); //outs.Seek(0, SeekOrigin.Begin);
outs.Position = 0; //using (StreamReader sr = new StreamReader(outs))
using (StreamReader sr = new StreamReader(outs)) // responseString = sr.ReadToEnd();
{ response.RawBuffer = outs.ToArray();
responseString = sr.ReadToEnd();
}
}
}
else
{
//HandleLLSDRequests(request, response);
response.ContentType = "text/plain";
response.StatusCode = 404;
response.StatusDescription = "Not Found";
responseString = "Not found";
response.KeepAlive = false;
m_log.ErrorFormat(
"[BASE HTTP SERVER]: Handler not found for http request {0} {1}",
request.HttpMethod, request.Url.PathAndQuery);
} }
} }
byte[] buffer = Encoding.UTF8.GetBytes(responseString); //response.RawBuffer = Encoding.UTF8.GetBytes(responseString);
response.StatusCode = (int)HttpStatusCode.OK;
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
return buffer;
} }
// JsonRpc (v2.0 only) // JsonRpc (v2.0 only)
// Batch requests not yet supported // Batch requests not yet supported
private byte[] HandleJsonRpcRequests(OSHttpRequest request, OSHttpResponse response) private void HandleJsonRpcRequests(OSHttpRequest request, OSHttpResponse response)
{ {
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
JsonRpcResponse jsonRpcResponse = new JsonRpcResponse(); JsonRpcResponse jsonRpcResponse = new JsonRpcResponse();
@ -1326,12 +1321,9 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
string responseData = string.Empty; string responseData = jsonRpcResponse.Serialize();
response.RawBuffer = Encoding.UTF8.GetBytes(responseData);
responseData = jsonRpcResponse.Serialize(); response.StatusCode = (int)HttpStatusCode.OK;
byte[] buffer = Encoding.UTF8.GetBytes(responseData);
return buffer;
} }
private byte[] HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response) private byte[] HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response)