Add an option for emulating 1.1 authn request

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1023 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/schemas/shibboleth-targetconfig-1.0.xsd b/schemas/shibboleth-targetconfig-1.0.xsd
index 6842688..b95e091 100644 (file)
--- a/schemas/shibboleth-targetconfig-1.0.xsd
+++ b/schemas/shibboleth-targetconfig-1.0.xsd
@@ -368,6 +368,7 @@
                                        <attribute name="lifetime" type="unsignedInt" use="optional"/>
                                        <attribute name="timeout" type="unsignedInt" use="optional"/>
                                        <attribute name="checkAddress" type="boolean" use="optional"/>
+                                       <attribute name="oldAuthnRequest" type="boolean" use="optional"/>
                 </extension>
             </complexContent>
                </complexType>

diff --git a/shib-target/shib-shire.cpp b/shib-target/shib-shire.cpp
index 0e13512..2dbbe28 100644 (file)
--- a/shib-target/shib-shire.cpp
+++ b/shib-target/shib-shire.cpp
@@ -313,9 +313,12 @@ const char* SHIRE::getAuthnRequest(const char* resource)
         if (wayf.first) {
             m_authnRequest=m_authnRequest + wayf.second + "?shire=" + url_encode(getShireURL(resource)) +
                 "&target=" + url_encode(resource) + "&time=" + timebuf;
-            wayf=m_app->getString("providerId");
-            if (wayf.first)
-                m_authnRequest=m_authnRequest + "&providerId=" + wayf.second;
+            pair<bool,bool> old=m_app->getBool("oldAuthnRequest");
+            if (!old.first || !old.second) {
+                wayf=m_app->getString("providerId");
+                if (wayf.first)
+                    m_authnRequest=m_authnRequest + "&providerId=" + wayf.second;
+            }
         }
     }
     return m_authnRequest.c_str();