Misc changes

- made stuff pretty
- fixed bugs
- refactored stuff

onionr/communicator2.py

@@ -87,6 +87,7 @@ class OnionrCommunicatorDaemon:
 
         # Set timers, function reference, seconds
         # requiresPeer True means the timer function won't fire if we have no connected peers
+        OnionrCommunicatorTimers(self, self.runCheck, 1)
         OnionrCommunicatorTimers(self, self.daemonCommands, 5)
         OnionrCommunicatorTimers(self, self.detectAPICrash, 5)
         peerPoolTimer = OnionrCommunicatorTimers(self, self.getOnlinePeers, 60, maxThreads=1)
@@ -133,7 +134,7 @@ class OnionrCommunicatorDaemon:
 
     def lookupAdders(self):
         '''Lookup new peer addresses'''
-        logger.info('LOOKING UP NEW ADDRESSES')
+        logger.info('Looking up new addresses...')
         tryAmount = 1
         for i in range(tryAmount):
             # Download new peer address list from random online peers
@@ -144,7 +145,7 @@ class OnionrCommunicatorDaemon:
 
     def lookupBlocks(self):
         '''Lookup new blocks & add them to download queue'''
-        logger.info('LOOKING UP NEW BLOCKS')
+        logger.info('Looking up new blocks...')
         tryAmount = 2
         newBlocks = ''
         existingBlocks = self._core.getBlockList()
@@ -175,7 +176,7 @@ class OnionrCommunicatorDaemon:
                 try:
                     newBlocks = self.peerAction(peer, 'getBlockHashes') # get list of new block hashes
                 except Exception as error:
-                    logger.warn("could not get new blocks with " + peer, error=error)
+                    logger.warn('Could not get new blocks from %s.' % peer, error = error)
                     newBlocks = False
                 if newBlocks != False:
                     # if request was a success
@@ -199,10 +200,10 @@ class OnionrCommunicatorDaemon:
                 break
             # Do not download blocks being downloaded or that are already saved (edge cases)
             if blockHash in self.currentDownloading:
-                logger.debug('ALREADY DOWNLOADING ' + blockHash)
+                logger.debug('Already downloading block %s...' % blockHash)
                 continue
             if blockHash in self._core.getBlockList():
-                logger.debug('%s is already saved' % (blockHash,))
+                logger.debug('Block %s is already saved.' % (blockHash,))
                 self.blockQueue.remove(blockHash)
                 continue
             if self._core._blacklist.inBlacklist(blockHash):
@@ -231,22 +232,22 @@ class OnionrCommunicatorDaemon:
                     #meta = metas[1]
                     if self._core._utils.validateMetadata(metadata, metas[2]): # check if metadata is valid, and verify nonce
                         if self._core._crypto.verifyPow(content): # check if POW is enough/correct
-                            logger.info('Block passed proof, attempting save.')
+                            logger.info('Attempting to save block %s...' % blockHash)
                             try:
                                 self._core.setData(content)
                             except onionrexceptions.DiskAllocationReached:
-                                logger.error("Reached disk allocation allowance, cannot save this block.")
+                                logger.error('Reached disk allocation allowance, cannot save block %s.' % blockHash)
                                 removeFromQueue = False
                             else:
                                 self._core.addToBlockDB(blockHash, dataSaved=True)
                                 self._core._utils.processBlockMetadata(blockHash) # caches block metadata values to block database
                         else:
-                            logger.warn('POW failed for block ' + blockHash)
+                            logger.warn('POW failed for block %s.' % blockHash)
                     else:
                         if self._core._blacklist.inBlacklist(realHash):
-                            logger.warn('%s is blacklisted' % (realHash,))
+                            logger.warn('Block %s is blacklisted.' % (realHash,))
                         else:
-                            logger.warn('Metadata for ' + blockHash + ' is invalid.')
+                            logger.warn('Metadata for block %s is invalid.' % blockHash)
                             self._core._blacklist.addToDB(blockHash)
                 else:
                     # if block didn't meet expected hash
