stack-monitor: added cgi script + ssl on apache

55dbc649 · Nicolas Wavrant · 2861fd5d · 55dbc649 · 55dbc649
Commit 55dbc649 authored Dec 20, 2013 by Nicolas Wavrant
Hide whitespace changes
Inline Side-by-side

Showing with 76 additions and 1 deletion

stack/monitor/index.cgi stack/monitor/index.cgi +49 -0

stack/monitor/monitor.cfg.in stack/monitor/monitor.cfg.in +27 -1

No files found.
--- a/stack/monitor/index.cgi
+++ b/stack/monitor/index.cgi
+#!/usr/bin/python
+import cgi
+import cgitb
+import json
+import sys
+cgitb.enable(display=0, logdir="/tmp/cgi.log")
+json_file = "{{ json_file }}"
+result = json.load(open(json_file))
+# Headers
+print "Content-Type: text/html"
+print
+# Body content
+form = cgi.FieldStorage()
+if "password" not in form:
+  print """<html>
+  <body>
+  <h1>This is the monitoring interface</h1>
+  <p>Please enter the monitor_password in the next field to access the data</p>
+  <form action="/" method="post">
+    Password : <input type="password" name="password">
+    <input type="submit" value="Access">
+  </form></body></html>"""
+elif form['password'].value != '{{ password }}':
+  print "<html><body><h1>Error</h1><p>Wrong password</p></body></html>"
+else:
+  print "<html><body>"
+  print "<h1>Monitoring :</h1>"
+  print "<p><em>Last time of monitoring process : %s</em></p>" % (result['datetime'])
+  del result['datetime']
+  print "<br/>"
+  print "<h2>These scripts and promises have failed :</h2>"
+  for r in result:
+    if result[r] != '':
+      print "<h3>%s</h3><p style=\"padding-left:30px;\">%s</p>" % (r, result[r])
+  print "<br/>"
+  print "<h2>These scripts and promises were successful :</h2>"
+  for r in result:
+    if result[r] == '':
+      print "<h3>%s</h3><p>%s</p>" % (r, result[r])
+  print "</body></html>"
\ No newline at end of file
--- a/stack/monitor/monitor.cfg.in
+++ b/stack/monitor/monitor.cfg.in
@@ -137,6 +137,16 @@ wrapper = $${directory:service}/nginx-rss
 # Put domain name
 name = example.com
+[ca-httpd]
+<= certificate-authority
+recipe = slapos.cookbook:certificate_authority.request
+key-file = $${cadirectory:certs}/httpd.key
+cert-file = $${cadirectory:certs}/httpd.crt
+executable = $${cgi-httpd-wrapper:wrapper-path}
+wrapper = $${directory:service}/cgi-httpd
+# Put domain name
+name = example.com
 [nginx-parameters]
 nb_workers = 2
 port = 9685
@@ -185,6 +195,7 @@ bytes = 8
 recipe = collective.recipe.template
 input = inline:
  PidFile "$${:pid-file}"
+  ServerName example.com
  Listen [$${:listening-ip}]:$${:listening-port}
  ServerAdmin someone@email
  DocumentRoot "$${:document-root}"
@@ -196,8 +207,23 @@ input = inline:
  LoadModule mime_module modules/mod_mime.so
  LoadModule cgid_module modules/mod_cgid.so
  LoadModule dir_module modules/mod_dir.so
+  LoadModule ssl_module modules/mod_ssl.so
+  # SSL Configuration
+  SSLCertificateFile $${ca-httpd:cert-file}
+  SSLCertificateKeyFile $${ca-httpd:key-file}
+  SSLRandomSeed startup builtin
+  SSLRandomSeed connect builtin
+  SSLRandomSeed startup /dev/urandom 256
+  SSLRandomSeed connect builtin
+  SSLProtocol -ALL +SSLv3 +TLSv1
+  SSLHonorCipherOrder On
+  SSLCipherSuite RC4-SHA:HIGH:!ADH
+  SSLEngine   On
  ScriptSock $${:cgid-pid-file}
  <Directory $${:document-root}>
+    SSLVerifyDepth    1
+    SSLRequireSSL
+    SSLOptions        +StrictRequire
    # XXX: security????
    Options +ExecCGI
    AddHandler cgi-script .cgi
@@ -218,7 +244,7 @@ error-log = $${directory:log}/cgi-httpd-error-log
 recipe = slapos.cookbook:wrapper
 apache-executable = ${apache:location}/bin/httpd
 command-line = $${:apache-executable} -f $${cgi-httpd-configuration-file:output} -DFOREGROUND
-wrapper-path = $${directory:service}/cgi-httpd
+wrapper-path = $${directory:bin}/cgi-httpd
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish