+ Have Tor reject socks requests to non-onion services as a small security measure

* More refactoring

onionr/communicatorutils/connectnewpeers.py

@@ -0,0 +1,80 @@
+'''
+    Onionr - P2P Microblogging Platform & Social network
+
+    Connect a new peer to our communicator instance. Does so randomly if no peer is specified
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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 time
+import onionrexceptions, logger, onionrpeers
+from utils import networkmerger
+def connect_new_peer_to_communicator(comm_inst, peer='', useBootstrap=False):
+    config = comm_inst._core.config
+    retData = False
+    tried = comm_inst.offlinePeers
+    if peer != '':
+        if comm_inst._core._utils.validateID(peer):
+            peerList = [peer]
+        else:
+            raise onionrexceptions.InvalidAddress('Will not attempt connection test to invalid address')
+    else:
+        peerList = comm_inst._core.listAdders()
+
+    mainPeerList = comm_inst._core.listAdders()
+    peerList = onionrpeers.getScoreSortedPeerList(comm_inst._core)
+
+    if len(peerList) < 8 or secrets.randbelow(4) == 3:
+        tryingNew = []
+        for x in comm_inst.newPeers:
+            if x not in peerList:
+                peerList.append(x)
+                tryingNew.append(x)
+        for i in tryingNew:
+            comm_inst.newPeers.remove(i)
+    
+    if len(peerList) == 0 or useBootstrap:
+        # Avoid duplicating bootstrap addresses in peerList
+        comm_inst.addBootstrapListToPeerList(peerList)
+
+    for address in peerList:
+        if not config.get('tor.v3onions') and len(address) == 62:
+            continue
+        if address == comm_inst._core.hsAddress:
+            continue
+        if len(address) == 0 or address in tried or address in comm_inst.onlinePeers or address in comm_inst.cooldownPeer:
+            continue
+        if comm_inst.shutdown:
+            return
+        if comm_inst.peerAction(address, 'ping') == 'pong!':
+            time.sleep(0.1)
+            if address not in mainPeerList:
+                networkmerger.mergeAdders(address, comm_inst._core)
+            if address not in comm_inst.onlinePeers:
+                logger.info('Connected to ' + address)
+                comm_inst.onlinePeers.append(address)
+                comm_inst.connectTimes[address] = comm_inst._core._utils.getEpoch()
+            retData = address
+
+            # add peer to profile list if they're not in it
+            for profile in comm_inst.peerProfiles:
+                if profile.address == address:
+                    break
+            else:
+                comm_inst.peerProfiles.append(onionrpeers.PeerProfiles(address, comm_inst._core))
+            break
+        else:
+            tried.append(address)
+            logger.debug('Failed to connect to ' + address)
+    return retData

onionr/communicatorutils/downloadblocks.py

@@ -1,3 +1,22 @@
+'''
+    Onionr - P2P Microblogging Platform & Social network
+
+    Download blocks using the communicator instance
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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 communicator, onionrexceptions
 import logger
 

onionr/communicatorutils/lookupblocks.py

@@ -1,3 +1,22 @@
+'''
+    Onionr - P2P Microblogging Platform & Social network
+
+    Lookup new blocks with the communicator using a random connected peer
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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 logger, onionrproofs
 def lookup_blocks_from_communicator(comm_inst):
         logger.info('Looking up new blocks...')

onionr/communicatorutils/reversesync.py

@@ -0,0 +1,4 @@
+class ReverseSync:
+    def __init__(self, communicator_inst):
+        return
+    

onionr/communicatorutils/uploadblocks.py

@@ -0,0 +1,52 @@
+'''
+    Onionr - P2P Microblogging Platform & Social network
+
+    Upload blocks in the upload queue to peers from the communicator
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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 logger
+from communicatorutils import proxypicker
+import onionrblockapi as block
+
+def upload_blocks_from_communicator(comm_inst):
+    # when inserting a block, we try to upload it to a few peers to add some deniability
+    triedPeers = []
+    finishedUploads = []
+    comm_inst.blocksToUpload = comm_inst._core._crypto.randomShuffle(comm_inst.blocksToUpload)
+    if len(comm_inst.blocksToUpload) != 0:
+        for bl in comm_inst.blocksToUpload:
+            if not comm_inst._core._utils.validateHash(bl):
+                logger.warn('Requested to upload invalid block')
+                comm_inst.decrementThreadCount('uploadBlock')
+                return
+            for i in range(min(len(comm_inst.onlinePeers), 6)):
+                peer = comm_inst.pickOnlinePeer()
+                if peer in triedPeers:
+                    continue
+                triedPeers.append(peer)
+                url = 'http://' + peer + '/upload'
+                data = {'block': block.Block(bl).getRaw()}
+                proxyType = proxypicker.pick_proxy(peer)
+                logger.info("Uploading block to " + peer)
+                if not comm_inst._core._utils.doPostRequest(url, data=data, proxyType=proxyType) == False:
+                    comm_inst._core._utils.localCommand('waitforshare/' + bl, post=True)
+                    finishedUploads.append(bl)
+    for x in finishedUploads:
+        try:
+            comm_inst.blocksToUpload.remove(x)
+        except ValueError:
+            pass
+    comm_inst.decrementThreadCount('uploadBlock')