misc: refactored webui into separate files instead of strings

This commit is contained in:
Simone Margaritelli 2019-11-05 15:51:26 +01:00
parent 2aa73d1a7e
commit 81032fe5e3
7 changed files with 104 additions and 78 deletions

View File

@ -6,3 +6,4 @@ include LICENSE
recursive-include bin * recursive-include bin *
recursive-include pwnagotchi *.py recursive-include pwnagotchi *.py
recursive-include pwnagotchi *.yml recursive-include pwnagotchi *.yml
recursive-include pwnagotchi *.*

View File

@ -13,77 +13,7 @@ from pwnagotchi import plugins
from flask import send_file from flask import send_file
from flask import request from flask import request
from flask import abort from flask import abort
from flask import render_template_string from flask import render_template, render_template_string
STYLE = """
.block {
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
display: block;
cursor: pointer;
text-align: center;
}
.pixelated {
image-rendering:optimizeSpeed; /* Legal fallback */
image-rendering:-moz-crisp-edges; /* Firefox */
image-rendering:-o-crisp-edges; /* Opera */
image-rendering:-webkit-optimize-contrast; /* Safari */
image-rendering:optimize-contrast; /* CSS3 Proposed */
image-rendering:crisp-edges; /* CSS4 Proposed */
image-rendering:pixelated; /* CSS4 Proposed */
-ms-interpolation-mode:nearest-neighbor; /* IE8+ */
}
"""
SCRIPT = """
window.onload = function() {
var image = document.getElementById("ui");
function updateImage() {
image.src = image.src.split("?")[0] + "?" + new Date().getTime();
}
setInterval(updateImage, 1000);
}
"""
INDEX = """<html>
<head>
<title>{{ title }}</title>
<style>""" + STYLE + """</style>
</head>
<body>
<div style="position: absolute; top:0; left:0; width:100%;" class="pixelated">
<img src="/ui" id="ui" style="width:100%;"/>
<br/>
<hr/>
<form style="display:inline;" method="POST" action="/shutdown" onsubmit="return confirm('This will halt the unit, continue?');">
<input style="display:inline;" type="submit" class="block" value="Shutdown"/>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
</form>
<form style="display:inline;" method="POST" action="/restart" onsubmit="return confirm('This will restart the service in {{ other_mode }} mode, continue?');">
<input style="display:inline;" type="submit" class="block" value="Restart in {{ other_mode }} mode"/>
<input type="hidden" name="mode" value="{{ other_mode }}"/>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
</form>
</div>
<script type="text/javascript">""" + SCRIPT + """</script>
</body>
</html>"""
STATUS_PAGE = """<html>
<head>
<title>{{ title }}</title>
<meta http-equiv="refresh" content="{{ go_back_after }};URL=/">
<style>""" + STYLE + """</style>
</head>
<body>
<div style="position: absolute; top:0; left:0; width:100%;">
{{ message }}
</div>
</body>
</html>"""
class Handler: class Handler:
@ -102,8 +32,8 @@ class Handler:
self._app.add_url_rule('/plugins/<name>/<path:subpath>', 'plugins', self.plugins, methods=['GET', 'POST']) self._app.add_url_rule('/plugins/<name>/<path:subpath>', 'plugins', self.plugins, methods=['GET', 'POST'])
def index(self): def index(self):
return render_template_string(INDEX, title=pwnagotchi.name(), return render_template('index', title=pwnagotchi.name(),
other_mode='AUTO' if self._agent.mode == 'manual' else 'MANU') other_mode='AUTO' if self._agent.mode == 'manual' else 'MANU')
def plugins(self, name, subpath): def plugins(self, name, subpath):
if name is None: if name is None:
@ -125,8 +55,8 @@ class Handler:
# serve a message and shuts down the unit # serve a message and shuts down the unit
def shutdown(self): def shutdown(self):
try: try:
return render_template_string(STATUS_PAGE, title=pwnagotchi.name(), go_back_after=60, return render_template('status', title=pwnagotchi.name(), go_back_after=60,
message='Shutting down ...') message='Shutting down ...')
finally: finally:
_thread.start_new_thread(pwnagotchi.shutdown, ()) _thread.start_new_thread(pwnagotchi.shutdown, ())
@ -137,8 +67,8 @@ class Handler:
mode = 'MANU' mode = 'MANU'
try: try:
return render_template_string(STATUS_PAGE, title=pwnagotchi.name(), go_back_after=30, return render_template('status', title=pwnagotchi.name(), go_back_after=30,
message='Restart in %s mode ...' % mode) message='Restarting in %s mode ...' % mode)
finally: finally:
_thread.start_new_thread(pwnagotchi.restart, (mode,)) _thread.start_new_thread(pwnagotchi.restart, (mode,))

View File

@ -29,7 +29,12 @@ class Server:
def _http_serve(self): def _http_serve(self):
if self._address is not None: if self._address is not None:
app = Flask(__name__) web_path = os.path.dirname(os.path.realpath(__file__))
app = Flask(__name__,
static_url_path='',
static_folder=os.path.join(web_path, 'static'),
template_folder=os.path.join(web_path, 'templates'))
app.secret_key = secrets.token_urlsafe(256) app.secret_key = secrets.token_urlsafe(256)
if self._origin: if self._origin:

View File

@ -0,0 +1,42 @@
.block {
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
display: block;
cursor: pointer;
text-align: center;
}
img#ui {
width:100%;
}
.full {
position: absolute;
top:0;
left:0;
width:100%;
}
.pixelated {
image-rendering:optimizeSpeed; /* Legal fallback */
image-rendering:-moz-crisp-edges; /* Firefox */
image-rendering:-o-crisp-edges; /* Opera */
image-rendering:-webkit-optimize-contrast; /* Safari */
image-rendering:optimize-contrast; /* CSS3 Proposed */
image-rendering:crisp-edges; /* CSS4 Proposed */
image-rendering:pixelated; /* CSS4 Proposed */
-ms-interpolation-mode:nearest-neighbor; /* IE8+ */
}
form.action {
display:inline;
}
div.status {
position: absolute;
top:0;
left:0;
width:100%;
}

View File

@ -0,0 +1,7 @@
window.onload = function() {
var image = document.getElementById("ui");
function updateImage() {
image.src = image.src.split("?")[0] + "?" + new Date().getTime();
}
setInterval(updateImage, 1000);
}

View File

@ -0,0 +1,29 @@
<html>
<head>
<title>{{ title }}</title>
<link rel="stylesheet" type="text/css" href="/css/style.css"/>
</head>
<body>
<div class="full pixelated">
<img src="/ui" id="ui"/>
<br/>
<hr/>
<form class="action" method="POST" action="/shutdown"
onsubmit="return confirm('This will halt the unit, continue?');">
<input style="display:inline;" type="submit" class="block" value="Shutdown"/>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
</form>
<form class="action" method="POST" action="/restart"
onsubmit="return confirm('This will restart the service in {{ other_mode }} mode, continue?');">
<input style="display:inline;" type="submit" class="block" value="Restart in {{ other_mode }} mode"/>
<input type="hidden" name="mode" value="{{ other_mode }}"/>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
</form>
</div>
<script type="text/javascript" src="/js/refresh.js"></script>
</body>
</html>

View File

@ -0,0 +1,12 @@
<html>
<head>
<title>{{ title }}</title>
<meta http-equiv="refresh" content="{{ go_back_after }};URL=/">
<link rel="stylesheet" type="text/css" href="/css/style.css"/>
</head>
<body>
<div class="status">
{{ message }}
</div>
</body>
</html>