@@ -456,7 +457,7 @@ class OnionrCommunicatorDaemon:
                     self.announce(cmd[1])
                 else:
                     logger.warn("Not introducing, since I have no connected nodes.")
-            elif cmd[0] == 'runCheck':
+            elif cmd[0] == 'runCheck': # deprecated
                 logger.debug('Status check; looks good.')
                 open(self._core.dataDir + '.runcheck', 'w+').close()
             elif cmd[0] == 'connectedPeers':
@@ -525,6 +526,12 @@ class OnionrCommunicatorDaemon:
                 self.shutdown = True
         self.decrementThreadCount('detectAPICrash')
 
+    def runCheck(self):
+        if self.daemonTools.runCheck():
+            logger.debug('Status check; looks good.')
+
+        self.decrementThreadCount('runCheck')
+
 class OnionrCommunicatorTimers:
     def __init__(self, daemonInstance, timerFunction, frequency, makeThread=True, threadAmount=1, maxThreads=5, requiresPeer=False):
         self.timerFunction = timerFunction

onionr/core.py

@@ -179,7 +179,7 @@ class Core:
 
             return True
         else:
-            logger.debug('Invalid ID')
+            logger.debug('Invalid ID: %s' % address)
             return False
 
     def removeAddress(self, address):

onionr/onionr.py

@@ -156,6 +156,16 @@ class Onionr:
             'status': self.showStats,
             'statistics': self.showStats,
             'stats': self.showStats,
+            'details' : self.showDetails,
+            'detail' : self.showDetails,
+            'show-details' : self.showDetails,
+            'show-detail' : self.showDetails,
+            'showdetails' : self.showDetails,
+            'showdetail' : self.showDetails,
+            'get-details' : self.showDetails,
+            'get-detail' : self.showDetails,
+            'getdetails' : self.showDetails,
+            'getdetail' : self.showDetails,
 
             'enable-plugin': self.enablePlugin,
             'enplugin': self.enablePlugin,
@@ -188,7 +198,6 @@ class Onionr:
 
             'add-file': self.addFile,
             'addfile': self.addFile,
-
             'get-file': self.getFile,
             'getfile': self.getFile,
 
@@ -204,16 +213,6 @@ class Onionr:
 
             'ui' : self.openUI,
             'gui' : self.openUI,
-
-            'getpassword': self.printWebPassword,
-            'get-password': self.printWebPassword,
-            'getpwd': self.printWebPassword,
-            'get-pwd': self.printWebPassword,
-            'getpass': self.printWebPassword,
-            'get-pass': self.printWebPassword,
-            'getpasswd': self.printWebPassword,
-            'get-passwd': self.printWebPassword,
-
             'chat': self.startChat,
 
             'friend': self.friendCmd
@@ -261,6 +260,18 @@ class Onionr:
         THIS SECTION HANDLES THE COMMANDS
     '''
 
+    def showDetails(self):
+        details = {
+            'Node Address' : self.get_hostname(),
+            'Web Password' : self.getWebPassword(),
+            'Public Key' : self.onionrCore._crypto.pubKey,
+            'Human-readable Public Key' : self.onionrCore._utils.getHumanReadableID()
+        }
+
+        for detail in details:
+            logger.info('%s%s: \n%s%s\n' % (logger.colors.fg.lightgreen, detail, logger.colors.fg.green, details[detail]), sensitive = True)
+
+
     def startChat(self):
         try:
             data = json.dumps({'peer': sys.argv[2], 'reason': 'chat'})
@@ -427,9 +438,7 @@ class Onionr:
             Displays a list of keys (used to be called peers) (?)
         '''
 
