test

onionr/api.py

@@ -150,14 +150,17 @@ class API:
 
             self.validateHost('private')
 
+            if config.get('www.public.guess_mime', True):
+                self.mimeType = API.guessMime(path)
+
             endTime = math.floor(time.time())
             elapsed = endTime - startTime
 
             if not hmac.compare_digest(timingToken, self.timeBypassToken):
-                if elapsed < self._privateDelayTime:
+                if (elapsed < self._privateDelayTime) and config.get('www.private.timing_protection', True):
                     time.sleep(self._privateDelayTime - elapsed)
 
-            return send_from_directory('static-data/www/private/', path)
+            return send_from_directory(config.get('www.private.path', 'static-data/www/private/'), path)
 
         @app.route('/www/public/<path:path>')
         def www_public(path):
@@ -166,7 +169,10 @@ class API:
 
             self.validateHost('public')
 
-            return send_from_directory('static-data/www/public/', path)
+            if config.get('www.public.guess_mime', True):
+                self.mimeType = API.guessMime(path)
+
+            return send_from_directory(config.get('www.public.path', 'static-data/www/public/'), path)
 
         @app.route('/ui/<path:path>')
         def ui_private(path):

onionr/communicator2.py

@@ -87,8 +87,8 @@ class OnionrCommunicatorDaemon:
         OnionrCommunicatorTimers(self, self.daemonCommands, 5)
         OnionrCommunicatorTimers(self, self.detectAPICrash, 5)
         peerPoolTimer = OnionrCommunicatorTimers(self, self.getOnlinePeers, 60, maxThreads=1)
-        OnionrCommunicatorTimers(self, self.lookupBlocks, self._core.config.get('timers.lookupBlocks'), requiresPeer=True, maxThreads=1)
+        OnionrCommunicatorTimers(self, self.lookupBlocks, self._core.config.get('timers.lookup_blocks'), requiresPeer=True, maxThreads=1)
-        OnionrCommunicatorTimers(self, self.getBlocks, self._core.config.get('timers.getBlocks'), requiresPeer=True)
+        OnionrCommunicatorTimers(self, self.getBlocks, self._core.config.get('timers.get_blocks'), requiresPeer=True)
         OnionrCommunicatorTimers(self, self.clearOfflinePeer, 58)
         OnionrCommunicatorTimers(self, self.daemonTools.cleanOldBlocks, 65)
         OnionrCommunicatorTimers(self, self.lookupKeys, 60, requiresPeer=True)
@@ -298,7 +298,7 @@ class OnionrCommunicatorDaemon:
         '''Manages the self.onlinePeers attribute list, connects to more peers if we have none connected'''
 
         logger.info('Refreshing peer pool.')
-        maxPeers = int(config.get('peers.maxConnect'))
+        maxPeers = int(config.get('peers.max_connect', 10))
         needed = maxPeers - len(self.onlinePeers)
 
         for i in range(needed):
@@ -339,7 +339,7 @@ class OnionrCommunicatorDaemon:
             self.addBootstrapListToPeerList(peerList)
 
         for address in peerList:
-            if not config.get('tor.v3onions') and len(address) == 62:
+            if not config.get('tor.v3_onions') and len(address) == 62:
                 continue
             if len(address) == 0 or address in tried or address in self.onlinePeers or address in self.cooldownPeer:
                 continue
@@ -543,7 +543,7 @@ class OnionrCommunicatorTimers:
                 if self.makeThread:
                     for i in range(self.threadAmount):
                         if self.daemonInstance.threadCounts[self.timerFunction.__name__] >= self.maxThreads:
-                            logger.warn(self.timerFunction.__name__ + ' has too many current threads to start anymore.')
+                            logger.warn('%s is currently using the maximum number of threads, not starting another.' % self.timerFunction.__name__)
                         else:
                             self.daemonInstance.threadCounts[self.timerFunction.__name__] += 1
                             newThread = threading.Thread(target=self.timerFunction)

onionr/core.py

@@ -126,7 +126,7 @@ class Core:
         '''
             Add an address to the address database (only tor currently)
         '''
