work on the ability to attach to existing Tor
This commit is contained in:
parent
bffef46e89
commit
840563f75c
5 changed files with 64 additions and 21 deletions
200
src/onionrcommands/daemonlaunch/__init__.py
Executable file
200
src/onionrcommands/daemonlaunch/__init__.py
Executable file
|
@ -0,0 +1,200 @@
|
|||
"""Onionr - Private P2P Communication.
|
||||
|
||||
launch the api servers and communicator
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import platform
|
||||
import sqlite3
|
||||
from threading import Thread
|
||||
from gevent import time
|
||||
from gevent import spawn
|
||||
|
||||
import toomanyobjs
|
||||
|
||||
import config
|
||||
import onionrstatistics
|
||||
from onionrstatistics import serializeddata
|
||||
import apiservers
|
||||
import logger
|
||||
import communicator
|
||||
from onionrplugins import onionrevents as events
|
||||
from netcontroller import NetController
|
||||
from onionrutils import localcommand
|
||||
import filepaths
|
||||
from etc import onionrvalues, cleanup
|
||||
from onionrcrypto import getourkeypair
|
||||
from utils import hastor, logoheader
|
||||
import runtests
|
||||
from httpapi import daemoneventsapi
|
||||
from .. import version
|
||||
from .getapihost import get_api_host_until_available
|
||||
from .bettersleep import better_sleep
|
||||
"""
|
||||
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/>.
|
||||
"""
|
||||
|
||||
|
||||
def _proper_shutdown():
|
||||
localcommand.local_command('shutdown')
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def daemon():
|
||||
"""Start the Onionr communication daemon."""
|
||||
offline_mode = config.get('general.offline_mode', False)
|
||||
|
||||
if not hastor.has_tor():
|
||||
offline_mode = True
|
||||
logger.error("Tor is not present in system path or Onionr directory",
|
||||
terminal=True)
|
||||
|
||||
# remove runcheck if it exists
|
||||
if os.path.isfile(filepaths.run_check_file):
|
||||
logger.debug('Runcheck file found on daemon start, deleting.')
|
||||
os.remove(filepaths.run_check_file)
|
||||
|
||||
# Create shared objects
|
||||
|
||||
shared_state = toomanyobjs.TooMany()
|
||||
|
||||
shared_state.get(daemoneventsapi.DaemonEventsBP)
|
||||
|
||||
Thread(target=shared_state.get(apiservers.ClientAPI).start,
|
||||
daemon=True, name='client HTTP API').start()
|
||||
if not offline_mode:
|
||||
Thread(target=shared_state.get(apiservers.PublicAPI).start,
|
||||
daemon=True, name='public HTTP API').start()
|
||||
|
||||
# Init run time tester
|
||||
# (ensures Onionr is running right, for testing purposes)
|
||||
|
||||
shared_state.get(runtests.OnionrRunTestManager)
|
||||
shared_state.get(serializeddata.SerializedData)
|
||||
|
||||
shared_state.share_object() # share the parent object to the threads
|
||||
|
||||
apiHost = ''
|
||||
if not offline_mode:
|
||||
apiHost = get_api_host_until_available()
|
||||
|
||||
logger.raw('', terminal=True)
|
||||
# print nice header thing :)
|
||||
if config.get('general.display_header', True):
|
||||
logoheader.header()
|
||||
version.version(verbosity=5, function=logger.info)
|
||||
logger.debug('Python version %s' % platform.python_version())
|
||||
|
||||
if onionrvalues.DEVELOPMENT_MODE:
|
||||
logger.warn('Development mode enabled', timestamp=False, terminal=True)
|
||||
|
||||
net = NetController(config.get('client.public.port', 59497),
|
||||
apiServerIP=apiHost)
|
||||
shared_state.add(net)
|
||||
|
||||
shared_state.get(onionrstatistics.tor.TorStats)
|
||||
|
||||
if not offline_mode:
|
||||
|
||||
logger.info('Tor is starting...', terminal=True)
|
||||
if not net.startTor():
|
||||
localcommand.local_command('shutdown')
|
||||
cleanup.delete_run_files()
|
||||
sys.exit(1)
|
||||
if len(net.myID) > 0 and config.get('general.security_level', 1) == 0:
|
||||
logger.debug('Started .onion service: %s' %
|
||||
(logger.colors.underline + net.myID))
|
||||
else:
|
||||
logger.debug('.onion service disabled')
|
||||
|
||||
logger.info('Using public key: %s' %
|
||||
(logger.colors.underline +
|
||||
getourkeypair.get_keypair()[0][:52]))
|
||||
|
||||
better_sleep(1)
|
||||
|
||||
events.event('init', threaded=False)
|
||||
events.event('daemon_start')
|
||||
communicator.startCommunicator(shared_state)
|
||||
|
||||
if not offline_mode:
|
||||
net.killTor()
|
||||
|
||||
better_sleep(5)
|
||||
|
||||
cleanup.delete_run_files()
|
||||
|
||||
|
||||
def _ignore_sigint(sig, frame): # pylint: disable=W0612,W0613
|
||||
"""Space intentionally left blank."""
|
||||
return
|
||||
|
||||
|
||||
def kill_daemon():
|
||||
"""Shutdown the Onionr daemon (communicator)."""
|
||||
logger.warn('Stopping the running daemon...', timestamp=False,
|
||||
terminal=True)
|
||||
|
||||
# On platforms where we can, fork out to prevent locking
|
||||
try:
|
||||
pid = os.fork()
|
||||
if pid != 0:
|
||||
return
|
||||
except (AttributeError, OSError):
|
||||
pass
|
||||
|
||||
events.event('daemon_stop')
|
||||
net = NetController(config.get('client.port', 59496))
|
||||
try:
|
||||
spawn(
|
||||
localcommand.local_command,
|
||||
'/shutdownclean'
|
||||
).get(timeout=5)
|
||||
except sqlite3.OperationalError:
|
||||
pass
|
||||
|
||||
net.killTor()
|
||||
|
||||
|
||||
kill_daemon.onionr_help = "Gracefully stops the " # type: ignore
|
||||
kill_daemon.onionr_help += "Onionr API servers" # type: ignore
|
||||
|
||||
|
||||
def start(override: bool = False):
|
||||
"""If no lock file, make one and start onionr.
|
||||
|
||||
Error exit if there is and its not overridden
|
||||
"""
|
||||
if os.path.exists(filepaths.lock_file) and not override:
|
||||
logger.fatal('Cannot start. Daemon is already running,'
|
||||
+ ' or it did not exit cleanly.\n'
|
||||
+ ' (if you are sure that there is not a daemon running,'
|
||||
+ ' delete onionr.lock & try again).', terminal=True)
|
||||
else:
|
||||
if not onionrvalues.DEVELOPMENT_MODE:
|
||||
lock_file = open(filepaths.lock_file, 'w')
|
||||
lock_file.write('delete at your own risk')
|
||||
lock_file.close()
|
||||
|
||||
# Start Onionr daemon
|
||||
daemon()
|
||||
|
||||
try:
|
||||
os.remove(filepaths.lock_file)
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
||||
|
||||
start.onionr_help = "Start Onionr node " # type: ignore
|
||||
start.onionr_help += "(public and clients API servers)" # type: ignore
|
38
src/onionrcommands/daemonlaunch/getapihost.py
Normal file
38
src/onionrcommands/daemonlaunch/getapihost.py
Normal file
|
@ -0,0 +1,38 @@
|
|||
"""Onionr - Private P2P Communication.
|
||||
|
||||
Wait for the api host to be available in the public api host file.
|
||||
returns string of ip for the local public host interface
|
||||
"""
|
||||
from time import sleep
|
||||
|
||||
from filepaths import public_API_host_file
|
||||
"""
|
||||
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/>.
|
||||
"""
|
||||
|
||||
|
||||
def get_api_host_until_available() -> str:
|
||||
"""Wait for the api host to be available in the public api host file.
|
||||
|
||||
returns string of ip for the local public host interface
|
||||
"""
|
||||
api_host = ''
|
||||
while api_host == '':
|
||||
try:
|
||||
with open(public_API_host_file, 'r') as file:
|
||||
api_host = file.read()
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
sleep(0.5)
|
||||
return api_host
|
Loading…
Add table
Add a link
Reference in a new issue