[cpp-sp COMMIT] in /branches/REL_2: config_win32.h configure.ac shibsp/Makefile.am shibsp/config_pub.h.in shibsp/hand...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 17 18:35:31 2011
New Revision: 3530

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

Added:
    branches/REL_2/shibsp/util/IPRange.cpp
    branches/REL_2/shibsp/util/IPRange.h
Modified:
    branches/REL_2/config_win32.h
    branches/REL_2/configure.ac
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/config_pub.h.in
    branches/REL_2/shibsp/handler/impl/AssertionLookup.cpp
    branches/REL_2/shibsp/handler/impl/MetadataGenerator.cpp
    branches/REL_2/shibsp/handler/impl/SessionHandler.cpp
    branches/REL_2/shibsp/handler/impl/StatusHandler.cpp
    branches/REL_2/shibsp/remoting/impl/SocketListener.cpp
    branches/REL_2/shibsp/remoting/impl/SocketListener.h
    branches/REL_2/shibsp/remoting/impl/TCPListener.cpp
    branches/REL_2/shibsp/remoting/impl/UnixListener.cpp
    branches/REL_2/shibsp/shibsp-lite.vcxproj
    branches/REL_2/shibsp/shibsp-lite.vcxproj.filters
    branches/REL_2/shibsp/shibsp.vcxproj
    branches/REL_2/shibsp/shibsp.vcxproj.filters

Modified: branches/REL_2/config_win32.h
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/config_win32.h?rev=3530&r1=3529&r2=3530&view=diff
==============================================================================
--- branches/REL_2/config_win32.h (original)
+++ branches/REL_2/config_win32.h Mon Oct 17 18:35:31 2011
@@ -122,6 +122,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
 
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
 /* Name of package */
 #define PACKAGE "shibboleth"
 

Modified: branches/REL_2/configure.ac
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configure.ac?rev=3530&r1=3529&r2=3530&view=diff
==============================================================================
--- branches/REL_2/configure.ac (original)
+++ branches/REL_2/configure.ac Mon Oct 17 18:35:31 2011
@@ -73,7 +73,9 @@
 AC_FUNC_STRFTIME
 AC_FUNC_STRERROR_R
 AC_CHECK_HEADERS([sys/utsname.h grp.h pwd.h])
+AC_CHECK_HEADERS([sys/socket.h], [AC_DEFINE([SHIBSP_HAVE_SYS_SOCKET_H],[1],[Define to 1 if you have the <sys/socket> header file.])], [])
 AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r strtok_r strcasecmp getpwnam getgrnam])
+AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include <sys/socket.h>]])
 
 # checks for pthreads
 ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])

Modified: branches/REL_2/shibsp/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/Makefile.am?rev=3530&r1=3529&r2=3530&view=diff
==============================================================================
--- branches/REL_2/shibsp/Makefile.am (original)
+++ branches/REL_2/shibsp/Makefile.am Mon Oct 17 18:35:31 2011
@@ -98,6 +98,7 @@
 utilinclude_HEADERS = \
 	util/CGIParser.h \
 	util/DOMPropertySet.h \
+	util/IPRange.h \
 	util/PropertySet.h \
 	util/SPConstants.h \
 	util/TemplateParameters.h
@@ -159,6 +160,7 @@
 	remoting/impl/UnixListener.cpp \
 	util/CGIParser.cpp \
 	util/DOMPropertySet.cpp \
+	util/IPRange.cpp \
 	util/SPConstants.cpp \
 	util/TemplateParameters.cpp
 

Modified: branches/REL_2/shibsp/config_pub.h.in
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/config_pub.h.in?rev=3530&r1=3529&r2=3530&view=diff
==============================================================================
--- branches/REL_2/shibsp/config_pub.h.in (original)
+++ branches/REL_2/shibsp/config_pub.h.in Mon Oct 17 18:35:31 2011
@@ -24,3 +24,6 @@
 
 /* Define to 1 if XML-Security-C supports white/blacklisting algorithms. */
 #undef SHIBSP_XMLSEC_WHITELISTING
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef SHIBSP_HAVE_SYS_SOCKET_H

Modified: branches/REL_2/shibsp/handler/impl/AssertionLookup.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/handler/impl/AssertionLookup.cpp?rev=3530&r1=3529&r2=3530&view=diff
==============================================================================
--- branches/REL_2/shibsp/handler/impl/AssertionLookup.cpp (original)
+++ branches/REL_2/shibsp/handler/impl/AssertionLookup.cpp Mon Oct 17 18:35:31 2011
@@ -32,6 +32,7 @@
 #include "SPRequest.h"
 #include "handler/AbstractHandler.h"
 #include "handler/RemotedHandler.h"
+#include "util/IPRange.h"
 #include "util/SPConstants.h"
 
 #ifndef SHIBSP_LITE
@@ -84,7 +85,7 @@
     private:
         pair<bool,long> processMessage(const Application& application, HTTPRequest& httpRequest, HTTPResponse& httpResponse) const;
 
-        set<string> m_acl;
+        vector<IPRange> m_acl;
     };
 
 #if defined (_MSC_VER)
@@ -101,31 +102,51 @@
 AssertionLookup::AssertionLookup(const DOMElement* e, const char* appId)
     : AbstractHandler(e, Category::getInstance(SHIBSP_LOGCAT".AssertionLookup"), &g_Blocker)
 {
-    setAddress("run::AssertionLookup");
     if (SPConfig::getConfig().isEnabled(SPConfig::InProcess)) {
         pair<bool,const char*> acl = getString("exportACL");
-        if (!acl.first) {

[... 773 lines stripped ...]