Added exception InvalidPrivateKeyHashException and checked if private key's hash...

[hub.git] / application / hub / classes / package / class_NetworkPackage.php

diff --git a/application/hub/classes/package/class_NetworkPackage.php b/application/hub/classes/package/class_NetworkPackage.php
index bc471498e948c0aafe883b81c6133800de03a809..abf479254dd98e86a4f5b9748c6d51536fb25ab4 100644 (file)
--- a/application/hub/classes/package/class_NetworkPackage.php
+++ b/application/hub/classes/package/class_NetworkPackage.php
@@ -346,6 +346,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
         *
         * @param       $decodedData    Array with decoded data
         * @return      $hash                   Private key's hash
+        * @throws      InvalidPrivateKeyHashException  If the private key's hash is not valid
         */
        private function determineSenderPrivateKeyHash (array $decodedData) {
                // Get DHT instance
@@ -363,7 +364,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                        // Don't accept empty hashes
                        if (empty($senderData[NodeDistributedHashTableDatabaseWrapper::DB_COLUMN_PRIVATE_KEY_HASH])) {
                                // Don't accept
-                               die('[' . __METHOD__ . ':' . __LINE__ . ':] Empty private key hash: senderData=' . print_r($senderData, TRUE));
+                               throw new InvalidPrivateKeyHashException(array($this, $senderData, 'empty hash in senderData'));
                        } // END - if
 
                        // Return it
@@ -377,7 +378,7 @@ class NetworkPackage extends BaseHubSystem implements Deliverable, Receivable, R
                // Don't accept empty keys
                if (empty($decodedData[self::PACKAGE_CONTENT_PRIVATE_KEY_HASH])) {
                        // This needs fixing
-                       die('[' . __METHOD__ . ':' . __LINE__ . ':] Empty private key hash: decodedData=' . print_r($decodedData, TRUE));
+                       throw new InvalidPrivateKeyHashException(array($this, $senderData, 'empty hash in decodedData'));
                } // END - if
 
                // There is no DHT entry so, accept the hash from decoded data