Merge lp:~cjwatson/charms/trusty/turnip/cgit-openid into lp:~canonical-launchpad-branches/charms/trusty/turnip/devel

[Colin Watson]

Pass through the necessary configuration options for cgit OpenID authentication support.

Pass through the necessary configuration options for cgit OpenID authentication support.

This goes with: https://code.launchpad.net/~cjwatson/turnip/cgit-openid/+merge/259948

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2015-05-11 11:04:54 +0000
+++ config.yaml	2015-05-22 15:45:36 +0000
@@ -76,10 +76,18 @@
     type: string
     default: turnip_cgit
     description: The cgit code browser will run under this group.
+  openid_provider_root:
+    type: string
+    default: https://testopenid.dev/
+    description: URL to the OpenID provider to authenticate against.
   site_name:
     type: string
     default: git.launchpad.dev
     description: Public host name used for clone URLs in cgit.
+  main_site_root:
+    type: string
+    default: https://launchpad.dev/
+    description: Root URL to the associated main Launchpad instance.
   private_ssh_key:
     type: string
     default: ''
@@ -88,6 +96,10 @@
     type: string
     default: ''
     description: Base64 encoded public host ssh key.
+  cgit_secret:
+    type: string
+    default: ''
+    description: Base64 encoded cgit session secret.
   virtinfo_endpoint:
     type: string
     default: http://localhost:6543/githosting

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-05-21 14:49:16 +0000
+++ hooks/actions.py	2015-05-22 15:45:36 +0000
@@ -50,6 +50,8 @@
 PRIVATE_KEY_PATH = os.path.join(KEY_DIR, 'ssh-host-key')
 PUBLIC_KEY = config['public_ssh_key']
 PUBLIC_KEY_PATH = os.path.join(KEY_DIR, 'ssh-host-key.pub')
+CGIT_SECRET = config['cgit_secret']
+CGIT_SECRET_PATH = os.path.join(KEY_DIR, 'cgit-secret')
 
 
 def get_ports():
@@ -146,6 +148,17 @@
                 config.save()
 
 
+def write_cgit_secret(service_name):
+    if CGIT_SECRET:
+        hookenv.log(
+            "Writing cgit session secret from config to: {}".format(
+                CGIT_SECRET_PATH))
+        with open(CGIT_SECRET_PATH, 'wb') as f:
+            f.write(base64.b64decode(CGIT_SECRET))
+            config['cgit_secret_path'] = CGIT_SECRET_PATH
+            config.save()
+
+
 def restart_rsync(service_name):
     # Only makes sense with basenode.
     if not config['log_hosts_allow']:

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-05-11 15:27:16 +0000
+++ hooks/services.py	2015-05-22 15:45:36 +0000
@@ -95,6 +95,8 @@
                 actions.write_ssh_keys,
                 render_env_template(config, 'PRIVATE_SSH_KEY_PATH'),
                 render_env_template(config, 'PUBLIC_SSH_KEY_PATH'),
+                actions.write_cgit_secret,
+                render_env_template(config, 'CGIT_SECRET_PATH'),
                 helpers.render_template(
                     source='sudoers-cgit.j2',
                     target='/etc/sudoers.d/turnip-cgit',
@@ -104,7 +106,9 @@
                     target='/usr/local/bin/cgitwrap',
                     perms=0o755),
                 render_env_template(config, 'CGIT_EXEC_PATH'),
+                render_env_template(config, 'OPENID_PROVIDER_ROOT'),
                 render_env_template(config, 'SITE_NAME'),
+                render_env_template(config, 'MAIN_SITE_ROOT'),
                 helpers.render_template(
                     source='turnip-logrotate.j2',
                     target='/etc/logrotate.d/turnip',

=== added file 'templates/envs/CGIT_SECRET_PATH.j2'
--- templates/envs/CGIT_SECRET_PATH.j2	1970-01-01 00:00:00 +0000
+++ templates/envs/CGIT_SECRET_PATH.j2	2015-05-22 15:45:36 +0000
@@ -0,0 +1,1 @@
+{{ cgit_secret_path }}

=== added file 'templates/envs/MAIN_SITE_ROOT.j2'
--- templates/envs/MAIN_SITE_ROOT.j2	1970-01-01 00:00:00 +0000
+++ templates/envs/MAIN_SITE_ROOT.j2	2015-05-22 15:45:36 +0000
@@ -0,0 +1,1 @@
+{{ main_site_root }}

=== added file 'templates/envs/OPENID_PROVIDER_ROOT.j2'
--- templates/envs/OPENID_PROVIDER_ROOT.j2	1970-01-01 00:00:00 +0000
+++ templates/envs/OPENID_PROVIDER_ROOT.j2	2015-05-22 15:45:36 +0000
@@ -0,0 +1,1 @@
+{{ openid_provider_root }}