-        logger.info('Public keys in database:\n')
+        logger.info('%sPublic keys in database: \n%s%s' % (logger.colors.fg.lightgreen, logger.colors.fg.green, '\n'.join(self.onionrCore.listPeers())))
-        for i in self.onionrCore.listPeers():
-            logger.info(i)
 
     def addPeer(self):
         '''
@@ -618,8 +627,14 @@ class Onionr:
         '''
             Starts the Onionr communication daemon
         '''
+
         communicatorDaemon = './communicator2.py'
 
+        # remove runcheck if it exists
+        if os.path.isfile('data/.runcheck'):
+            logger.debug('Runcheck file found on daemon start, deleting in advance.')
+            os.remove('data/.runcheck')
+
         apiThread = Thread(target=api.API, args=(self.debug,API_VERSION))
         apiThread.start()
         try:
@@ -689,9 +704,6 @@ class Onionr:
             messages = {
                 # info about local client
                 'Onionr Daemon Status' : ((logger.colors.fg.green + 'Online') if self.onionrUtils.isCommunicatorRunning(timeout = 9) else logger.colors.fg.red + 'Offline'),
-                'Public Key' : self.onionrCore._crypto.pubKey,
-                'Human readable public key' : self.onionrCore._utils.getHumanReadableID(),
-                'Node Address' : self.get_hostname(),
 
                 # file and folder size stats
                 'div1' : True, # this creates a solid line across the screen, a div

onionr/onionrdaemontools.py

@@ -17,8 +17,10 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
-import onionrexceptions, onionrpeers, onionrproofs, base64, logger, onionrusers, sqlite3
+import onionrexceptions, onionrpeers, onionrproofs, logger, onionrusers
+import base64, sqlite3, os
 from dependencies import secrets
+
 class DaemonTools:
     def __init__(self, daemon):
             self.daemon = daemon
@@ -131,3 +133,10 @@ class DaemonTools:
                 self.daemon.removeOnlinePeer(toCool)
                 self.daemon.cooldownPeer[toCool] = self.daemon._core._utils.getEpoch()
         self.daemon.decrementThreadCount('cooldownPeer')
+
+    def runCheck(self):
+        if os.path.isfile('data/.runcheck'):
+            os.remove('data/.runcheck')
+            return True
+
+        return False

onionr/onionrusers.py

@@ -150,7 +150,7 @@ class OnionrUser:
         pubkey = self._core._utils.bytesToStr(pubkey)
         command = (pubkey,)
         keyList = [] # list of tuples containing pub, private for peer
-        for result in c.execute("SELECT * FROM myForwardKeys WHERE peer=?", command):
+        for result in c.execute("SELECT * FROM myForwardKeys WHERE peer = ?", command):
             keyList.append((result[1], result[2]))
         if len(keyList) == 0:
             if genNew:

onionr/onionrutils.py

@@ -519,18 +519,16 @@ class OnionrUtils:
         try:
             runcheck_file = self._core.dataDir + '.runcheck'
 
-            if os.path.isfile(runcheck_file):
+            if not os.path.isfile(runcheck_file):
-                os.remove(runcheck_file)
+                open(runcheck_file, 'w+').close()
-                logger.debug('%s file appears to have existed before the run check.' % runcheck_file, timestamp = False)
 
-            self._core.daemonQueueAdd('runCheck')
+            # self._core.daemonQueueAdd('runCheck') # deprecated
             starttime = time.time()
 
             while True:
                 time.sleep(interval)
-                if os.path.isfile(runcheck_file):
+                
-                    os.remove(runcheck_file)
+                if not os.path.isfile(runcheck_file):
-
                     return True
                 elif time.time() - starttime >= timeout:
                     return False
@@ -541,6 +539,7 @@ class OnionrUtils:
         '''
             Generates a secure random hex encoded token
         '''
+
         return binascii.hexlify(os.urandom(size))
 
     def importNewBlocks(self, scanDir=''):

onionr/static-data/www/ui/src/js/main.js

@@ -641,7 +641,7 @@ if(tt !== null && tt !== undefined) {
 if(getWebPassword() === null) {
     var password = "";
     while(password.length != 64) {
-        password = prompt("Please enter the web password (run `./RUN-LINUX.sh --get-password`)");
+        password = prompt("Please enter the web password (run `./RUN-LINUX.sh --details`)");
     }
 
     setWebPassword(password);