yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 18:29:40 +02:00
Code Issues Releases Wiki Activity

XML-RPC uses now a sha256 digest

Browse source
This commit is contained in:
dipsol 2008-12-11 16:53:14 +00:00
parent 93f3c4e929
commit f3bb93b2bf
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/class/xmlrpcclient.class.php
View file

@ -51,7 +51,7 @@ class xmlRpcClient {
// Build our key // Build our key
$timestamp = time(); $timestamp = time();
$handshake_key = md5($timestamp . $key); $handshake_key = hash('sha256',$timestamp . hash('sha256',$key));
$encoded_key = new XML_RPC_Value($handshake_key,'string'); $encoded_key = new XML_RPC_Value($handshake_key,'string');
$timestamp = new XML_RPC_Value($timestamp,'int'); $timestamp = new XML_RPC_Value($timestamp,'int');
@ -61,7 +61,7 @@ class xmlRpcClient {
$response = $client->send($xmlrpc_message,10); $response = $client->send($xmlrpc_message,10);
if ($response->faultCode()) { if ($response->faultCode()) {
$error_msg = _('Error connecting to') . " " . $server . " " . _("Code") . ": " . $response->faultCode() . " " . _("Reason") . ": " . $response->faultString(); $error_msg = _('Error connecting to') . " " . $client->server . " " . _("Code") . ": " . $response->faultCode() . " " . _("Reason") . ": " . $response->faultString();
debug_event('XMLCLIENT',$error_msg,'1'); debug_event('XMLCLIENT',$error_msg,'1');
Error::add('general',$error_msg); Error::add('general',$error_msg);
return; return;
@ -69,7 +69,7 @@ class xmlRpcClient {
$token = XML_RPC_Decode($response->value()); $token = XML_RPC_Decode($response->value());
debug_event('XML-RPC',$token . ' returned from ' . $server,'3'); debug_event('XML-RPC',$token . ' returned from ' . $client->server,'3');
return $token; return $token;
@ -94,14 +94,14 @@ class xmlRpcClient {
$response = $client->send($xmlrpc_message,4); $response = $client->send($xmlrpc_message,4);
if ($response->faultCode() ) { if ($response->faultCode() ) {
$error_msg = _("Error connecting to") . " " . $server . " " . _("Code") . ": " . $response->faultCode() . " " . $error_msg = _("Error connecting to") . " " . $client->server . " " . _("Code") . ": " . $response->faultCode() . " " .
debug_event('XMLCLIENT',$error_msg,'1'); debug_event('XMLCLIENT',$error_msg,'1');
return false; return false;
} }
$sid = XML_RPC_Decode($response->value()); $sid = XML_RPC_Decode($response->value());
debug_event('XML-RPC', $sid . ' stream session ID returned from ' . $server,'3'); debug_event('XML-RPC', $sid . ' stream session ID returned from ' . $client->server,'3');
return $sid; return $sid;

4
lib/class/xmlrpcserver.class.php
View file

@ -222,8 +222,8 @@ class xmlRpcServer {
while ($row = Dba::fetch_assoc($db_results)) { while ($row = Dba::fetch_assoc($db_results)) {
// Build our encoded passphrase // Build our encoded passphrase
$md5pass = md5($timestamp . $row['key']); $sha256pass = hash('sha256',$timestamp . hash('sha256',$row['key']));
if ($md5pass == $encoded_key) { if ($sha256pass == $encoded_key) {
$data['type'] = 'xml-rpc'; $data['type'] = 'xml-rpc';
$data['username'] = 'System'; $data['username'] = 'System';
$data['value'] = 'Handshake'; $data['value'] = 'Handshake';