MDL-16286 MDL16285 add comment & invert logic flow

(This diff is best viewed ignoring whitespace changes)
Ignore logic flow so that errors are dealt with first

Author: Peter Bulmer <peter.bulmer@catalyst.net.nz>

diff --git a/mnet/xmlrpc/client.php b/mnet/xmlrpc/client.php
index ee4ff245e3100143910d32716c7c5895e845a4f7..f19d22960e231a8e7aad4d58912f99d0e4cffbe4 100644 (file)
--- a/mnet/xmlrpc/client.php
+++ b/mnet/xmlrpc/client.php
@@ -160,53 +160,9 @@ class mnet_xmlrpc_client {
         $crypt_parser = new mnet_encxml_parser();
         $crypt_parser->parse($this->rawresponse);
 
-        if ($crypt_parser->payload_encrypted) {
-
-            $key  = array_pop($crypt_parser->cipher);
-            $data = array_pop($crypt_parser->cipher);
-
-            $crypt_parser->free_resource();
-
-            // Initialize payload var
-            $payload = '';
-
-            //                                          &$payload
-            $isOpen = openssl_open(base64_decode($data), $payload, base64_decode($key), $MNET->get_private_key());
-
-            if (!$isOpen) {
-                // Decryption failed... let's try our archived keys
-                $openssl_history = get_config('mnet', 'openssl_history');
-                if(empty($openssl_history)) {
-                    $openssl_history = array();
-                    set_config('openssl_history', serialize($openssl_history), 'mnet');
-                } else {
-                    $openssl_history = unserialize($openssl_history);
-                }
-                foreach($openssl_history as $keyset) {
-                    $keyresource = openssl_pkey_get_private($keyset['keypair_PEM']);
-                    $isOpen      = openssl_open(base64_decode($data), $payload, base64_decode($key), $keyresource);
-                    if ($isOpen) {
-                        // It's an older code, sir, but it checks out
-                        break;
-                    }
-                }
-            }
-
-            if (!$isOpen) {
-                trigger_error("None of our keys could open the payload from host {$mnet_peer->wwwroot} with id {$mnet_peer->id}.");
-                $this->error[] = '3:No key match';
-                return false;
-            }
-
-            if (strpos(substr($payload, 0, 100), '<signedMessage>')) {
-                $sig_parser = new mnet_encxml_parser();
-                $sig_parser->parse($payload);
-            } else {
-                $this->error[] = '2:Payload not signed: '.$payload;
-                return false;
-            }
-
-        } else {
+        // If we couldn't parse the message, or it doesn't seem to have encrypted contents,
+        // give the most specific error msg available & return
+        if (!$crypt_parser->payload_encrypted) {
             if (! empty($crypt_parser->remoteerror)) {
                 $this->error[] = '4: remote server error: ' . $crypt_parser->remoteerror;
             } else if (! empty($crypt_parser->error)) {
@@ -228,6 +184,50 @@ class mnet_xmlrpc_client {
             return false;
         }
 
+        $key  = array_pop($crypt_parser->cipher);
+        $data = array_pop($crypt_parser->cipher);
+
+        $crypt_parser->free_resource();
+
+        // Initialize payload var
+        $payload = '';
+
+        //                                          &$payload
+        $isOpen = openssl_open(base64_decode($data), $payload, base64_decode($key), $MNET->get_private_key());
+
+        if (!$isOpen) {
+            // Decryption failed... let's try our archived keys
+            $openssl_history = get_config('mnet', 'openssl_history');
+            if(empty($openssl_history)) {
+                $openssl_history = array();
+                set_config('openssl_history', serialize($openssl_history), 'mnet');
+            } else {
+                $openssl_history = unserialize($openssl_history);
+            }
+            foreach($openssl_history as $keyset) {
+                $keyresource = openssl_pkey_get_private($keyset['keypair_PEM']);
+                $isOpen      = openssl_open(base64_decode($data), $payload, base64_decode($key), $keyresource);
+                if ($isOpen) {
+                    // It's an older code, sir, but it checks out
+                    break;
+                }
+            }
+        }
+
+        if (!$isOpen) {
+            trigger_error("None of our keys could open the payload from host {$mnet_peer->wwwroot} with id {$mnet_peer->id}.");
+            $this->error[] = '3:No key match';
+            return false;
+        }
+
+        if (strpos(substr($payload, 0, 100), '<signedMessage>')) {
+            $sig_parser = new mnet_encxml_parser();
+            $sig_parser->parse($payload);
+        } else {
+            $this->error[] = '2:Payload not signed: '.$payload;
+            return false;
+        }
+
         // Margin of error is the time it took the request to complete.
         $margin_of_error  = $timestamp_receive - $timestamp_send;