diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 378: Allow configurable support for OpenID redirect domains on login

Message ID 20120608165511.6673.43309.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Andy Doan June 8, 2012, 4:55 p.m. UTC 
------------------------------------------------------------
revno: 378
committer: Andy Doan <andy.doan@linaro.org>
branch nick: lava-server
timestamp: Thu 2012-06-07 19:09:55 -0500
message:
  Allow configurable support for OpenID redirect domains on login
  
  This allows a site like android-build.linaro.org or snapshots.l.o
  to point to users to login via the validation website, but then
  land back on their own website where they show a summary of LAVA
  results.
  
  The configuration can be done in the etc/lava-server/settings.conf file
modified:
  doc/changes.rst
  lava_server/settings/debian.py


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-05-31 07:01:29 +0000
+++ doc/changes.rst	2012-06-08 00:09:55 +0000
@@ -7,6 +7,7 @@ 
 ============
 
 * Unreleased.
+* Added configurable OpenID redirect domain support for login.
 
 .. _version_0_14:
 
@@ -39,7 +40,7 @@ 
 ==============
 
 * Drop a copy of lava-utils-interface and add a dependency on the external
-  module. This makes lava-server co-installable with lava-utils-interface 
+  module. This makes lava-server co-installable with lava-utils-interface
 
 .. _version_0_11:
 

=== modified file 'lava_server/settings/debian.py'
--- lava_server/settings/debian.py	2012-04-05 04:28:45 +0000
+++ lava_server/settings/debian.py	2012-06-08 00:09:55 +0000
@@ -68,7 +68,7 @@ 
 # e-mail.
 SEND_BROKEN_LINK_EMAILS = debian_settings.SEND_BROKEN_LINK_EMAILS
 
-# URL of the login page 
+# URL of the login page
 LOGIN_URL = debian_settings.LOGIN_URL
 
 # URL of the page you get redirected to after logging in
@@ -79,5 +79,9 @@ 
 if debian_settings.get_setting("SERVER_EMAIL"):
     SERVER_EMAIL = debian_settings.get_setting("SERVER_EMAIL")
 
+# Allow OpenID redirect domains to be configurable
+if debian_settings.get_setting("ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS"):
+    ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = debian_settings.get_setting("ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS")
+
 # Load extensions
 loader.contribute_to_settings(locals(), debian_settings)