Merge branch 'master' of github.com:IdentityPython/pyFF

IdentityPython · Jun 10, 2020 · 098b209 · 098b209
2 parents c508f99 + 438721a
commit 098b209
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/docs/usage/running.rst b/docs/usage/running.rst
@@ -56,15 +56,15 @@ a basic example:
   - when request:
     - select:
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
             - first
             - finalize:
                 cacheDuration: PT12H
                 validUntil: P10D
             - sign:
                 key: sign.key
                 cert: sign.crt
-            - emit application/xml
+            - emit application/samlmetadata+xml
             - break
         - when accept application/json:
             - discojson
@@ -75,7 +75,7 @@ a basic example:
 Lets pick this pipeline apart. First notice the two *when* instructions. The :ref:`pyff.builtins:when` pipe is used to 
 conditionally execute a set of instructions. There is essentially only one type of condition. When processing a pipeline
 pyFF keeps a state variable (a dict-like object) which changes as the instructions are processed. When the pipeline is
-launched the state is initialized with a a set of key-value pairs used to control execution of the pipeline. 
+launched the state is initialized with a set of key-value pairs used to control execution of the pipeline.
 
 There are a few pre-defined states, in this case we're dealing with two: the execution mode `update` or `request` (we'll
 get to that one later) or the `accept` state used to implement content negotiation in the pyFF wsgi app. In fact there are
@@ -109,7 +109,7 @@ appear to have no parameters, is actually "fed" from the request processing of p
 
 The subsequent calls to `when` implements content negotiation to provide a discojuice and XML version of the 
 metadata depending on what the caller is asking for. This is key to using pyFF as a backend to the thiss.io discovery 
-service for instance.
+service. More than one content type may be specified to accommodate noncompliant MDQ clients.
 
 The rest of the XML "branch" of the pipeline should be pretty easy to understand. First we use the 
 :py:func:`pyff.builtins.first` pipe to ensure that we only return a single EntityDescriptor if our select

diff --git a/examples/edugain-copy.fd b/examples/edugain-copy.fd
@@ -18,7 +18,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - pipe:
                  - when path /md/swamid-kalmar-1.0:
                      - xslt:
@@ -34,7 +34,7 @@
              - sign:
                  key: sign.key
                  cert: sign.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - discojson

diff --git a/examples/edugain-mdq.fd b/examples/edugain-mdq.fd
@@ -4,15 +4,15 @@
 - when request:
   - select:
   - pipe:
-    - when accept application/xml:
+    - when accept application/samlmetadata+xml application/xml:
       - first
       - finalize:
           cacheDuration: PT12H
           validUntil: P10D
       - sign:
           key: sign.key
           cert: sign.crt
-      - emit application/xml
+      - emit application/samlmetadata+xml
       - break
     - when accept application/json:
       - discojson

diff --git a/examples/eidas.fd b/examples/eidas.fd
@@ -16,7 +16,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - xslt:
                  stylesheet: tidy.xsl
              - first
@@ -26,7 +26,7 @@
              - sign:
                  key: sign.key
                  cert: sign.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - discojson

diff --git a/examples/mdx.fd b/examples/mdx.fd
@@ -40,7 +40,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - pipe:
                  - when path /md/swamid-kalmar-1.0:
                      - xslt:
@@ -56,7 +56,7 @@
              - sign:
                  key: sign.key
                  cert: sign.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - discojson

diff --git a/examples/met.mdx b/examples/met.mdx
@@ -42,7 +42,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - xslt:
                  stylesheet: tidy.xsl
              - pubinfo:
@@ -54,7 +54,7 @@
              - sign:
                  key: default.key
                  cert: default.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - xslt:

diff --git a/examples/ndn.fd b/examples/ndn.fd
@@ -18,7 +18,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - xslt:
                  stylesheet: tidy.xsl
              - first
@@ -28,7 +28,7 @@
              - sign:
                  key: sign.key
                  cert: sign.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - discojson

diff --git a/examples/new-renater.fd b/examples/new-renater.fd
@@ -6,7 +6,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - xslt:
                  stylesheet: tidy.xsl
              - first
@@ -16,7 +16,7 @@
              - sign:
                  key: sign.key
                  cert: sign.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - discojson

diff --git a/examples/test.fd b/examples/test.fd
@@ -26,7 +26,7 @@
 - when request:
     - select
     - pipe:
-        - when accept application/xml:
+        - when accept application/samlmetadata+xml application/xml:
              - pipe:
                  - when path /md/swamid-kalmar-1.0:
                      - xslt:
@@ -41,7 +41,7 @@
              - sign:
                 key: sign.key
                 cert: sign.crt
-             - emit application/xml
+             - emit application/samlmetadata+xml
              - break
         - when accept application/json:
              - discojson