From 348ec1081fb776ba0a8163292e59161ff70a854e Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sat, 20 Jul 2019 01:02:30 -0500 Subject: [PATCH] progress in removing core --- onionr/apiservers/public/__init__.py | 2 +- onionr/communicator/__init__.py | 8 +- onionr/communicator/bootstrappeers.py | 2 +- onionr/communicator/peeraction.py | 2 +- onionr/communicatorutils/housekeeping.py | 6 +- onionr/coredb/dbfiles.py | 5 +- onionr/coredb/keydb/addkeys.py | 2 +- onionr/onionr.py | 3 +- onionr/onionrpeers/peerprofiles.py | 7 +- onionr/onionrutils/basicrequests.py | 2 +- onionr/onionrutils/localcommand.py | 28 +- onionr/static-data/bootstrap-nodes.txt | 2 +- .../default-plugins/esoteric/controlapi.py | 2 +- .../default-plugins/esoteric/main.py | 11 +- .../default-plugins/esoteric/peerserver.py | 15 +- .../default-plugins/metadataprocessor/main.py | 2 +- .../default-plugins/pluginmanager/.gitignore | 104 --- .../default-plugins/pluginmanager/LICENSE | 674 ------------------ .../default-plugins/pluginmanager/README.md | 2 - .../default-plugins/pluginmanager/info.json | 5 - .../default-plugins/pluginmanager/main.py | 614 ---------------- onionr/utils/createdirs.py | 19 +- onionr/utils/gettransports.py | 15 +- 23 files changed, 78 insertions(+), 1454 deletions(-) delete mode 100755 onionr/static-data/default-plugins/pluginmanager/.gitignore delete mode 100755 onionr/static-data/default-plugins/pluginmanager/LICENSE delete mode 100755 onionr/static-data/default-plugins/pluginmanager/README.md delete mode 100755 onionr/static-data/default-plugins/pluginmanager/info.json delete mode 100755 onionr/static-data/default-plugins/pluginmanager/main.py diff --git a/onionr/apiservers/public/__init__.py b/onionr/apiservers/public/__init__.py index e411ce75..00306022 100644 --- a/onionr/apiservers/public/__init__.py +++ b/onionr/apiservers/public/__init__.py @@ -34,7 +34,7 @@ class PublicAPI: self.i2pEnabled = config.get('i2p.host', False) self.hideBlocks = [] # Blocks to be denied sharing self.host = apiutils.setbindip.set_bind_IP(filepaths.public_API_host_file) - self.torAdder = gettransports.transports[0] + self.torAdder = gettransports.get()[0] self.bindPort = config.get('client.public.port') self.lastRequest = 0 self.hitCount = 0 # total rec requests to public api since server started diff --git a/onionr/communicator/__init__.py b/onionr/communicator/__init__.py index ed0fa05b..51e33e9b 100755 --- a/onionr/communicator/__init__.py +++ b/onionr/communicator/__init__.py @@ -29,8 +29,9 @@ from communicatorutils import daemonqueuehandler, announcenode, deniableinserts from communicatorutils import cooldownpeer, housekeeping, netcheck from onionrutils import localcommand, epoch from etc import humanreadabletime -import onionrservices, onionr, filepaths +import onionrservices, onionr, filepaths, storagecounter from coredb import daemonqueue, dbfiles +from utils import gettransports OnionrCommunicatorTimers = onionrcommunicatortimers.OnionrCommunicatorTimers config.reload() @@ -39,8 +40,11 @@ class OnionrCommunicatorDaemon: onionrInst.communicatorInst = self # configure logger and stuff onionr.Onionr.setupConfig('data/', self = self) + self.onionrInst = onionrInst + self.config = config + self.storage_counter = storagecounter.StorageCounter() self.proxyPort = proxyPort - + self.hsAddress = gettransports.get()[0] self.isOnline = True # Assume we're connected to the internet # list of timer instances diff --git a/onionr/communicator/bootstrappeers.py b/onionr/communicator/bootstrappeers.py index f3cec43d..243cec0e 100644 --- a/onionr/communicator/bootstrappeers.py +++ b/onionr/communicator/bootstrappeers.py @@ -25,6 +25,6 @@ def add_bootstrap_list_to_peer_list(comm_inst, peerList): Add the bootstrap list to the peer list (no duplicates) ''' for i in bootstrap_peers: - if i not in peerList and i not in comm_inst.offlinePeers and i != gettransports.get_transports()[0] and len(str(i).strip()) > 0: + if i not in peerList and i not in comm_inst.offlinePeers and i != gettransports.get()[0] and len(str(i).strip()) > 0: peerList.append(i) keydb.addkeys.add_address(i) \ No newline at end of file diff --git a/onionr/communicator/peeraction.py b/onionr/communicator/peeraction.py index fdf4e037..dc4fa9bf 100644 --- a/onionr/communicator/peeraction.py +++ b/onionr/communicator/peeraction.py @@ -33,7 +33,7 @@ def peer_action(comm_inst, peer, action, data='', returnHeaders=False, max_resp_ keydb.transportinfo.set_address_info(peer, 'lastConnectAttempt', epoch.get_epoch()) # mark the time we're trying to request this peer try: - retData = basicrequests.do_get_request(url, port=comm_inst.proxyPort, max_size=max_resp_size) + retData = basicrequests.do_get_request(comm_inst.onionrInst, url, port=comm_inst.proxyPort, max_size=max_resp_size) except streamedrequests.exceptions.ResponseLimitReached: logger.warn('Request failed due to max response size being overflowed', terminal=True) retData = False diff --git a/onionr/communicatorutils/housekeeping.py b/onionr/communicatorutils/housekeeping.py index 7dee9eb9..1b82e5b0 100755 --- a/onionr/communicatorutils/housekeeping.py +++ b/onionr/communicatorutils/housekeeping.py @@ -27,12 +27,12 @@ def clean_old_blocks(comm_inst): '''Delete old blocks if our disk allocation is full/near full, and also expired blocks''' # Delete expired blocks - for bHash in blockmetadb.get_expired_blocks(): + for bHash in blockmetadb.expiredblocks.get_expired_blocks(): comm_inst.blacklist.addToDB(bHash) removeblock.remove_block(bHash) logger.info('Deleted block: %s' % (bHash,)) - while comm_inst._core.storage_counter.isFull(): + while comm_inst.storage_counter.isFull(): oldest = blockmetadb.get_block_list()[0] comm_inst.blacklist.addToDB(oldest) removeblock.remove_block(oldest) @@ -57,6 +57,6 @@ def clean_keys(comm_inst): conn.commit() conn.close() - onionrusers.deleteExpiredKeys(comm_inst._core) + onionrusers.deleteExpiredKeys() comm_inst.decrementThreadCount('clean_keys') \ No newline at end of file diff --git a/onionr/coredb/dbfiles.py b/onionr/coredb/dbfiles.py index b920d1d6..fedbfdfb 100644 --- a/onionr/coredb/dbfiles.py +++ b/onionr/coredb/dbfiles.py @@ -1,9 +1,10 @@ from utils import identifyhome +import filepaths home = identifyhome.identify_home() if not home.endswith('/'): home += '/' -block_meta_db = '%sblock-metadata.db' % (home,) -block_data_db = '%sblocks/block-data.db' % (home,) +block_meta_db = '%sblock-metadata.db' % (home) +block_data_db = '%s/block-data.db' % (filepaths.block_data_location,) daemon_queue_db = '%sdaemon-queue.db' % (home,) address_info_db = '%saddress.db' % (home,) user_id_info_db = '%susers.db' % (home,) diff --git a/onionr/coredb/keydb/addkeys.py b/onionr/coredb/keydb/addkeys.py index 5864b20e..d54a4f7b 100644 --- a/onionr/coredb/keydb/addkeys.py +++ b/onionr/coredb/keydb/addkeys.py @@ -64,7 +64,7 @@ def add_address(address): if type(address) is None or len(address) == 0: return False if stringvalidators.validate_transport(address): - if address == gettransports.transports[0]: + if address == gettransports.get()[0]: return False conn = sqlite3.connect(dbfiles.address_info_db, timeout=30) c = conn.cursor() diff --git a/onionr/onionr.py b/onionr/onionr.py index 354f7ed3..378eb892 100755 --- a/onionr/onionr.py +++ b/onionr/onionr.py @@ -42,7 +42,7 @@ from netcontroller import NetController from onionrblockapi import Block import onionrproofs, onionrexceptions, communicator, setupconfig import onionrcommands as commands # Many command definitions are here -from utils import identifyhome +from utils import identifyhome, createdirs from coredb import keydb import filepaths @@ -75,6 +75,7 @@ class Onionr: # Load global configuration data data_exists = Onionr.setupConfig(self.dataDir, self) + createdirs.create_dirs() if netcontroller.tor_binary() is None: logger.error('Tor is not installed', terminal=True) diff --git a/onionr/onionrpeers/peerprofiles.py b/onionr/onionrpeers/peerprofiles.py index 07b1115a..6d4d8252 100644 --- a/onionr/onionrpeers/peerprofiles.py +++ b/onionr/onionrpeers/peerprofiles.py @@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . ''' +from coredb import keydb class PeerProfiles: ''' PeerProfiles @@ -36,20 +37,20 @@ class PeerProfiles: def loadScore(self): '''Load the node's score from the database''' try: - self.success = int(self.coreInst.getAddressInfo(self.address, 'success')) + self.success = int(keydb.transportinfo.get_address_info(self.address, 'success')) except (TypeError, ValueError) as e: self.success = 0 self.score = self.success def getConnectTime(self): try: - self.connectTime = int(self.coreInst.getAddressInfo(self.address, 'lastConnect')) + self.connectTime = int(keydb.transportinfo.get_address_info(self.address, 'lastConnect')) except (KeyError, ValueError, TypeError) as e: pass def saveScore(self): '''Save the node's score to the database''' - self.coreInst.setAddressInfo(self.address, 'success', self.score) + keydb.transportinfo.set_address_info(self.address, 'success', self.score) return def addScore(self, toAdd): diff --git a/onionr/onionrutils/basicrequests.py b/onionr/onionrutils/basicrequests.py index 4d3fb862..f1a563f4 100644 --- a/onionr/onionrutils/basicrequests.py +++ b/onionr/onionrutils/basicrequests.py @@ -48,7 +48,7 @@ def do_get_request(onionr_inst, url, port=0, proxyType='tor', ignoreAPI=False, r ''' Do a get request through a local tor or i2p instance ''' - API_VERSION = onionr_inst.onionrInst.API_VERSION + API_VERSION = onionr_inst.API_VERSION retData = False if proxyType == 'tor': if port == 0: diff --git a/onionr/onionrutils/localcommand.py b/onionr/onionrutils/localcommand.py index 15d795f7..54df8640 100644 --- a/onionr/onionrutils/localcommand.py +++ b/onionr/onionrutils/localcommand.py @@ -18,30 +18,36 @@ along with this program. If not, see . ''' import urllib, requests, time -import logger, config +import logger, config, deadsimplekv from . import getclientapiserver -hostname = '' -waited = 0 -maxWait = 3 +import filepaths config.reload() + +cache = deadsimplekv.DeadSimpleKV(filepaths.cached_storage, refresh_seconds=1000) def get_hostname(): - while hostname == '': - try: + hostname = '' + waited = 0 + maxWait = 3 + while True: + if cache.get('client_api') is None: hostname = getclientapiserver.get_client_API_server() - except FileNotFoundError: + cache.put('hostname', hostname) + cache.flush() + else: + hostname = cache.get('hostname') + if hostname == '' or hostname is None: time.sleep(1) - waited += 1 if waited == maxWait: return False - return hostname + else: + return hostname def local_command(command, data='', silent = True, post=False, postData = {}, maxWait=20): ''' Send a command to the local http API server, securely. Intended for local clients, DO NOT USE for remote peers. ''' # TODO: URL encode parameters, just as an extra measure. May not be needed, but should be added regardless. - if hostname == '': - hostname = get_hostname() + hostname = get_hostname() if data != '': data = '&data=' + urllib.parse.quote_plus(data) payload = 'http://%s/%s%s' % (hostname, command, data) diff --git a/onionr/static-data/bootstrap-nodes.txt b/onionr/static-data/bootstrap-nodes.txt index da45b083..0efbbd10 100755 --- a/onionr/static-data/bootstrap-nodes.txt +++ b/onionr/static-data/bootstrap-nodes.txt @@ -1 +1 @@ -6i2apk7llawfcqy4y4xumqiedo7nltczmdk2cbvdztaqpkjnygwwz6qd.onion +ny24c25ft4e534zkxnrrvqhm4cvyv66lwu24vw7fxctz77u235kuw4qd.onion \ No newline at end of file diff --git a/onionr/static-data/default-plugins/esoteric/controlapi.py b/onionr/static-data/default-plugins/esoteric/controlapi.py index 0ca8bbe9..d7b5579d 100755 --- a/onionr/static-data/default-plugins/esoteric/controlapi.py +++ b/onionr/static-data/default-plugins/esoteric/controlapi.py @@ -22,7 +22,7 @@ from flask import Response, request, redirect, Blueprint, send_from_directory import deadsimplekv as simplekv import filepaths flask_blueprint = Blueprint('esoteric_control', __name__) -key_store = simplekv.DeadSimpleKV(filepaths.cachedstorage, refresh_seconds=5) +key_store = simplekv.DeadSimpleKV(filepaths.cached_storage, refresh_seconds=5) @flask_blueprint.route('/esoteric/ping') def ping(): return 'pong!' diff --git a/onionr/static-data/default-plugins/esoteric/main.py b/onionr/static-data/default-plugins/esoteric/main.py index 495129c0..c412da89 100755 --- a/onionr/static-data/default-plugins/esoteric/main.py +++ b/onionr/static-data/default-plugins/esoteric/main.py @@ -21,7 +21,7 @@ # Imports some useful libraries import locale, sys, os, threading, json locale.setlocale(locale.LC_ALL, '') -import onionrservices, logger +import onionrservices, logger, config from onionrservices import bootstrapservice from onionrutils import stringvalidators, epoch, basicrequests @@ -39,7 +39,6 @@ def exit_with_error(text=''): class Esoteric: def __init__(self, pluginapi): - self.myCore = pluginapi.get_core() self.peer = None self.transport = None self.shutdown = False @@ -59,7 +58,7 @@ class Esoteric: message += '\n' except EOFError: message = json.dumps({'m': message, 't': epoch.get_epoch()}) - print(basicrequests.do_post_request(self.myCore, 'http://%s/esoteric/sendto' % (self.transport,), port=self.socks, data=message)) + print(basicrequests.do_post_request('http://%s/esoteric/sendto' % (self.transport,), port=self.socks, data=message)) message = '' except KeyboardInterrupt: self.shutdown = True @@ -73,12 +72,12 @@ class Esoteric: exit_with_error('You must specify a peer public key') self.peer = peer # Ask peer for transport address by creating block for them - peer_transport_address = bootstrapservice.bootstrap_client_service(peer, self.myCore) + peer_transport_address = bootstrapservice.bootstrap_client_service(peer) self.transport = peer_transport_address - self.socks = self.myCore.config.get('tor.socksport') + self.socks = config.get('tor.socksport') print('connected with', peer, 'on', peer_transport_address) - if basicrequests.do_get_request(self.myCore, 'http://%s/ping' % (peer_transport_address,), ignoreAPI=True, port=self.socks) == 'pong!': + if basicrequests.do_get_request('http://%s/ping' % (peer_transport_address,), ignoreAPI=True, port=self.socks) == 'pong!': print('connected', peer_transport_address) threading.Thread(target=self._sender_loop).start() diff --git a/onionr/static-data/default-plugins/esoteric/peerserver.py b/onionr/static-data/default-plugins/esoteric/peerserver.py index f48ba0be..5c1d02ed 100755 --- a/onionr/static-data/default-plugins/esoteric/peerserver.py +++ b/onionr/static-data/default-plugins/esoteric/peerserver.py @@ -18,23 +18,24 @@ along with this program. If not, see . ''' import sys, os, json -import core +from utils import identifyhome from onionrutils import localcommand +import deadsimplekv as simplekv, filepaths from flask import Response, request, redirect, Blueprint, abort, g sys.path.insert(0, os.path.dirname(os.path.realpath(__file__))) direct_blueprint = Blueprint('esoteric', __name__) -core_inst = core.Core() -storage_dir = core_inst.dataDir +key_store = simplekv.DeadSimpleKV(filepaths.cached_storage, refresh_seconds=5) +storage_dir = identifyhome.identify_home() @direct_blueprint.before_request def request_setup(): - core_inst.keyStore.refresh() + key_store.refresh() host = request.host host = host.strip('.b32.i2p') host = host.strip('.onion') g.host = host - g.peer = core_inst.keyStore.get('dc-' + g.host) + g.peer = key_store.get('dc-' + g.host) @direct_blueprint.route('/esoteric/ping') def pingdirect(): @@ -48,9 +49,9 @@ def sendto(): msg = '' else: msg = json.dumps(msg) - localcommand.local_command(core_inst, '/esoteric/addrec/%s' % (g.peer,), post=True, postData=msg) + localcommand.local_command('/esoteric/addrec/%s' % (g.peer,), post=True, postData=msg) return Response('success') @direct_blueprint.route('/esoteric/poll') def poll_chat(): - return Response(localcommand.local_command(core_inst, '/esoteric/gets/%s' % (g.peer,))) \ No newline at end of file + return Response(localcommand.local_command('/esoteric/gets/%s' % (g.peer,))) \ No newline at end of file diff --git a/onionr/static-data/default-plugins/metadataprocessor/main.py b/onionr/static-data/default-plugins/metadataprocessor/main.py index 4c730783..cc381396 100755 --- a/onionr/static-data/default-plugins/metadataprocessor/main.py +++ b/onionr/static-data/default-plugins/metadataprocessor/main.py @@ -33,7 +33,7 @@ def _processForwardKey(api, myBlock): ''' Get the forward secrecy key specified by the user for us to use ''' - peer = onionrusers.OnionrUser(api.get_core(), myBlock.signer) + peer = onionrusers.OnionrUser(myBlock.signer) key = myBlock.getMetadata('newFSKey') # We don't need to validate here probably, but it helps diff --git a/onionr/static-data/default-plugins/pluginmanager/.gitignore b/onionr/static-data/default-plugins/pluginmanager/.gitignore deleted file mode 100755 index 894a44cc..00000000 --- a/onionr/static-data/default-plugins/pluginmanager/.gitignore +++ /dev/null @@ -1,104 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -.hypothesis/ -.pytest_cache/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ diff --git a/onionr/static-data/default-plugins/pluginmanager/LICENSE b/onionr/static-data/default-plugins/pluginmanager/LICENSE deleted file mode 100755 index 94a9ed02..00000000 --- a/onionr/static-data/default-plugins/pluginmanager/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/onionr/static-data/default-plugins/pluginmanager/README.md b/onionr/static-data/default-plugins/pluginmanager/README.md deleted file mode 100755 index 141896aa..00000000 --- a/onionr/static-data/default-plugins/pluginmanager/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# pluginmanager -Onionr's plugin manager source code diff --git a/onionr/static-data/default-plugins/pluginmanager/info.json b/onionr/static-data/default-plugins/pluginmanager/info.json deleted file mode 100755 index 06c7f0ab..00000000 --- a/onionr/static-data/default-plugins/pluginmanager/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name" : "pluginmanager", - "version" : "1.0", - "author" : "onionr" -} diff --git a/onionr/static-data/default-plugins/pluginmanager/main.py b/onionr/static-data/default-plugins/pluginmanager/main.py deleted file mode 100755 index 807feec6..00000000 --- a/onionr/static-data/default-plugins/pluginmanager/main.py +++ /dev/null @@ -1,614 +0,0 @@ -''' - Onionr - Private P2P Communication - - This plugin acts as a plugin manager, and allows the user to install other plugins distributed over Onionr. -''' -''' - 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 . -''' - -# useful libraries -import logger, config -import os, sys, json, time, random, shutil, base64, getpass, datetime, re -from onionrblockapi import Block -from onionrutils import importnewblocks, stringvalidators - -plugin_name = 'pluginmanager' - -keys_data = {'keys' : {}, 'plugins' : [], 'repositories' : {}} - -# key functions - -def writeKeys(): - ''' - Serializes and writes the keystore in memory to file - ''' - - with open(keys_file, 'w') as file: - file.write(json.dumps(keys_data, indent=4, sort_keys=True)) - file.close() - -def readKeys(): - ''' - Loads the keystore into memory - ''' - - global keys_data - with open(keys_file) as file: - keys_data = json.loads(file.read()) - return keys_data - -def getKey(plugin): - ''' - Returns the public key for a given plugin - ''' - - global keys_data - readKeys() - return (keys_data['keys'][plugin] if plugin in keys_data['keys'] else None) - -def saveKey(plugin, key): - ''' - Saves the public key for a plugin to keystore - ''' - - global keys_data - readKeys() - keys_data['keys'][plugin] = key - writeKeys() - -def getPlugins(): - ''' - Returns a list of plugins installed by the plugin manager - ''' - - global keys_data - readKeys() - return keys_data['plugins'] - -def addPlugin(plugin): - ''' - Saves the plugin name, to remember that it was installed by the pluginmanager - ''' - - global keys_data - readKeys() - if not plugin in keys_data['plugins']: - keys_data['plugins'].append(plugin) - writeKeys() - -def removePlugin(plugin): - ''' - Removes the plugin name from the pluginmanager's records - ''' - - global keys_data - readKeys() - if plugin in keys_data['plugins']: - keys_data['plugins'].remove(plugin) - writeKeys() - -def getRepositories(): - ''' - Returns a list of plugins installed by the plugin manager - ''' - - global keys_data - readKeys() - return keys_data['repositories'] - -def addRepository(blockhash, data): - ''' - Saves the plugin name, to remember that it was installed by the pluginmanager - ''' - - global keys_data - readKeys() - keys_data['repositories'][blockhash] = data - writeKeys() - -def removeRepository(blockhash): - ''' - Removes the plugin name from the pluginmanager's records - ''' - - global keys_data - readKeys() - if blockhash in keys_data['repositories']: - del keys_data['repositories'][blockhash] - writeKeys() - -def createRepository(plugins): - contents = {'plugins' : plugins, 'author' : getpass.getuser(), 'compiled-by' : plugin_name} - - block = Block(core = pluginapi.get_core()) - - block.setType('repository') - block.setContent(json.dumps(contents)) - - return block.save(True) - -def check(): - ''' - Checks to make sure the keystore file still exists - ''' - - global keys_file - keys_file = pluginapi.plugins.get_data_folder(plugin_name) + 'keystore.json' - if not os.path.isfile(keys_file): - writeKeys() - -# plugin management - -def sanitize(name): - return re.sub('[^0-9a-zA-Z_]+', '', str(name).lower())[:255] - -def blockToPlugin(block): - try: - block = Block(block, core = pluginapi.get_core()) - blockContent = json.loads(block.getContent()) - - name = sanitize(blockContent['name']) - author = blockContent['author'] - date = blockContent['date'] - version = None - - if 'version' in blockContent['info']: - version = blockContent['info']['version'] - - content = base64.b64decode(blockContent['content'].encode()) - - source = pluginapi.plugins.get_data_folder(plugin_name) + 'plugin.zip' - destination = pluginapi.plugins.get_folder(name) - - with open(source, 'wb') as f: - f.write(content) - - if os.path.exists(destination) and not os.path.isfile(destination): - shutil.rmtree(destination) - - shutil.unpack_archive(source, destination) - pluginapi.plugins.enable(name) - - logger.info('Installation of %s complete.' % name, terminal=True) - - return True - except Exception as e: - logger.error('Failed to install plugin.', error = e, timestamp = False, terminal=True) - - return False - -def pluginToBlock(plugin, import_block = True): - try: - plugin = sanitize(plugin) - - directory = pluginapi.get_pluginapi().get_folder(plugin) - data_directory = pluginapi.get_pluginapi().get_data_folder(plugin) - zipfile = pluginapi.get_pluginapi().get_data_folder(plugin_name) + 'plugin.zip' - - if os.path.exists(directory) and not os.path.isfile(directory): - if os.path.exists(data_directory) and not os.path.isfile(data_directory): - shutil.rmtree(data_directory) - if os.path.exists(zipfile) and os.path.isfile(zipfile): - os.remove(zipfile) - if os.path.exists(directory + '__pycache__') and not os.path.isfile(directory + '__pycache__'): - shutil.rmtree(directory + '__pycache__') - - shutil.make_archive(zipfile[:-4], 'zip', directory) - data = '' - with open(zipfile, 'rb') as file: - data = base64.b64encode(file.read()) - - author = getpass.getuser() - description = 'Default plugin description' - info = {"name" : plugin} - try: - if os.path.exists(directory + 'info.json'): - info = '' - with open(directory + 'info.json').read() as file: - info = json.loads(file.read()) - - if 'author' in info: - author = info['author'] - if 'description' in info: - description = info['description'] - except: - pass - - metadata = {'author' : author, 'date' : str(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')), 'name' : plugin, 'info' : info, 'compiled-by' : plugin_name, 'content' : data.decode('utf-8'), 'description' : description} - - block = Block(core = pluginapi.get_core()) - - block.setType('plugin') - block.setContent(json.dumps(metadata)) - - hash = block.save(True) - # hash = pluginapi.get_core().insertBlock(, header = 'plugin', sign = True) - - if import_block: - importnewblocks.import_new_blocks(pluginapi.get_core()) - - return hash - else: - logger.error('Plugin %s does not exist.' % plugin, terminal=True) - except Exception as e: - logger.error('Failed to convert plugin to block.', error = e, timestamp = False, terminal=True) - - return False - -def installBlock(block): - try: - block = Block(block, core = pluginapi.get_core()) - blockContent = json.loads(block.getContent()) - - name = sanitize(blockContent['name']) - author = blockContent['author'] - date = blockContent['date'] - version = None - - if 'version' in blockContent['info']: - version = blockContent['info']['version'] - - install = False - - logger.info(('Will install %s' + (' v' + version if not version is None else '') + ' (%s), by %s') % (name, date, author), terminal=True) - - # TODO: Convert to single line if statement - if os.path.exists(pluginapi.plugins.get_folder(name)): - install = logger.confirm(message = 'Continue with installation (will overwrite existing plugin) %s?') - else: - install = logger.confirm(message = 'Continue with installation %s?') - - if install: - blockToPlugin(block.getHash()) - addPlugin(name) - else: - logger.info('Installation cancelled.', terminal=True) - return False - - return True - except Exception as e: - logger.error('Failed to install plugin.', error = e, timestamp = False, terminal=True) - return False - -def uninstallPlugin(plugin): - try: - plugin = sanitize(plugin) - - pluginFolder = pluginapi.plugins.get_folder(plugin) - exists = (os.path.exists(pluginFolder) and not os.path.isfile(pluginFolder)) - installedByPluginManager = plugin in getPlugins() - remove = False - - if not exists: - logger.warn('Plugin %s does not exist.' % plugin, timestamp = False, terminal=True) - return False - - default = 'y' - if not installedByPluginManager: - logger.warn('The plugin %s was not installed by %s.' % (plugin, plugin_name), timestamp = False, terminal=True) - default = 'n' - remove = logger.confirm(message = 'All plugin data will be lost. Are you sure you want to proceed %s?', default = default) - - if remove: - if installedByPluginManager: - removePlugin(plugin) - pluginapi.plugins.disable(plugin) - shutil.rmtree(pluginFolder) - - logger.info('Uninstallation of %s complete.' % plugin, terminal=True) - - return True - else: - logger.info('Uninstallation cancelled.') - except Exception as e: - logger.error('Failed to uninstall plugin.', error = e, terminal=True) - return False - -# command handlers - -def help(): - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' [public key/block hash]', terminal=True) - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' [public key/block hash]', terminal=True) - -def commandInstallPlugin(): - if len(sys.argv) >= 3: - check() - - pluginname = sys.argv[2] - pkobh = None # public key or block hash - - version = None - if ':' in pluginname: - details = pluginname - pluginname = sanitize(details[0]) - version = details[1] - - sanitize(pluginname) - - if len(sys.argv) >= 4: - # public key or block hash specified - pkobh = sys.argv[3] - else: - # none specified, check if in config file - pkobh = getKey(pluginname) - - if pkobh is None: - # still nothing found, try searching repositories - logger.info('Searching for public key in repositories...', terminal=True) - try: - repos = getRepositories() - distributors = list() - for repo, records in repos.items(): - if pluginname in records: - logger.debug('Found %s in repository %s for plugin %s.' % (records[pluginname], repo, pluginname), terminal=True) - distributors.append(records[pluginname]) - - if len(distributors) != 0: - distributor = None - - if len(distributors) == 1: - logger.info('Found distributor: %s' % distributors[0], terminal=True) - distributor = distributors[0] - else: - distributors_message = '' - - index = 1 - for dist in distributors: - distributors_message += ' ' + logger.colors.bold + str(index) + ') ' + logger.colors.reset + str(dist) + '\n' - index += 1 - - logger.info((logger.colors.bold + 'Found distributors (%s):' + logger.colors.reset + '\n' + distributors_message) % len(distributors), terminal=True) - - valid = False - while not valid: - choice = logger.readline('Select the number of the key to use, from 1 to %s, or press Ctrl+C to cancel:' % (index - 1), terminal=True) - - try: - choice = int(choice) - if choice <= index and choice >= 1: - distributor = distributors[int(choice)] - valid = True - except KeyboardInterrupt: - logger.info('Installation cancelled.', terminal=True) - return True - except: - pass - - if not distributor is None: - pkobh = distributor - except Exception as e: - logger.warn('Failed to lookup plugin in repositories.', timestamp = False, terminal=True) - return True - - if pkobh is None: - logger.error('No key for this plugin found in keystore or repositories, please specify.', timestamp = False, terminal=True) - - return True - - valid_hash = stringvalidators.validate_hash(pkobh) - real_block = False - valid_key = stringvalidators.validate_pub_key(pkobh) - real_key = False - - if valid_hash: - real_block = Block.exists(pkobh) - elif valid_key: - real_key = pkobh in pluginapi.get_core().listPeers() - - blockhash = None - - if valid_hash and not real_block: - logger.error('Block hash not found. Perhaps it has not been synced yet?', timestamp = False, terminal=True) - logger.debug('Is valid hash, but does not belong to a known block.', terminal=True) - - return True - elif valid_hash and real_block: - blockhash = str(pkobh) - logger.debug('Using block %s...' % blockhash, terminal=True) - - installBlock(blockhash) - elif valid_key and not real_key: - logger.error('Public key not found. Try adding the node by address manually, if possible.', timestamp = False, terminal=True) - logger.debug('Is valid key, but the key is not a known one.', terminal=True) - elif valid_key and real_key: - publickey = str(pkobh) - logger.debug('Using public key %s...' % publickey, terminal=True) - - saveKey(pluginname, pkobh) - - signedBlocks = Block.getBlocks(type = 'plugin', signed = True, signer = publickey) - - mostRecentTimestamp = None - mostRecentVersionBlock = None - - for block in signedBlocks: - try: - blockContent = json.loads(block.getContent()) - - if not (('author' in blockContent) and ('info' in blockContent) and ('date' in blockContent) and ('name' in blockContent)): - raise ValueError('Missing required parameter `date` in block %s.' % block.getHash()) - - blockDatetime = datetime.datetime.strptime(blockContent['date'], '%Y-%m-%d %H:%M:%S') - - if blockContent['name'] == pluginname: - if ('version' in blockContent['info']) and (blockContent['info']['version'] == version) and (not version is None): - mostRecentTimestamp = blockDatetime - mostRecentVersionBlock = block.getHash() - break - elif mostRecentTimestamp is None: - mostRecentTimestamp = blockDatetime - mostRecentVersionBlock = block.getHash() - elif blockDatetime > mostRecentTimestamp: - mostRecentTimestamp = blockDatetime - mostRecentVersionBlock = block.getHash() - except Exception as e: - pass - - logger.warn('Only continue the installation if you are absolutely certain that you trust the plugin distributor. Public key of plugin distributor: %s' % publickey, timestamp = False, terminal=True) - logger.debug('Most recent block matching parameters is %s' % mostRecentVersionBlock, terminal=True) - installBlock(mostRecentVersionBlock) - else: - logger.error('Unknown data "%s"; must be public key or block hash.' % str(pkobh), timestamp = False, terminal=True) - return - else: - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' [public key/block hash]', terminal=True) - - return True - -def commandUninstallPlugin(): - if len(sys.argv) >= 3: - uninstallPlugin(sys.argv[2]) - else: - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' ', terminal=True) - - return True - -def commandSearchPlugin(): - logger.info('This feature has not been created yet. Please check back later.', terminal=True) - return True - -def commandAddRepository(): - if len(sys.argv) >= 3: - check() - - blockhash = sys.argv[2] - - if stringvalidators.validate_hash(blockhash): - if Block.exists(blockhash): - try: - blockContent = json.loads(Block(blockhash, core = pluginapi.get_core()).getContent()) - - pluginslist = dict() - - for pluginname, distributor in blockContent['plugins']: - if stringvalidators.validate_pub_key(distributor): - pluginslist[pluginname] = distributor - - logger.debug('Found %s records in repository.' % len(pluginslist), terminal=True) - - if len(pluginslist) != 0: - addRepository(blockhash, pluginslist) - logger.info('Successfully added repository.', terminal=True) - else: - logger.error('Repository contains no records, not importing.', timestamp = False, terminal=True) - except Exception as e: - logger.error('Failed to parse block.', error = e, terminal=True) - else: - logger.error('Block hash not found. Perhaps it has not been synced yet?', timestamp = False, terminal=True) - logger.debug('Is valid hash, but does not belong to a known block.') - else: - logger.error('Unknown data "%s"; must be block hash.' % str(pkobh), timestamp = False, terminal=True) - else: - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' [block hash]', terminal=True) - - return True - -def commandRemoveRepository(): - if len(sys.argv) >= 3: - check() - - blockhash = sys.argv[2] - - if stringvalidators.validate_hash(blockhash): - if blockhash in getRepositories(): - try: - removeRepository(blockhash) - logger.info('Successfully removed repository.', terminal=True) - except Exception as e: - logger.error('Failed to parse block.', error = e, terminal=True) - else: - logger.error('Repository has not been imported, nothing to remove.', timestamp = False, terminal=True) - else: - logger.error('Unknown data "%s"; must be block hash.' % str(pkobh), terminal=True) - else: - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' [block hash]', terminal=True) - - return True - -def commandPublishPlugin(): - if len(sys.argv) >= 3: - check() - - pluginname = sanitize(sys.argv[2]) - pluginfolder = pluginapi.plugins.get_folder(pluginname) - - if os.path.exists(pluginfolder) and not os.path.isfile(pluginfolder): - block = pluginToBlock(pluginname) - logger.info('Plugin saved in block %s.' % block, terminal=True) - else: - logger.error('Plugin %s does not exist.' % pluginname, timestamp = False, terminal=True) - else: - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' ', terminal=True) - -def commandCreateRepository(): - if len(sys.argv) >= 3: - check() - - plugins = list() - script = sys.argv[0] - - del sys.argv[:2] - success = True - for pluginname in sys.argv: - distributor = None - - if ':' in pluginname: - split = pluginname.split(':') - pluginname = split[0] - distributor = split[1] - - pluginname = sanitize(pluginname) - - if distributor is None: - distributor = getKey(pluginname) - if distributor is None: - logger.error('No distributor key was found for the plugin %s.' % pluginname, timestamp = False, terminal=True) - success = False - - plugins.append([pluginname, distributor]) - - if not success: - logger.error('Please correct the above errors, then recreate the repository.', terminal=True) - return True - - blockhash = createRepository(plugins) - if not blockhash is None: - logger.info('Successfully created repository. Execute the following command to add the repository:\n ' + logger.colors.underline + '%s --add-repository %s' % (script, blockhash), terminal=True) - else: - logger.error('Failed to create repository, an unknown error occurred.', terminal=True) - else: - logger.info(sys.argv[0] + ' ' + sys.argv[1] + ' [plugins...]', terminal=True) - - return True - -# event listeners - -def on_init(api, data = None): - global pluginapi - pluginapi = api - check() - - # register some commands - api.commands.register(['install-plugin', 'installplugin', 'plugin-install', 'install', 'plugininstall'], commandInstallPlugin) - api.commands.register(['remove-plugin', 'removeplugin', 'plugin-remove', 'uninstall-plugin', 'uninstallplugin', 'plugin-uninstall', 'uninstall', 'remove', 'pluginremove'], commandUninstallPlugin) - api.commands.register(['search', 'filter-plugins', 'search-plugins', 'searchplugins', 'search-plugin', 'searchplugin', 'findplugin', 'find-plugin', 'filterplugin', 'plugin-search', 'pluginsearch'], commandSearchPlugin) - api.commands.register(['add-repo', 'add-repository', 'addrepo', 'addrepository', 'repository-add', 'repo-add', 'repoadd', 'addrepository', 'add-plugin-repository', 'add-plugin-repo', 'add-pluginrepo', 'add-pluginrepository', 'addpluginrepo', 'addpluginrepository'], commandAddRepository) - api.commands.register(['remove-repo', 'remove-repository', 'removerepo', 'removerepository', 'repository-remove', 'repo-remove', 'reporemove', 'removerepository', 'remove-plugin-repository', 'remove-plugin-repo', 'remove-pluginrepo', 'remove-pluginrepository', 'removepluginrepo', 'removepluginrepository', 'rm-repo', 'rm-repository', 'rmrepo', 'rmrepository', 'repository-rm', 'repo-rm', 'reporm', 'rmrepository', 'rm-plugin-repository', 'rm-plugin-repo', 'rm-pluginrepo', 'rm-pluginrepository', 'rmpluginrepo', 'rmpluginrepository'], commandRemoveRepository) - api.commands.register(['publish-plugin', 'plugin-publish', 'publishplugin', 'pluginpublish', 'publish'], commandPublishPlugin) - api.commands.register(['create-repository', 'create-repo', 'createrepo', 'createrepository', 'repocreate'], commandCreateRepository) - - # add help menus once the features are actually implemented - - return diff --git a/onionr/utils/createdirs.py b/onionr/utils/createdirs.py index 1b8ef366..00b356bb 100644 --- a/onionr/utils/createdirs.py +++ b/onionr/utils/createdirs.py @@ -1,13 +1,16 @@ +import os from . import identifyhome import dbcreator, filepaths home = identifyhome.identify_home() -if not os.path.exists(home): - os.mkdir(home) - os.mkdir(filepaths.block_data_location) +def create_dirs(): + if not os.path.exists(home): + os.mkdir(home) + if not os.path.exists(filepaths.block_data_location): + os.mkdir(filepaths.block_data_location) -for db in dbcreator.create_funcs: - try: - db() - except FileExistsError: - pass \ No newline at end of file + for db in dbcreator.create_funcs: + try: + db() + except FileExistsError: + pass \ No newline at end of file diff --git a/onionr/utils/gettransports.py b/onionr/utils/gettransports.py index cf5cfbe5..b241c44a 100644 --- a/onionr/utils/gettransports.py +++ b/onionr/utils/gettransports.py @@ -1,7 +1,14 @@ import filepaths files = [filepaths.tor_hs_address_file] -transports = [] -for file in files: - with open(file, 'r') as transport_file: - transports.append(transport_file.read()) \ No newline at end of file + +def get(): + transports = [] + for file in files: + try: + with open(file, 'r') as transport_file: + transports.append(transport_file.read()) + except FileNotFoundError: + transports.append('') + pass + return list(transports) \ No newline at end of file