Move to www

master
Arinerron 2018-07-30 21:52:48 -07:00
parent ddb3ce1e35
commit 8e01063f94
21 changed files with 54 additions and 10 deletions

View File

@ -117,8 +117,8 @@ class API:
return resp return resp
@app.route('/client/ui/<path:path>') @app.route('/www/private/<path:path>')
def webUI(path): def www_private(path):
startTime = math.floor(time.time()) startTime = math.floor(time.time())
if request.args.get('timingToken') is None: if request.args.get('timingToken') is None:
@ -126,9 +126,9 @@ class API:
else: else:
timingToken = request.args.get('timingToken') timingToken = request.args.get('timingToken')
if not config.get("onionr_ui.run", True): if not config.get("www.private.run", True):
abort(403) abort(403)
if config.get("onionr_ui.private_only", True):
self.validateHost('private') self.validateHost('private')
endTime = math.floor(time.time()) endTime = math.floor(time.time())
@ -138,7 +138,42 @@ class API:
if elapsed < self._privateDelayTime: if elapsed < self._privateDelayTime:
time.sleep(self._privateDelayTime - elapsed) time.sleep(self._privateDelayTime - elapsed)
return send_from_directory('static-data/ui/dist/', path) return send_from_directory('static-data/www/private/', path)
@app.route('/www/public/<path:path>')
def www_public(path):
if not config.get("www.public.run", True):
abort(403)
self.validateHost('public')
return send_from_directory('static-data/www/public/', path)
@app.route('/www/ui/<path:path>')
def ui_private(path):
startTime = math.floor(time.time())
if request.args.get('timingToken') is None:
timingToken = ''
else:
timingToken = request.args.get('timingToken')
if not config.get("www.ui.run", True):
abort(403)
if config.get("www.ui.private", True):
self.validateHost('private')
else:
self.validateHost('public')
endTime = math.floor(time.time())
elapsed = endTime - startTime
if not hmac.compare_digest(timingToken, self.timeBypassToken):
if elapsed < self._privateDelayTime:
time.sleep(self._privateDelayTime - elapsed)
return send_from_directory('static-data/www/ui/dist/', path)
@app.route('/client/') @app.route('/client/')
def private_handler(): def private_handler():
@ -270,7 +305,6 @@ class API:
except: except:
data = '' data = ''
events.event('webapi_public', onionr = None, data = {'action' : action, 'data' : data, 'requestingPeer' : requestingPeer, 'request' : request}) events.event('webapi_public', onionr = None, data = {'action' : action, 'data' : data, 'requestingPeer' : requestingPeer, 'request' : request})
if action == 'firstConnect': if action == 'firstConnect':

View File

@ -9,9 +9,19 @@
} }
}, },
"onionr_ui" : { "www" : {
"public" : {
"run" : true
},
"private" : {
"run" : true
},
"ui" : {
"run" : true, "run" : true,
"private_only" : true "private" : true
}
}, },
"client" : { "client" : {

View File

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB