mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 05:28:30 +01:00
Code Issues Projects Releases Wiki Activity

MDL-76055 mnet: Switch the mnet server to use the library

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2022-09-23 18:22:29 +02:00
parent 8c64ab98ee
commit 29873206b9
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mnet/xmlrpc/server.php
View File

@ -66,7 +66,9 @@ if($remoteclient->pushkey == true) {
exit(mnet_server_fault_xml(7025, $mnet->public_key, $remoteclient->useprivatekey));
}
// Have a peek at what the request would be if we were to process it
$params = xmlrpc_decode_request($xmlrpcrequest, $method);
$encoder = new \PhpXmlRpc\Encoder();
$orequest = $encoder->decodeXML($xmlrpcrequest); // First, to internal.
$method = $orequest->method(); // We just need the method.
mnet_debug("incoming mnet request $method");
// One of three conditions need to be met before we continue processing this request:

54
mnet/xmlrpc/serverlib.php
View File

@ -248,11 +248,18 @@ function mnet_server_prepare_response($response, $privatekey = null) {
function mnet_server_dispatch($payload) {
global $CFG, $DB;
$remoteclient = get_mnet_remote_client();
// xmlrpc_decode_request returns an array of parameters, and the $method
// variable (which is passed by reference) is instantiated with the value from
// the methodName tag in the xml payload
// xmlrpc_decode_request($xml, &$method)
$params = xmlrpc_decode_request($payload, $method);
// Decode the request to method + params.
$method = null;
$params = null;
$encoder = new \PhpXmlRpc\Encoder();
$orequest = $encoder->decodeXML($payload); // First, to internal PhpXmlRpc\Response structure.
if ($orequest && $orequest instanceof \PhpXmlRpc\Request) {
$method = $orequest->method();
$numparams = $orequest->getNumParams();
for ($i = 0; $i < $numparams; $i++) {
$params[] = $encoder->decode($orequest->getParam($i));
}
}
// $method is something like: "mod/forum/lib.php/forum_add_instance"
// $params is an array of parameters. A parameter might itself be an array.
@ -286,7 +293,9 @@ function mnet_server_dispatch($payload) {
////////////////////////////////////// SYSTEM METHODS
} elseif ($callstack[0] == 'system') {
$functionname = $callstack[1];
$xmlrpcserver = xmlrpc_server_create();
$xmlrpcserver = new \PhpXmlRpc\Server();
$xmlrpcserver->functions_parameters_type = 'epivals';
$xmlrpcserver->compress_response = false;
// register all the system methods
$systemmethods = array('listMethods', 'methodSignature', 'methodHelp', 'listServices', 'listFiles', 'retrieveFile', 'keyswap');
@ -303,11 +312,11 @@ function mnet_server_dispatch($payload) {
$handler = 'mnet_keyswap';
}
if ($method == 'system.' . $m || $method == 'system/' . $m) {
xmlrpc_server_register_method($xmlrpcserver, $method, $handler);
$response = xmlrpc_server_call_method($xmlrpcserver, $payload, $remoteclient, array("encoding" => "utf-8"));
$xmlrpcserver->add_to_map($method, $handler);
$xmlrpcserver->user_data = $remoteclient;
$response = $xmlrpcserver->service($payload, true);
$response = mnet_server_prepare_response($response);
echo $response;
xmlrpc_server_destroy($xmlrpcserver);
return;
}
}
@ -465,10 +474,14 @@ function mnet_server_invoke_plugin_method($method, $callstack, $rpcrecord, $payl
mnet_setup_dummy_method($method, $callstack, $rpcrecord);
$methodname = array_pop($callstack);
$xmlrpcserver = xmlrpc_server_create();
xmlrpc_server_register_method($xmlrpcserver, $method, 'mnet_server_dummy_method');
$response = xmlrpc_server_call_method($xmlrpcserver, $payload, $methodname, array("encoding" => "utf-8"));
xmlrpc_server_destroy($xmlrpcserver);
$xmlrpcserver = new \PhpXmlRpc\Server();
$xmlrpcserver->functions_parameters_type = 'epivals';
$xmlrpcserver->compress_response = false;
$xmlrpcserver->add_to_map($method, 'mnet_server_dummy_method');
$xmlrpcserver->user_data = $methodname;
$response = $xmlrpcserver->service($payload, true);
return $response;
}
@ -504,10 +517,15 @@ function mnet_server_invoke_dangerous_method($includefile, $methodname, $method,
if (!function_exists($functionname)) {
throw new mnet_server_exception(7012, "nosuchfunction");
}
$xmlrpcserver = xmlrpc_server_create();
xmlrpc_server_register_method($xmlrpcserver, $method, 'mnet_server_dummy_method');
$response = xmlrpc_server_call_method($xmlrpcserver, $payload, $methodname, array("encoding" => "utf-8"));
xmlrpc_server_destroy($xmlrpcserver);
$xmlrpcserver = new \PhpXmlRpc\Server();
$xmlrpcserver->functions_parameters_type = 'epivals';
$xmlrpcserver->compress_response = false;
$xmlrpcserver->add_to_map($method, 'mnet_server_dummy_method');
$xmlrpcserver->user_data = $methodname;
$response = $xmlrpcserver->service($payload, true);
return $response;
}
@ -556,6 +574,8 @@ function mnet_verify_permissions($rpcrecord) {
$id_list .= ', '.$CFG->mnet_all_hosts_id;
}
// TODO: Change this to avoid the first column duplicate debugging, keeping current behaviour 100%.
$sql = "SELECT
r.*, h2s.publish
FROM