[cpp-sp] branch master updated: CPPXT-120 - Set disallow-doctype property on DOMLSParser

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=da99bf905514a0a1a7227a6f1735daa41c643d3e

The following commit(s) were added to refs/heads/master by this push:
       new  da99bf9   CPPXT-120 - Set disallow-doctype property on DOMLSParser
da99bf9 is described below

commit da99bf905514a0a1a7227a6f1735daa41c643d3e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jan 12 14:05:57 2018 -0500

    CPPXT-120 - Set disallow-doctype property on DOMLSParser
    
    https://issues.shibboleth.net/jira/browse/CPPXT-120
    
    Remove environment variable hack.
---
 schemas/shibboleth-2.0-native-sp-config.xsd | 3 +++
 shibsp/impl/XMLServiceProvider.cpp          | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index dbb1e24..83f177e 100644
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -843,7 +843,10 @@
       <attribute name="langFromClient" type="boolean"/>
       <attribute name="langPriority" type="conf:listOfStrings"/>
       <attribute name="contactPriority" type="conf:listOfStrings"/>
+      
+      <!-- Unsupported. -->
       <attribute name="disableDTD" type="boolean"/>
+      
       <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
   </element>
diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index b48f1c5..544b054 100644
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -2051,13 +2051,6 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, XMLConfig* outer,
 
     // Much of the processing can only occur on the first instantiation.
     if (first) {
-        // Disable DTD processing by default if Xerces happens to be new enough,
-        // but not so new that we can control it with parser settings.
-        pair<bool,bool> disableDTD = getBool("disableDTD");
-        if (!disableDTD.first || disableDTD.second) {
-            putenv("XERCES_DISABLE_DTD=1");
-        }
-
         // Set clock skew.
         pair<bool,unsigned int> skew=getUnsignedInt("clockSkew");
         if (skew.first)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.