kev
/
Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

communicator/daemon now working with http server

This commit is contained in:
Kevin Froman 2018-01-13 03:03:51 -06:00
parent 084b2425e9
commit 1006be971b
No known key found for this signature in database
GPG Key ID: 0D414D0FE405B63B
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
communicator.py
View File

@ -14,12 +14,16 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
''' '''
import sqlite3, requests, hmac, hashlib import sqlite3, requests, hmac, hashlib, time
import core import core
class OnionrCommunicate: class OnionrCommunicate:
def __init__(self): def __init__(self):
self._core = core.Core()
while True:
print('Onionr daemon running')
time.sleep(2)
return return
def getKey(self, peerID): def getRemotePeerKey(self, peerID):
'''This function contacts a peer and gets their main PGP key. '''This function contacts a peer and gets their main PGP key.
This is safe because Tor or I2P is used, but it does not insure that the person is who they say they are This is safe because Tor or I2P is used, but it does not insure that the person is who they say they are
''' '''

9
onionr.py
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
''' '''
import sys, os, threading, configparser, base64, random, getpass, shutil import sys, os, configparser, base64, random, getpass, shutil, subprocess
import gui, api, colors, core import gui, api, colors, core
from onionrutils import OnionrUtils from onionrutils import OnionrUtils
from colors import Colors from colors import Colors
@ -93,8 +93,9 @@ class Onionr:
shutil.rmtree('data/') shutil.rmtree('data/')
return return
def daemon(self): def daemon(self):
os.system('./communicator.py') if not os.environ.get("WERKZEUG_RUN_MAIN") == "true":
print('Started communicator') subprocess.Popen(["./communicator.py"])
print('Started communicator')
api.API(self.config, self.debug) api.API(self.config, self.debug)
return return
def killDaemon(self): def killDaemon(self):
@ -104,4 +105,4 @@ class Onionr:
def showHelp(self): def showHelp(self):
return return
Onionr() Onionr()