From 81709d9382147a133331f271c5778ca50436b216 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Feb 15 2017 16:11:33 +0000
Subject: [PATCH 1/2] Document the quickrun.py script in the README


It's really useful for development & testing and is probably the
easest way for people to evaluate Ipsilon.

Signed-off-by: Sam Thursfield <sam.thursfield@codethink.co.uk>

---

diff --git a/README.md b/README.md
index fa85224..c35e659 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,23 @@ SAML is called a Service Provider.
 Ipsilon uses the [LASSO](http://lasso.entrouvert.org) libraries and Python
 bindings to implement SAML support.
 
+Quick test instance
+===================
+
+You can run a test instance of Ipsilson from a Git clone, using the
+`quickrun.py` script:
+
+    $ ./quickrun.py
+
+This will start an instance which you can access at <http://localhost:8080>.
+You can log with any username and password 'ipsilon'. Log in with the special
+username 'admin' to get access to the administration console; you can then
+visit http://localhost:8080/admin and configure the various identity providers
+and more.
+
+The local state is stored in the ./qrun subdirectory, and will be re-loaded
+from that directory the next time that the `quickrun.py` script is run.
+
 Ipsilon Server Installation
 ===========================
 

From 93af60b5e2085dff49f1bb7b802905400727fb87 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Feb 15 2017 16:11:37 +0000
Subject: [PATCH 2/2] Set the default provider URLs to match quickrun.py default URL


This means that the OpenID and OpenID Connect plugins work "out of the
box" when the quickrun.py script is used.

Signed-off-by: Sam Thursfield <sam.thursfield@codethink.co.uk>

---

diff --git a/ipsilon/providers/openidcp.py b/ipsilon/providers/openidcp.py
index 7a68c7c..58ba86e 100644
--- a/ipsilon/providers/openidcp.py
+++ b/ipsilon/providers/openidcp.py
@@ -51,7 +51,7 @@ Provides OpenID Connect authentication infrastructure. """
             pconfig.String(
                 'endpoint url',
                 'The Absolute URL of the OpenID Connect provider',
-                'http://localhost:8080/idp/openidc/'),
+                'http://localhost:8080/openidc/'),
             pconfig.String(
                 'documentation url',
                 'The Absolute URL of the OpenID Connect documentation',
diff --git a/ipsilon/providers/openidp.py b/ipsilon/providers/openidp.py
index 0b07170..4e5f7c8 100644
--- a/ipsilon/providers/openidp.py
+++ b/ipsilon/providers/openidp.py
@@ -41,11 +41,11 @@ Provides OpenID 2.0 authentication infrastructure. """
             pconfig.String(
                 'endpoint url',
                 'The Absolute URL of the OpenID provider',
-                'http://localhost:8080/idp/openid/'),
+                'http://localhost:8080/openid/'),
             pconfig.Template(
                 'identity url template',
                 'The templated URL where identities are exposed.',
-                'http://localhost:8080/idp/openid/id/%(username)s'),
+                'http://localhost:8080/openid/id/%(username)s'),
             pconfig.List(
                 'trusted roots',
                 'List of trusted relying parties.'),