-        if address == config.get('i2p.ownAddr', None):
+        if address == config.get('i2p.own_addr', None):
 
             return False
         if self._utils.validateID(address):

onionr/netcontroller.py

@@ -49,7 +49,7 @@ class NetController:
             Generate a torrc file for our tor instance
         '''
         hsVer = '# v2 onions'
-        if config.get('tor.v3onions'):
+        if config.get('tor.v3_onions'):
             hsVer = 'HiddenServiceVersion 3'
             logger.info('Using v3 onions :)')
         if os.path.exists(self.torConfigLocation):

onionr/onionrblockapi.py

@@ -762,7 +762,7 @@ class Block:
             return False
 
         # dump old cached blocks if the size exeeds the maximum
-        if sys.getsizeof(Block.blockCacheOrder) >= config.get('allocations.blockCacheTotal', 50000000): # 50MB default cache size
+        if sys.getsizeof(Block.blockCacheOrder) >= config.get('allocations.block_cache_total', 50000000): # 50MB default cache size
             del Block.blockCache[blockCacheOrder.pop(0)]
 
         # cache block content

onionr/onionrdaemontools.py

@@ -88,7 +88,7 @@ class DaemonTools:
                 del self.daemon.cooldownPeer[peer]
 
         # Cool down a peer, if we have max connections alive for long enough
-        if onlinePeerAmount >= self.daemon._core.config.get('peers.maxConnect'):
+        if onlinePeerAmount >= self.daemon._core.config.get('peers.max_connect', 10):
             finding = True
             while finding:
                 try:

onionr/onionrpeers.py

@@ -79,8 +79,8 @@ def peerCleanup(coreInst):
     logger.info('Cleaning peers...')
     config.reload()
 
-    minScore = int(config.get('peers.minimumScore'))
+    minScore = int(config.get('peers.minimum_score', -100))
-    maxPeers = int(config.get('peers.maxStoredPeers'))
+    maxPeers = int(config.get('peers.max_stored', 5000))
 
     adders = getScoreSortedPeerList(coreInst)
     adders.reverse()

onionr/onionrutils.py

@@ -131,11 +131,11 @@ class OnionrUtils:
                 for adder in newAdderList.split(','):
                     adder = adder.strip()
                     if not adder in self._core.listAdders(randomOrder = False) and adder != self.getMyAddress() and not self._core._blacklist.inBlacklist(adder):
-                        if not config.get('tor.v3onions') and len(adder) == 62:
+                        if not config.get('tor.v3_onions') and len(adder) == 62:
                             continue
                         if self._core.addAddress(adder):
                             # Check if we have the maxmium amount of allowed stored peers
-                            if config.get('peers.maxStoredPeers') > len(self._core.listAdders()):
+                            if config.get('peers.max_stored') > len(self._core.listAdders()):
                                 logger.info('Added %s to db.' % adder, timestamp = True)
                                 retVal = True
                             else:

onionr/static-data/default_config.json

@@ -11,11 +11,16 @@
 
     "www" : {
         "public" : {
-            "run" : true
+            "run" : true,
+            "path" : "static-data/www/public/",
+            "guess_mime" : true
         },
 
         "private" : {
-            "run" : true
+            "run" : true,
+            "path" : "static-data/www/private/",
+            "guess_mime" : true,
+            "timing_protection" : true
         },
 
         "ui" : {
@@ -47,22 +52,24 @@
     "i2p" : {
     	"host" : false,
         "connect" : true,
-        "ownAddr": ""
+        "own_addr" : ""
      },
 
     "allocations" : {
         "disk" : 10000000000,
-        "netTotal": 1000000000,
+        "net_total" : 1000000000,
         "blockCache" : 5000000,
         "blockCacheTotal" : 50000000
     },
+
     "peers" : {
-        "minimumScore": -100,
+        "minimum_score" : -100,
-        "maxStoredPeers": 5000,
+        "max_stored_peers" : 5000,
-        "maxConnect": 10
+        "max_connect" : 10
     },
+
     "timers" : {
-        "lookupBlocks": 25,
+        "lookup_blocks" : 25,
-        "getBlocks": 30
+        "get_blocks" : 30
     }
 }