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

made server multi threaded & config bugfix

Browse Source
This commit is contained in:
Kevin Froman 2017-12-27 19:18:00 -05:00
parent a2beb5971b
commit 2baf794ae7
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api.py
View File

@ -15,7 +15,7 @@
''' '''
import flask import flask
from flask import request, Response from flask import request, Response
import configparser, sys, random import configparser, sys, random, threading
''' '''
Main API Main API
''' '''
@ -34,6 +34,10 @@ class API:
else: else:
self.host = '127.0.0.1' self.host = '127.0.0.1'
@app.before_request
def beforeReq():
return
@app.after_request @app.after_request
def afterReq(resp): def afterReq(resp):
resp.headers['Access-Control-Allow-Origin'] = '*' resp.headers['Access-Control-Allow-Origin'] = '*'
@ -58,7 +62,7 @@ class API:
print('Starting client on ' + self.host + ':' + str(bindPort)) print('Starting client on ' + self.host + ':' + str(bindPort))
print('Client token:', clientToken) print('Client token:', clientToken)
app.run(host=self.host, port=bindPort, debug=True) app.run(host=self.host, port=bindPort, debug=True, threaded=True)
def validateHost(self): def validateHost(self):
if self.debug: if self.debug:

10
onionr.py
View File

@ -20,10 +20,14 @@ class Onionr:
def __init__(self): def __init__(self):
# Get configuration and Handle commands # Get configuration and Handle commands
self.debug = True # Whole application debugging self.debug = True # Whole application debugging
os.chdir(sys.path[0]) os.chdir(sys.path[0])
if not os.path.exists('data'):
os.mkdir('data')
# Get configuration # Get configuration
self.config = configparser.ConfigParser() self.config = configparser.ConfigParser()
if os.path.exists('data/config.ini'): if os.path.exists('data/config.ini'):
@ -31,7 +35,7 @@ class Onionr:
else: else:
# Generate default config # Generate default config
# Hostname should only be set if different from 127.x.x.x. Important for DNS rebinding attack prevention. # Hostname should only be set if different from 127.x.x.x. Important for DNS rebinding attack prevention.
if debug: if self.debug:
randomPort = 8080 randomPort = 8080
else: else:
randomPort = random.randint(1024, 65535) randomPort = random.randint(1024, 65535)
@ -65,4 +69,4 @@ class Onionr:
def showHelp(self): def showHelp(self):
return return
Onionr() Onionr()