monitor2: add monitor password cgi

stack/monitor2/buildout.cfg

@@ -106,13 +106,14 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 382f764b4d8fe203a9b2abe380323c03
+md5sum = f0356d4a0048dc22de4f61191f7caa7e
 context =
     key apache_location apache:location
     key gzip_location gzip:location
     raw monitor_bin ${monitor-bin:location}/${monitor-bin:filename}
     raw monitor_conf_template ${monitor-conf:location}/${monitor-conf:filename}
     raw monitor_password_promise_template ${monitor-password-promise:location}/${monitor-password-promise:filename}
+    raw monitor_password_cgi_template ${monitor-password-cgi:location}/${monitor-password-cgi:filename}
     raw monitor_web_default_promise_interface ${monitor-web-default-promise-interface:location}/${monitor-web-default-promise-interface:filename}
     raw monitor_web_index_html ${monitor-web-index-html:location}/${monitor-web-index-html:filename}
     raw monitor_web_monitor_css ${monitor-web-monitor-css:location}/${monitor-web-monitor-css:filename}
@@ -208,13 +209,9 @@ filename = monitor-password-promise.py.in
 md5sum = 0a9a42551ed6bdb973fd1f0dd1d4ec86
 
 [monitor-password-cgi]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/webfile-directory/${:filename}
-download-only = true
-md5sum = c7ba7ecb09d0d1d24e7cb73a212cc33f
-destination = ${buildout:parts-directory}/monitor-template-monitor-password-cgi
-filename = monitor-password.cgi.in
-mode = 0644
+<= monitor-download-base
+md5sum = 04fc7e6d892d29a601cfd43d1700eeda
+filename = monitor-password.py.cgi
 
 [rss-bin]
 recipe = hexagonit.recipe.download

stack/monitor2/instance-monitor.cfg.jinja2.in

@@ -271,6 +271,9 @@ frequency = * * * * *
 public-path-list = ${monitor-httpd-conf-parameter:access-log} ${monitor-httpd-conf-parameter:error-log}
 #private-path-list =
 
+[monitor-password-parameter]
+password-changed-once-path = ${directory:var}/monitor-password-changed-once
+
 [monitor-password-promise]
 recipe = slapos.recipe.template:jinja2
 template = {{ monitor_password_promise_template }}
@@ -279,7 +282,7 @@ filename = monitor-password
 mode = 0755
 context =
   raw python_executable {{ python_executable }}
-  raw password_changed_once_path ${directory:var}/monitor-password-changed-once
+  key password_changed_once_path monitor-password-parameter:password-changed-once-path
 
 [monitor-password-promise-conf-parameter]
 title = Monitor password
@@ -292,6 +295,16 @@ rendered = ${directory:monitor-promise}/${monitor-password-promise:filename}.cfg
 mode = 0644
 context = section parameter_dict monitor-password-promise-conf-parameter
 
+[monitor-password-cgi]
+recipe = slapos.recipe.template:jinja2
+template = {{ monitor_password_cgi_template }}
+rendered = ${monitor-directory:cgi-bin}/monitor-password.cgi
+context =
+  raw python_executable {{ python_executable }}
+  key password_changed_once_path monitor-password-parameter:password-changed-once-path
+  raw htpasswd_executable {{ apache_location }}/bin/htpasswd
+  key htpasswd_path httpd-monitor-htpasswd:htpasswd-path
+
 [publish]
 recipe = slapos.cookbook:publish
 monitor-url = ${monitor-httpd-conf-parameter:url}
@@ -317,4 +330,5 @@ parts =
   monitor-httpd-promise-conf
   monitor-password-promise
   monitor-password-promise-conf
+  monitor-password-cgi
   publish

stack/monitor2/monitor-password.py.cgi

+#!{{ python_executable }}
+
+htpasswd_executable = "{{ htpasswd_executable }}"
+htpasswd_path = "{{ htpasswd_path }}"
+password_changed_once_path = "{{ password_changed_once_path }}"
+
+import cgi
+import cgitb
+import os
+import sys
+
+cgitb.enable(display=0)
+
+def sh(args):
+  os.system(" ".join(["'" + arg.replace("'", "'\\''") + "'" for arg in args]))
+
+def touch(path):
+  open(path, "w").close()
+
+def main():
+  form = cgi.FieldStorage()
+  password = form["password"].value
+  if sh([htpasswd_executable, "-b", htpasswd_path, "admin", password]):
+    sys.stdout.write("Status: 500 Internal Server Error\r\n\r\n")
+    return 1
+  touch(password_changed_once_path)
+  sys.stdout.write("Status: 204 No Content\r\n\r\n")
+  return 0
+
+if __name__ == "__main__":
+  exit(main())