[cpp-sp COMMIT] in /branches/REL_2: Shibboleth.sln shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver....

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 19 17:24:37 2015
New Revision: 3891

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3891&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-624

Modified:
    branches/REL_2/Shibboleth.sln
    branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
    branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
    branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp
    branches/REL_2/shibsp/handler/impl/SAML2Logout.cpp
    branches/REL_2/shibsp/handler/impl/SAML2LogoutInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SAML2NameIDMgmt.cpp
    branches/REL_2/shibsp/handler/impl/SAML2SessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SAMLDSSessionInitiator.cpp
    branches/REL_2/shibsp/handler/impl/SecuredHandler.cpp
    branches/REL_2/shibsp/impl/XMLAccessControl.cpp
    branches/REL_2/shibsp/impl/XMLServiceProvider.cpp
    branches/REL_2/shibsp/remoting/impl/TCPListener.cpp

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3891&r1=3890&r2=3891&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Mon Jan 19 17:24:37 2015
@@ -324,21 +324,13 @@
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.ActiveCfg = Release|x64
 		{A2140D6E-C2C6-4329-84E3-2F530CEBE442}.Release|x64.Build.0 = Release|x64
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|Win32.Build.0 = Debug|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.ActiveCfg = Debug|x64
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Debug|x64.Build.0 = Debug|x64
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|Win32.ActiveCfg = Release|Win32
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|Win32.Build.0 = Release|Win32
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.ActiveCfg = Release|x64
-		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.Build.0 = Release|x64
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.Build.0 = Debug|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.ActiveCfg = Debug|x64
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.Build.0 = Debug|x64
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.ActiveCfg = Release|Win32
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.Build.0 = Release|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.ActiveCfg = Release|x64
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp?rev=3891&r1=3890&r2=3891&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp Mon Jan 19 17:24:37 2015
@@ -256,6 +256,7 @@
     if (aid && *aid) {
         auto_ptr_char dup(aid);
         string sdup(dup.get());
+        trim(sdup);
         split(m_attributeIds, sdup, is_space(), algorithm::token_compress_on);
 
         aid = e->getAttributeNS(nullptr, format);

Modified: branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp?rev=3891&r1=3890&r2=3891&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp Mon Jan 19 17:24:37 2015
@@ -348,6 +348,7 @@
             m_log.warn("attribute mapping rule (%s) uses deprecated aliases feature, consider revising", id.get());
             auto_ptr_char aliases(name);
             string dup(aliases.get());
+            trim(dup);
             set<string> new_aliases;
             split(new_aliases, dup, is_space(), algorithm::token_compress_on);
             set<string>::iterator ru = new_aliases.find("REMOTE_USER");

Modified: branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp?rev=3891&r1=3890&r2=3891&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/AttributeCheckerHandler.cpp Mon Jan 19 17:24:37 2015
@@ -123,6 +123,7 @@
 

[... 173 lines stripped ...]