launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/openid-provider-root-config-keys into lp:launchpad.

Commit message:
Introduce new openid_provider_root and openid_alternate_provider_roots config options in preparation for the removal of vhost.(ubuntu_)openid.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/openid-provider-root-config-keys/+merge/201545

Our OpenID provider hasn't been a Launchpad vhost for nearly four years now, but the vhost.openid and vhost.ubuntu_openid config sections still determine the provider that we authenticate against. This branch introduces new config options, so we can set them in production-configs before landing the code to use them.

openid_provider_vhost is being replaced with openid_provider_root, and I've added an openid_alternate_provider_roots option to replace the hardcoded ('openid', 'ubuntu_openid') in PersonSet.getByOpenIDIdentifier.
-- 
https://code.launchpad.net/~wgrant/launchpad/openid-provider-root-config-keys/+merge/201545
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/openid-provider-root-config-keys into lp:launchpad.

=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2013-04-09 11:51:24 +0000
+++ configs/development/launchpad-lazr.conf	2014-01-14 06:48:55 +0000
@@ -91,6 +91,7 @@
 [launchpad]
 enable_test_openid_provider: True
 openid_provider_vhost: testopenid
+openid_provider_root: https://testopenid.dev/
 code_domain: code.launchpad.dev
 default_batch_size: 5
 max_attachment_size: 2097152

=== modified file 'configs/testrunner-appserver/launchpad-lazr.conf'
--- configs/testrunner-appserver/launchpad-lazr.conf	2011-09-24 03:03:08 +0000
+++ configs/testrunner-appserver/launchpad-lazr.conf	2014-01-14 06:48:55 +0000
@@ -11,6 +11,9 @@
 [google_test_service]
 launch: False
 
+[launchpad]
+openid_provider_root: http://testopenid.dev:8085/
+
 [librarian_server]
 launch: False
 

=== modified file 'configs/testrunner/launchpad-lazr.conf'
--- configs/testrunner/launchpad-lazr.conf	2013-07-04 05:38:43 +0000
+++ configs/testrunner/launchpad-lazr.conf	2014-01-14 06:48:55 +0000
@@ -106,6 +106,8 @@
 # We use the stub Google Service here which maps URL fragment to
 # to static content
 homepage_recent_posts_feed: http://launchpad.dev:8092/blog-feed
+openid_provider_root: http://testopenid.dev/
+openid_alternate_provider_roots: http://login1.dev/, http://login2.dev/
 
 [launchpad_session]
 cookie: launchpad_tests

=== modified file 'lib/lp/services/config/schema-lazr.conf'
--- lib/lp/services/config/schema-lazr.conf	2013-12-12 08:17:53 +0000
+++ lib/lp/services/config/schema-lazr.conf	2014-01-14 06:48:55 +0000
@@ -814,8 +814,17 @@
 
 # The vhost used as the OpenID provider to log into Launchpad.
 # datatype: string
+# vhost is being replaced with a direct URL.
 openid_provider_vhost: openid
 
+# URL to the OpenID provider to authenticate against.
+openid_provider_root: none
+
+# Comma-separated list of additional URLs to recognise as valid prefixes
+# for our accounts' OpenID identifiers. We only store the suffix, and
+# the suffix is provided by two providers.
+openid_alternate_provider_roots: none
+
 # If true, the main template will be styled so that it is
 # obvious to the end user that they are using a demo system
 # and that any changes they make will be lost at some point.