Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix-control-access'

Browse Source
This commit is contained in:
pancho horrillo
2019-07-05 10:40:29 +02:00
parent fc4f4ac8cb 23c66f4794
commit 2b64e1cb92
1 changed files with 56 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
poc/bin/kapow
+56 -37
View File
@@ -31,7 +31,8 @@ import requests
log = logging.getLogger('kapow') log = logging.getLogger('kapow')
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
######################################################################## ########################################################################
# Resource Management # # Resource Management #
@@ -232,7 +233,7 @@ def handle_route(entrypoint, command):
shell_task = await asyncio.create_subprocess_shell( shell_task = await asyncio.create_subprocess_shell(
args, args,
env={**os.environ, env={**os.environ,
"KAPOW_URL": "http://localhost:8080", "KAPOW_URL": "http://localhost:8081",
"KAPOW_HANDLER_ID": id "KAPOW_HANDLER_ID": id
}, },
stdin=asyncio.subprocess.DEVNULL) stdin=asyncio.subprocess.DEVNULL)
@@ -253,32 +254,38 @@ def handle_route(entrypoint, command):
# Route Management # # Route Management #
######################################################################## ########################################################################
async def get_routes(request): def get_routes(app):
"""Return the list of registered routes.""" async def _get_routes(request):
return web.json_response(list(request.app.router)) """Return the list of registered routes."""
return web.json_response(list(app.router))
return _get_routes
async def append_route(request): def append_route(app):
"""Create a new Kapow! route.""" async def _append_route(request):
request.app.router._frozen = False """Create a new Kapow! route."""
content = await request.json() app.router._frozen = False
name = "ROUTE_" + str(uuid4()).replace('-', '_') content = await request.json()
request.app.router.add_route(content["method"], name = "ROUTE_" + str(uuid4()).replace('-', '_')
content["url_pattern"], app.router.add_route(content["method"],
handle_route(content["entrypoint"], content["url_pattern"],
content["command"]), handle_route(content["entrypoint"],
name=name) content["command"]),
print(f'Route created {content["method"]} {content["url_pattern"]}') name=name)
return web.json_response(name) print(f'Route created {content["method"]} {content["url_pattern"]}')
return web.json_response(name)
return _append_route
async def delete_route(request): def delete_route(app):
"""Delete the given Kapow! route.""" async def _delete_route(request):
id = request.match_info["id"] """Delete the given Kapow! route."""
route = request.app.router._named_resources.pop(id) id = request.match_info["id"]
request.app.router._resources.remove(route) route = app.router._named_resources.pop(id)
print(f'Route deleted {id}') app.router._resources.remove(route)
return web.json_response(id) print(f'Route deleted {id}')
return web.json_response(id)
return _delete_route
######################################################################## ########################################################################
@@ -302,7 +309,7 @@ async def run_init_script(app, scripts):
cmd, cmd,
executable="/bin/bash", executable="/bin/bash",
env={**os.environ, env={**os.environ,
"KAPOW_URL": "http://localhost:8080" "KAPOW_URL": "http://localhost:8081"
}) })
await shell_task.wait() await shell_task.wait()
@@ -311,26 +318,37 @@ async def run_init_script(app, scripts):
async def start_background_tasks(app): async def start_background_tasks(app):
loop = asyncio.get_running_loop() global loop
app["debug_tasks"] = loop.create_task(run_init_script(app, app["scripts"])) app["debug_tasks"] = loop.create_task(run_init_script(app, app["scripts"]))
def start_kapow_server(scripts): async def start_kapow_server(scripts):
app = web.Application(client_max_size=1024**3) user_app = web.Application(client_max_size=1024**3)
app.add_routes([ user_runner = web.AppRunner(user_app)
await user_runner.setup()
user_site = web.TCPSite(user_runner, '0.0.0.0', 8080)
await user_site.start()
control_app = web.Application(client_max_size=1024**3)
control_app.add_routes([
# Control API # Control API
web.get('/routes', get_routes), web.get('/routes', get_routes(user_app)),
web.post('/routes', append_route), # TODO: return route index web.post('/routes', append_route(user_app)), # TODO: return route index
# web.put('/routes', insert_route), # TODO: return route index # web.put('/routes', insert_route(user_app)), # TODO: return route index
web.delete('/routes/{id}', delete_route), web.delete('/routes/{id}', delete_route(user_app)),
# Data API # Data API
web.get('/handlers/{id}/{field:.*}', get_field), web.get('/handlers/{id}/{field:.*}', get_field),
web.put('/handlers/{id}/{field:.*}', set_field), web.put('/handlers/{id}/{field:.*}', set_field),
]) ])
app["scripts"] = scripts control_app["scripts"] = scripts
app.on_startup.append(start_background_tasks) control_app.on_startup.append(start_background_tasks)
web.run_app(app)
control_runner = web.AppRunner(control_app)
await control_runner.setup()
control_site = web.TCPSite(control_runner, '127.0.0.1', 8081)
await control_site.start()
######################################################################## ########################################################################
@@ -348,7 +366,8 @@ def kapow(ctx):
@kapow.command() @kapow.command()
@click.argument("scripts", nargs=-1) @click.argument("scripts", nargs=-1)
def server(scripts): def server(scripts):
start_kapow_server(scripts) loop.run_until_complete(start_kapow_server(scripts))
loop.run_forever()
@kapow.group() @kapow.group()
def route(): def route():