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

SampleMoneyModule: add private xmlrpc methods

master
UbitUmarov 2020-05-08 14:50:46 +01:00
parent c2c00c5d84
commit 72c1c923f8
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1104,7 +1104,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// <param name="response"></param> /// <param name="response"></param>
public void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response) public void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
{ {
String requestBody; String requestBody = null;
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
Stream innerStream = null; Stream innerStream = null;
@ -1119,6 +1119,10 @@ namespace OpenSim.Framework.Servers.HttpServer
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8)) using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
requestBody = reader.ReadToEnd(); requestBody = reader.ReadToEnd();
} }
catch
{
requestBody = null;
}
finally finally
{ {
if (innerStream != null && innerStream.CanRead) if (innerStream != null && innerStream.CanRead)
@ -1127,6 +1131,13 @@ namespace OpenSim.Framework.Servers.HttpServer
requestStream.Dispose(); requestStream.Dispose();
} }
if (string.IsNullOrWhiteSpace(requestBody))
{
response.StatusCode = (int)HttpStatusCode.NotFound;
response.KeepAlive = false;
return;
}
//m_log.Debug(requestBody); //m_log.Debug(requestBody);
requestBody = requestBody.Replace("<base64></base64>", ""); requestBody = requestBody.Replace("<base64></base64>", "");
@ -1274,9 +1285,9 @@ namespace OpenSim.Framework.Servers.HttpServer
response.StatusCode = (int)HttpStatusCode.OK; response.StatusCode = (int)HttpStatusCode.OK;
} }
public void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response, Dictionary<string, XmlRpcMethod> rpchandlers) public void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response, Dictionary<string, XmlRpcMethod> rpcHandlers)
{ {
String requestBody; String requestBody = null;
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
Stream innerStream = null; Stream innerStream = null;
@ -1291,6 +1302,10 @@ namespace OpenSim.Framework.Servers.HttpServer
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8)) using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
requestBody = reader.ReadToEnd(); requestBody = reader.ReadToEnd();
} }
catch
{
requestBody = null;
}
finally finally
{ {
if (innerStream != null && innerStream.CanRead) if (innerStream != null && innerStream.CanRead)
@ -1299,6 +1314,13 @@ namespace OpenSim.Framework.Servers.HttpServer
requestStream.Dispose(); requestStream.Dispose();
} }
if (string.IsNullOrWhiteSpace(requestBody))
{
response.StatusCode = (int)HttpStatusCode.NotFound;
response.KeepAlive = false;
return;
}
//m_log.Debug(requestBody); //m_log.Debug(requestBody);
requestBody = requestBody.Replace("<base64></base64>", ""); requestBody = requestBody.Replace("<base64></base64>", "");
@ -1357,7 +1379,7 @@ namespace OpenSim.Framework.Servers.HttpServer
XmlRpcMethod method; XmlRpcMethod method;
bool methodWasFound; bool methodWasFound;
methodWasFound = rpchandlers.TryGetValue(methodName, out method); methodWasFound = rpcHandlers.TryGetValue(methodName, out method);
XmlRpcResponse xmlRpcResponse; XmlRpcResponse xmlRpcResponse;
if (methodWasFound) if (methodWasFound)

14
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@ -65,6 +65,8 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// </summary> /// </summary>
// private UUID EconomyBaseAccount = UUID.Zero; // private UUID EconomyBaseAccount = UUID.Zero;
private Dictionary<string, XmlRpcMethod> m_rpcHandlers;
private float EnergyEfficiency = 1f; private float EnergyEfficiency = 1f;
// private ObjectPaid handerOnObjectPaid; // private ObjectPaid handerOnObjectPaid;
private bool m_enabled = true; private bool m_enabled = true;
@ -145,12 +147,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
// to the command line parameters you use to start up your client // to the command line parameters you use to start up your client
// This commonly looks like -helperuri http://127.0.0.1:9000/ // This commonly looks like -helperuri http://127.0.0.1:9000/
m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
// Local Server.. enables functionality only. m_rpcHandlers.Add("getCurrencyQuote", quote_func);
httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func); m_rpcHandlers.Add("buyCurrency", buy_func);
httpServer.AddXmlRPCHandler("buyCurrency", buy_func); m_rpcHandlers.Add("preflightBuyLandPrep", preflightBuyLandPrep_func);
httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func); m_rpcHandlers.Add("buyLandPrep", landBuy_func);
httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func);
// add php // add php
MainServer.Instance.AddSimpleStreamHandler(new SimpleStreamHandler("/currency.php", processPHP)); MainServer.Instance.AddSimpleStreamHandler(new SimpleStreamHandler("/currency.php", processPHP));
@ -188,7 +190,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
public void processPHP(IOSHttpRequest request, IOSHttpResponse response) public void processPHP(IOSHttpRequest request, IOSHttpResponse response)
{ {
MainServer.Instance.HandleXmlRpcRequests((OSHttpRequest)request, (OSHttpResponse)response); MainServer.Instance.HandleXmlRpcRequests((OSHttpRequest)request, (OSHttpResponse)response, m_rpcHandlers);
} }
// Please do not refactor these to be just one method // Please do not refactor these to be just one method