Change default mapper type to "Native".

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

diff --git a/apache/mod_apache.cpp b/apache/mod_apache.cpp
index fb0b92e..9b793d1 100644 (file)
--- a/apache/mod_apache.cpp
+++ b/apache/mod_apache.cpp
@@ -879,9 +879,8 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s)
             exit(1);
         }
         SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::htAccessControlType,&htAccessFactory);
-        SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::ApacheRequestMapType,&ApacheRequestMapFactory);
-        
-        // We hijack the legacy type so that 1.2 config files will load this plugin instead of the basic plugin.
+        SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::NativeRequestMapType,&ApacheRequestMapFactory);
+        // We hijack the legacy type so that 1.2 config files will load this plugin
         SAMLConfig::getConfig().getPlugMgr().regFactory(shibtarget::XML::LegacyRequestMapType,&ApacheRequestMapFactory);
         
         if (!g_Config->load(g_szSHIBConfig)) {

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index b2c92f2..1d78e1d 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -58,26 +58,20 @@
         <!--
         To customize behavior, map hostnames and path components to applicationId and other settings.
         The following provider types are available with the delivered code:
-               type="edu.internet2.middleware.shibboleth.sp.apache.provider.ApacheRequestMapProvider"
-                       - Apache-specific plugin that allows Apache commands (like ShibRequireSession) to
-                               override or supplement the XML syntax, and supplies an htaccess authz plugin
-                               for all content if not overridden here.
+               type="edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider"
+                       - Web-server-specific plugin that allows native commands (like Apache's
+                               ShibRequireSession) to override or supplement the XML syntax. The Apache
+                               version also supplies an htaccess authz plugin for all content.
 
-               type="edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap"
-                       - legacy plugin, alias for "edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider"
-                               except on Apache, where the module will override this type with the provider above,
-                               to ensure behavior identical to 1.2 when older configuration files are supplied
-        
                type="edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider"
                        - portable plugin that does not support the older Apache-specific commands and works
                                the same on all web platforms, this plugin does NOT support htaccess files
                                for authz unless you also place an <htaccess/> element somewhere in the map
 
-                       By default, the "legacy" plugin (the middle one above) is left in place, since that
-                       matches 1.2 behavior on both Apache and IIS. Changing to one of the other two is
-                       suggested, depending on whether you're using Apache or not.
+                       By default, the "native" plugin (the first one above) is used, since it matches 1.2
+                       behavior on both Apache and IIS.
         -->
-        <RequestMapProvider type="edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap">
+        <RequestMapProvider type="edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider">
             <RequestMap applicationId="default">
                 <!--
                 This requires a session for documents in /secure on the containing host with http and

diff --git a/shib-target/XML.cpp b/shib-target/XML.cpp
index 2b60a70..835bc87 100644 (file)
--- a/shib-target/XML.cpp
+++ b/shib-target/XML.cpp
@@ -66,7 +66,7 @@ const char XML::MySQLSessionCacheType[] =   "edu.internet2.middleware.shibboleth
 const char XML::MySQLReplayCacheType[] =    "edu.internet2.middleware.shibboleth.sp.provider.MySQLReplayCacheProvider";
 
 const char XML::XMLRequestMapType[] =       "edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider";
-const char XML::ApacheRequestMapType[] =    "edu.internet2.middleware.shibboleth.sp.apache.provider.ApacheRequestMapProvider";
+const char XML::NativeRequestMapType[] =    "edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider";
 const char XML::LegacyRequestMapType[] =    "edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap";
 
 const char XML::htAccessControlType[] =     "edu.internet2.middleware.shibboleth.sp.apache.provider.htAccessControl";

diff --git a/shib-target/shib-config.cpp b/shib-target/shib-config.cpp
index 29ccbdf..7316c7f 100644 (file)
--- a/shib-target/shib-config.cpp
+++ b/shib-target/shib-config.cpp
@@ -165,6 +165,7 @@ bool STConfig::init(const char* schemadir)
     samlConf.getPlugMgr().regFactory(shibtarget::XML::MemorySessionCacheType,&MemoryCacheFactory);
     samlConf.getPlugMgr().regFactory(shibtarget::XML::LegacyRequestMapType,&XMLRequestMapFactory);
     samlConf.getPlugMgr().regFactory(shibtarget::XML::XMLRequestMapType,&XMLRequestMapFactory);
+    samlConf.getPlugMgr().regFactory(shibtarget::XML::NativeRequestMapType,&XMLRequestMapFactory);
     
     saml::XML::registerSchema(shibtarget::XML::SHIBTARGET_NS,shibtarget::XML::SHIBTARGET_SCHEMA_ID);
     saml::XML::registerSchema(shibtarget::XML::SAML2META_NS,shibtarget::XML::SAML2META_SCHEMA_ID);

diff --git a/shib-target/shib-target.h b/shib-target/shib-target.h
index b8cff89..5054a3a 100644 (file)
--- a/shib-target/shib-target.h
+++ b/shib-target/shib-target.h
@@ -468,8 +468,8 @@ namespace shibtarget {
         
         // Request mapping/settings implementations
         static const char XMLRequestMapType[];      // portable XML-based map
-        static const char ApacheRequestMapType[];   // Apache command override of XML-based map
-        static const char LegacyRequestMapType[];   // older designation of XML map, hijacked by Apache
+        static const char NativeRequestMapType[];   // Native web server command override of XML-based map
+        static const char LegacyRequestMapType[];   // older designation of XML map, hijacked by web server
         
         // Access control implementations
         static const char htAccessControlType[];    // Apache-specific .htaccess authz module