Skip to content

slapos
slapos
Commit ec580565 authored by Nicolas Wavrant's avatar Nicolas Wavrant
Browse files
Options

stack-monitor: status and settings now use cookies for connection

parent 5284682f
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 37 deletions
stack/monitor/settings.cgi.in
View file @ ec580565
...@@ -4,28 +4,46 @@ import os ...@@ -4,28 +4,46 @@ import os
import cgi import cgi
import cgitb import cgitb
import ConfigParser import ConfigParser
import Cookie
cgitb.enable(display=0, logdir="/tmp/cgi.log") cgitb.enable(display=0, logdir="/tmp/cgi.log")
# Headers form = cgi.FieldStorage()
cookie = Cookie.SimpleCookie()
print "Content-Type: text/html" print "Content-Type: text/html"
if "password" in form:
password = form['password'].value
if password == '{{ password }}' :
cookie['password'] = password
print cookie
else:
cookie_string = os.environ.get('HTTP_COOKIE')
if cookie_string:
cookie.load(cookie_string)
try:
password = cookie['password'].value
except KeyError:
password = None
else:
password = None
print print
# Body content if not password or password != '{{ password }}':
form = cgi.FieldStorage() print "<html><body>"
if "password" not in form: if password is None:
print """<html> print "<h1>This is the monitoring interface</h1>"
<body> else:
<h1>This is the monitoring interface</h1> print "<h1>Error</h1><p>Wrong password</p>"
print """
<p>Please enter the monitor_password in the next field to access the data</p> <p>Please enter the monitor_password in the next field to access the data</p>
<form action="/{{ this_filename }}" method="post"> <form action="/settings.cgi" method="post">
Password : <input type="password" name="password"> Password : <input type="password" name="password">
<input type="submit" value="Access"> <input type="submit" value="Access">
</form></body></html>""" </form></body></html>"""
elif form['password'].value != '{{ password }}':
print "<html><body><h1>Error</h1><p>Wrong password</p></body></html>"
else: else:
config_file = "{{ config_cfg }}" config_file = "{{ config_cfg }}"
if not os.path.exists(config_file): if not os.path.exists(config_file):
...@@ -42,7 +60,7 @@ else: ...@@ -42,7 +60,7 @@ else:
parser.write(file) parser.write(file)
print "<html><body>" print "<html><body>"
print "<h1>Values that can be defined by the user :</h1>" print "<h1>Values that can be defined by the user :</h1>"
print "<form action=\"/control.cgi\" method=\"post\">" print "<form action=\"/{{ this_filename }}\" method=\"post\">"
print "<input type=\"hidden\" name=\"password\" value=\"{{ password }}\">" print "<input type=\"hidden\" name=\"password\" value=\"{{ password }}\">"
for option in parser.options("public"): for option in parser.options("public"):
print "%s : <input type=\"text\" name=\"%s\" \ print "%s : <input type=\"text\" name=\"%s\" \
...@@ -56,5 +74,4 @@ else: ...@@ -56,5 +74,4 @@ else:
print "<b>%s</b> : value=\"%s\"<br>" % (option, print "<b>%s</b> : value=\"%s\"<br>" % (option,
parser.get(section, option)) parser.get(section, option))
print "<br><br><p><a href=\"/monitor.cgi\">Monitor interface</a></p>"
print "</body></html>" print "</body></html>"
stack/monitor/status.cgi.in
View file @ ec580565
...@@ -2,34 +2,53 @@ ...@@ -2,34 +2,53 @@
import cgi import cgi
import cgitb import cgitb
import Cookie
import json import json
import os
import sys import sys
cgitb.enable(display=0, logdir="/tmp/cgi.log") cgitb.enable(display=0, logdir="/tmp/cgi.log")
json_file = "{{ json_file }}" form = cgi.FieldStorage()
result = json.load(open(json_file)) cookie = Cookie.SimpleCookie()
# Headers
print "Content-Type: text/html" print "Content-Type: text/html"
if "password" in form:
password = form['password'].value
if password == '{{ password }}' :
cookie['password'] = password
print cookie
else:
cookie_string = os.environ.get('HTTP_COOKIE')
if cookie_string:
cookie.load(cookie_string)
try:
password = cookie['password'].value
except KeyError:
password = None
else:
password = None
print print
# Body content if not password or password != '{{ password }}':
form = cgi.FieldStorage() print "<html><body>"
if "password" not in form: if password is None:
print """<html> print "<h1>This is the monitoring interface</h1>"
<body> else:
<h1>This is the monitoring interface</h1> print "<h1>Error</h1><p>Wrong password</p>"
print """
<p>Please enter the monitor_password in the next field to access the data</p> <p>Please enter the monitor_password in the next field to access the data</p>
<form action="/{{ this_filename }}" method="post"> <form action="/settings.cgi" method="post">
Password : <input type="password" name="password"> Password : <input type="password" name="password">
<input type="submit" value="Access"> <input type="submit" value="Access">
</form></body></html>""" </form></body></html>"""
elif form['password'].value != '{{ password }}':
print "<html><body><h1>Error</h1><p>Wrong password</p></body></html>"
else: else:
json_file = "{{ json_file }}"
result = json.load(open(json_file))
print "<html><body>" print "<html><body>"
print "<h1>Monitoring :</h1>" print "<h1>Monitoring :</h1>"
print "<p><em>Last time of monitoring process : %s</em></p>" % (result['datetime']) print "<p><em>Last time of monitoring process : %s</em></p>" % (result['datetime'])
...@@ -46,5 +65,4 @@ else: ...@@ -46,5 +65,4 @@ else:
for r in result: for r in result:
if result[r] == '': if result[r] == '':
print "<h3>%s</h3><p>%s</p>" % (r, result[r]) print "<h3>%s</h3><p>%s</p>" % (r, result[r])
print "<br><br><p><a href=\"/control.cgi\">Control interface</a></p>"
print "</body></html>" print "</body></html>"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7