From cfb1986ad05808e1467a0badb549916be9c8df4c Mon Sep 17 00:00:00 2001 From: Arinerron Date: Tue, 1 May 2018 23:25:44 -0700 Subject: [PATCH] Add run check to node introduction function --- onionr/core.py | 41 +++++++++++++++++++++++++++++------------ onionr/onionr.py | 4 ++-- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/onionr/core.py b/onionr/core.py index b978cfb4..912e7efd 100644 --- a/onionr/core.py +++ b/onionr/core.py @@ -611,12 +611,15 @@ class Core: ''' Inserts a block into the network ''' + try: data.decode() except AttributeError: data = data.encode() + retData = '' metadata = {'type': header} + if sign: signature = self._crypto.edSign(data, self._crypto.privKey, encodeResult=True) ourID = self._crypto.pubKeyHashID() @@ -627,8 +630,10 @@ class Core: pass metadata['id'] = ourID metadata['sig'] = signature + metadata = json.dumps(metadata) metadata = metadata.encode() + if len(data) == 0: logger.error('Will not insert empty block') else: @@ -642,16 +647,28 @@ class Core: ''' Introduces our node into the network by telling X many nodes our HS address ''' - announceAmount = 2 - nodeList = self.listAdders() - if len(nodeList) == 0: - for i in self.bootstrapList: - if self._utils.validateID(i): - self.addAddress(i) - nodeList.append(i) - if announceAmount > len(nodeList): - announceAmount = len(nodeList) - for i in range(announceAmount): - self.daemonQueueAdd('announceNode', nodeList[i]) - events.event('introduction', onionr = None) + + if(self._utils.isCommunicatorRunning()): + announceAmount = 2 + nodeList = self.listAdders() + + if len(nodeList) == 0: + for i in self.bootstrapList: + if self._utils.validateID(i): + self.addAddress(i) + nodeList.append(i) + + if announceAmount > len(nodeList): + announceAmount = len(nodeList) + + for i in range(announceAmount): + self.daemonQueueAdd('announceNode', nodeList[i]) + + events.event('introduction', onionr = None) + + return True + else: + logger.error('Onionr daemon is not running.') + return False + return diff --git a/onionr/onionr.py b/onionr/onionr.py index 096ac9f7..5e7c6cd5 100755 --- a/onionr/onionr.py +++ b/onionr/onionr.py @@ -203,13 +203,13 @@ class Onionr: 'disable-plugin': 'Disables and stops a plugin', 'reload-plugin': 'Reloads a plugin', 'create-plugin': 'Creates directory structure for a plugin', - 'add-peer': 'Adds a peer (?)', + 'add-peer': 'Adds a peer to database', 'list-peers': 'Displays a list of peers', 'add-msg': 'Broadcasts a message to the Onionr network', 'pm': 'Adds a private message to block', 'get-pms': 'Shows private messages sent to you', 'addfile': 'Create an Onionr block from a file', - 'introduce': 'Introduce your node to the public Onionr network (DAEMON MUST BE RUNNING)', + 'introduce': 'Introduce your node to the public Onionr network', } # initialize plugins