From: Scott Cantor Date: Fri, 9 Feb 2007 02:29:33 +0000 (+0000) Subject: Shorten "built-in" plugin types, delete stale files, new config file. X-Git-Tag: 2.0-alpha1~133 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=367e6dc963d5c985981a68f811745bde504577d9 Shorten "built-in" plugin types, delete stale files, new config file. --- diff --git a/Makefile.am b/Makefile.am index b006f94..2989f94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I . EXTRA_DIST = \ schemas doc isapi_shib isapi_shib_gui \ Shibboleth.sln libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \ - config_win32.h posttest/posttest.vcproj shibtest/shibtest.vcproj \ + config_win32.h shibtest/shibtest.vcproj \ shibboleth.spec.in shibboleth.spec pkginfo.in pkginfo checkinstall dist-hook: diff --git a/Shibboleth.dsw b/Shibboleth.dsw deleted file mode 100644 index b951432..0000000 --- a/Shibboleth.dsw +++ /dev/null @@ -1,269 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "isapi_shib"=.\isapi_shib\isapi_shib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "isapi_shib_gui"=.\isapi_shib_gui\isapi_shib_gui.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "mod_shib13"=.\apache\mod_shib13.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency -}}} - -############################################################################### - -Project: "mod_shib20"=.\apache\mod_shib20.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "nsapi_shib"=.\nsapi_shib\nsapi_shib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "oncrpc"=.\oncrpc\oncrpc.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "posttest"=.\posttest\posttest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency -}}} - -############################################################################### - -Project: "shar"=.\shar\shar.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name oncrpc - End Project Dependency - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "shib"=.\shib\shib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "shib_mysql_ccache"=".\shib-mysql-ccache\shib_mysql_ccache.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "shibtarget"=".\shib-target\shibtarget.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name oncrpc - End Project Dependency -}}} - -############################################################################### - -Project: "shibtest"=.\shibtest\shibtest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "siterefresh"=.\siterefresh\siterefresh.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency -}}} - -############################################################################### - -Project: "testclient"=.\shar\testclient.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency - Begin Project Dependency - Project_Dep_Name shibtarget - End Project Dependency - Begin Project Dependency - Project_Dep_Name oncrpc - End Project Dependency -}}} - -############################################################################### - -Project: "xmlproviders"=.\xmlproviders\xmlproviders.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name shib - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/apache/mod_shib13.dsp b/apache/mod_shib13.dsp deleted file mode 100644 index 8c833c5..0000000 --- a/apache/mod_shib13.dsp +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_shib13" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_shib13 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_shib13.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_shib13.mak" CFG="mod_shib13 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_shib13 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_shib13 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_shib13 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB13_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /I "\Apache\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "EAPI" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 log4cpp.lib xerces-c_2.lib ApacheCore.lib saml_5.lib /nologo /dll /machine:I386 /out:"Release/mod_shib_13.so" /libpath:"../../../opensaml/c/saml/Release" /libpath:"\Apache\libexec" - -!ELSEIF "$(CFG)" == "mod_shib13 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB13_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /I "\Apache\include" /D "_WINDOWS" /D "EAPI" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 log4cppD.lib xerces-c_2D.lib ApacheCore.lib saml_5D.lib /nologo /dll /debug /machine:I386 /out:"Debug/mod_shib_13.so" /pdbtype:sept /libpath:"../../../opensaml/c/saml/Debug" /libpath:"\Apache\libexec" - -!ENDIF - -# Begin Target - -# Name "mod_shib13 - Win32 Release" -# Name "mod_shib13 - Win32 Debug" -# Begin Source File - -SOURCE=.\mod_shib_13.cpp -# End Source File -# Begin Source File - -SOURCE=.\mod_shib_13.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Target -# End Project diff --git a/apache/mod_shib20.dsp b/apache/mod_shib20.dsp deleted file mode 100644 index 58846ef..0000000 --- a/apache/mod_shib20.dsp +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="mod_shib20" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=mod_shib20 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "mod_shib20.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "mod_shib20.mak" CFG="mod_shib20 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "mod_shib20 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_shib20 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "mod_shib20 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "mod_shib20___Win32_Release" -# PROP Intermediate_Dir "mod_shib20___Win32_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB20_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /I "\Apache2\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 log4cpp.lib xerces-c_2.lib libapr.lib libhttpd.lib saml_5.lib /nologo /dll /machine:I386 /out:"mod_shib20___Win32_Release/mod_shib_20.so" /libpath:"../../../opensaml/c/saml/Release" /libpath:"\httpd-2.0.52\srclib\apr\Release" /libpath:"\httpd-2.0.52\Release" - -!ELSEIF "$(CFG)" == "mod_shib20 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "mod_shib20___Win32_Debug" -# PROP BASE Intermediate_Dir "mod_shib20___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "mod_shib20___Win32_Debug" -# PROP Intermediate_Dir "mod_shib20___Win32_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_SHIB20_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /I "\Apache2\include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 log4cppD.lib xerces-c_2D.lib libapr.lib libhttpd.lib saml_5D.lib /nologo /dll /debug /machine:I386 /out:"mod_shib20___Win32_Debug/mod_shib_20.so" /pdbtype:sept /libpath:"../../../opensaml/c/saml/Debug" /libpath:"\httpd-2.0.52\srclib\apr\Debug" /libpath:"\httpd-2.0.52\Debug" - -!ENDIF - -# Begin Target - -# Name "mod_shib20 - Win32 Release" -# Name "mod_shib20 - Win32 Debug" -# Begin Source File - -SOURCE=.\mod_shib_20.cpp -# End Source File -# Begin Source File - -SOURCE=.\mod_shib_20.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Target -# End Project diff --git a/isapi_shib/isapi_shib.dsp b/isapi_shib/isapi_shib.dsp deleted file mode 100644 index 69d292e..0000000 --- a/isapi_shib/isapi_shib.dsp +++ /dev/null @@ -1,105 +0,0 @@ -# Microsoft Developer Studio Project File - Name="isapi_shib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=isapi_shib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "isapi_shib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "isapi_shib.mak" CFG="isapi_shib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "isapi_shib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "isapi_shib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "isapi_shib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_SHIB_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I ".." /I "..\..\..\opensaml\c" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 log4cpp.lib xerces-c_2.lib advapi32.lib kernel32.lib saml_5.lib /nologo /dll /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release" /export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "isapi_shib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_SHIB_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".." /I "..\..\..\opensaml\c" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 log4cppD.lib xerces-c_2D.lib advapi32.lib kernel32.lib saml_5D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" /export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "isapi_shib - Win32 Release" -# Name "isapi_shib - Win32 Debug" -# Begin Source File - -SOURCE=.\isapi_shib.cpp -# End Source File -# Begin Source File - -SOURCE=.\isapi_shib.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Target -# End Project diff --git a/nsapi_shib/nsapi_shib.dsp b/nsapi_shib/nsapi_shib.dsp deleted file mode 100644 index 3f9bbd0..0000000 --- a/nsapi_shib/nsapi_shib.dsp +++ /dev/null @@ -1,103 +0,0 @@ -# Microsoft Developer Studio Project File - Name="nsapi_shib" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=nsapi_shib - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nsapi_shib.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nsapi_shib.mak" CFG="nsapi_shib - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nsapi_shib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "nsapi_shib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nsapi_shib - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_SHIB_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I ".." /I "..\..\..\opensaml\c" /I "\\KRAMER\iPlanet\plugins\include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 log4cpp.lib xerces-c_2.lib saml_5.lib ns-httpd30.lib /nologo /dll /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release" /libpath:"\\KRAMER\iPlanet\plugins\lib" - -!ELSEIF "$(CFG)" == "nsapi_shib - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NSAPI_SHIB_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I ".." /I "..\..\..\opensaml\c" /I "\\KRAMER\iPlanet\plugins\include" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 log4cppD.lib xerces-c_2D.lib saml_5D.lib ns-httpd30.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" /libpath:"\\KRAMER\iPlanet\plugins\lib" - -!ENDIF - -# Begin Target - -# Name "nsapi_shib - Win32 Release" -# Name "nsapi_shib - Win32 Debug" -# Begin Source File - -SOURCE=.\nsapi_shib.cpp -# End Source File -# Begin Source File - -SOURCE=.\nsapi_shib.rc -# End Source File -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# End Target -# End Project diff --git a/posttest/posttest.dsp b/posttest/posttest.dsp deleted file mode 100644 index 6f3d10c..0000000 --- a/posttest/posttest.dsp +++ /dev/null @@ -1,90 +0,0 @@ -# Microsoft Developer Studio Project File - Name="posttest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=posttest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "posttest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "posttest.mak" CFG="posttest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "posttest - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "posttest - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "posttest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 xerces-c_2.lib saml_5.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release" - -!ELSEIF "$(CFG)" == "posttest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 xerces-c_2D.lib saml_5D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" - -!ENDIF - -# Begin Target - -# Name "posttest - Win32 Release" -# Name "posttest - Win32 Debug" -# Begin Source File - -SOURCE=..\test\posttest.cpp -# End Source File -# End Target -# End Project diff --git a/posttest/posttest.vcproj b/posttest/posttest.vcproj deleted file mode 100644 index 6489634..0000000 --- a/posttest/posttest.vcproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/Makefile.am b/schemas/Makefile.am index 0c596e6..32b39ad 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -8,18 +8,9 @@ pkgxml_DATA = \ catalog.xml \ shibboleth-metadata-1.0.xsd \ shibboleth-targetconfig-1.0.xsd \ - cs-sstc-schema-assertion-01.xsd \ - cs-sstc-schema-protocol-01.xsd \ - cs-sstc-schema-assertion-1.1.xsd \ - cs-sstc-schema-protocol-1.1.xsd \ - soap-envelope.xsd \ - xmldsig-core-schema.xsd \ - xenc-schema.xsd \ - xml.xsd \ + shibboleth-spconfig-2.0.xsd \ shibboleth.xsd \ shibboleth-trust-1.0.xsd \ - saml-schema-assertion-2.0.xsd \ - saml-schema-metadata-2.0.xsd \ metadata_v12_to_v11.xsl \ metadata_v12_to_v13.xsl \ metadata_v13_to_v12.xsl \ @@ -44,4 +35,5 @@ CLEANFILES = catalog.xml EXTRA_DIST = catalog.xml.in \ shibboleth-metadata-1.0.xsd \ - shibboleth-targetconfig-1.0.xsd + shibboleth-targetconfig-1.0.xsd \ + shibboleth-spconfig-2.0.xsd diff --git a/schemas/cs-sstc-schema-assertion-01.xsd b/schemas/cs-sstc-schema-assertion-01.xsd deleted file mode 100644 index 16e8cc9..0000000 --- a/schemas/cs-sstc-schema-assertion-01.xsd +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - Document identifier: cs-sstc-schema-assertion-01 - Location: http://www.oasis-open.org/committees/security/docs/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/cs-sstc-schema-assertion-1.1.xsd b/schemas/cs-sstc-schema-assertion-1.1.xsd deleted file mode 100644 index 26f9458..0000000 --- a/schemas/cs-sstc-schema-assertion-1.1.xsd +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - Document identifier: sstc-saml-schema-assertion-1.1-draft-02 - Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security - Revision history: - draft-01 (Eve Maler): - Note that V1.1 of this schema has the same namespace as V1.0. - Minor cosmetic updates. - Changed IDType to restrict from xsd:ID. - Changed IDReferenceType to restrict from xsd:IDREF. - Set version attribute on schema element to 1.1. - draft-02 (Prateek Mishra, Rob Philpott): - Added DoNotCacheCondition element and DoNotCacheConditionType - draft-03 (Scott Cantor) - Rebased ID content directly on XML Schema types - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/cs-sstc-schema-protocol-01.xsd b/schemas/cs-sstc-schema-protocol-01.xsd deleted file mode 100644 index bbd7297..0000000 --- a/schemas/cs-sstc-schema-protocol-01.xsd +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - Document identifier: cs-sstc-schema-protocol-01 - Location: http://www.oasis-open.org/committees/security/docs/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/cs-sstc-schema-protocol-1.1.xsd b/schemas/cs-sstc-schema-protocol-1.1.xsd deleted file mode 100644 index e956251..0000000 --- a/schemas/cs-sstc-schema-protocol-1.1.xsd +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - Document identifier: sstc-saml-schema-protocol-1.1-draft-03 - Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security - Revision history: - draft-01 (Eve Maler): - Note that V1.1 of this schema has the same namespace as V1.0. - Minor cosmetic updates. - Set version attribute on schema element to 1.1. - draft-01 (Eve Maler): - Fix document Identifier. - draft-02 (Prateek Mishra, Rob Philpott): - Added DoNotCacheCondition. - draft-04 (Scott Cantor): - Rebased ID content directly on XML Schema types - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/saml-schema-assertion-2.0.xsd b/schemas/saml-schema-assertion-2.0.xsd deleted file mode 100644 index 09fd045..0000000 --- a/schemas/saml-schema-assertion-2.0.xsd +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - Document identifier: saml-schema-assertion-2.0 - Location: http://docs.oasis-open.org/security/saml/v2.0/ - Revision history: - V1.0 (November, 2002): - Initial Standard Schema. - V1.1 (September, 2003): - Updates within the same V1.0 namespace. - V2.0 (March, 2005): - New assertion schema for SAML V2.0 namespace. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/saml-schema-metadata-2.0.xsd b/schemas/saml-schema-metadata-2.0.xsd deleted file mode 100644 index fc8b206..0000000 --- a/schemas/saml-schema-metadata-2.0.xsd +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - Document identifier: saml-schema-metadata-2.0 - Location: http://docs.oasis-open.org/security/saml/v2.0/ - Revision history: - V2.0 (March, 2005): - Schema for SAML metadata, first published in SAML 2.0. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/shibboleth-spconfig-2.0.xsd b/schemas/shibboleth-spconfig-2.0.xsd new file mode 100644 index 0000000..61d13f6 --- /dev/null +++ b/schemas/shibboleth-spconfig-2.0.xsd @@ -0,0 +1,479 @@ + + + + + + + + + 2.0 schema for XML-based configuration of Shibboleth SP instances. + First appearing in Shibboleth 2.0 release. + + + + + + + + + + + + + + + + + Root of configuration + + + + + + + + + + + + + + + + + + + + + + + + + Container for extension libraries and custom configuration + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Container for shibd out-of-process configuration + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Container for configuration of locally integrated or platform-specific + features (e.g. web server filters) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A simple example access policy language extension that supersedes Apache .htaccess + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Built-in request mapping syntax, decomposes URLs into Host/Path/Path/... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Container for global settings and application-specific overrides + + + + + + + + + + + + + + + + + + + + + + + + Container for application-specific overrides + + + + + + + + + + + + + + + + + + + + + + + Container for specifying protocol handlers and session policy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Used to specify handlers that can issue AuthnRequests + + + + + + + + + + + + + + + + + + + Container for error templates and associated details + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Container for specifying security methods to use with particular peers + + + + + + + + + + + + + + + + + + + + + + + Container for specifying sources of credentials + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/shibboleth-targetconfig-1.0.xsd b/schemas/shibboleth-targetconfig-1.0.xsd index f05f7da..98e80bc 100644 --- a/schemas/shibboleth-targetconfig-1.0.xsd +++ b/schemas/shibboleth-targetconfig-1.0.xsd @@ -85,7 +85,6 @@ - @@ -94,17 +93,6 @@ - - - - - - - - - - - @@ -154,19 +142,10 @@ - - - - - - - - - @@ -209,6 +188,7 @@ + diff --git a/schemas/soap-envelope.xsd b/schemas/soap-envelope.xsd deleted file mode 100644 index 7cf869d..0000000 --- a/schemas/soap-envelope.xsd +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Prose in the spec does not specify that attributes are allowed on the Body element - - - - - - - - - - - - - - - - - - - - 'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification - - - - - - - - - - - - - - - Fault reporting structure - - - - - - - - - - - - - - - - - - - diff --git a/schemas/xenc-schema.xsd b/schemas/xenc-schema.xsd deleted file mode 100644 index c902d4f..0000000 --- a/schemas/xenc-schema.xsd +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/xml.xsd b/schemas/xml.xsd deleted file mode 100644 index 38bba34..0000000 --- a/schemas/xml.xsd +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - See http://www.w3.org/XML/1998/namespace.html and - http://www.w3.org/TR/REC-xml for information about this namespace. - - - - - This schema defines attributes and an attribute group - suitable for use by - schemas wishing to allow xml:base, xml:lang or xml:space attributes - on elements they define. - - To enable this, such a schema must import this schema - for the XML namespace, e.g. as follows: - <schema . . .> - . . . - <import namespace="http://www.w3.org/XML/1998/namespace" - schemaLocation="http://www.w3.org/2001/03/xml.xsd"/> - - Subsequently, qualified reference to any of the attributes - or the group defined below will have the desired effect, e.g. - - <type . . .> - . . . - <attributeGroup ref="xml:specialAttrs"/> - - will define a type which will schema-validate an instance - element with any of those attributes - - - - In keeping with the XML Schema WG's standard versioning - policy, this schema document will persist at - http://www.w3.org/2001/03/xml.xsd. - At the date of issue it can also be found at - http://www.w3.org/2001/xml.xsd. - The schema document at that URI may however change in the future, - in order to remain compatible with the latest version of XML Schema - itself. In other words, if the XML Schema namespace changes, the version - of this document at - http://www.w3.org/2001/xml.xsd will change - accordingly; the version at - http://www.w3.org/2001/03/xml.xsd will not change. - - - - - - In due course, we should install the relevant ISO 2- and 3-letter - codes as the enumerated possible values . . . - - - - - - - - - - - - - - - See http://www.w3.org/TR/xmlbase/ for - information about this attribute. - - - - - - - - - - diff --git a/schemas/xmldsig-core-schema.xsd b/schemas/xmldsig-core-schema.xsd deleted file mode 100644 index f9bcf5a..0000000 --- a/schemas/xmldsig-core-schema.xsd +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shar/shar.dsp b/shar/shar.dsp deleted file mode 100644 index 6a4335f..0000000 --- a/shar/shar.dsp +++ /dev/null @@ -1,122 +0,0 @@ -# Microsoft Developer Studio Project File - Name="shar" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=shar - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "shar.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "shar.mak" CFG="shar - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "shar - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "shar - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "shar - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /I "..\oncrpc" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib advapi32.lib log4cpp.lib saml_5.lib /nologo /subsystem:console /machine:I386 /out:"Release/shibd.exe" /libpath:"..\..\..\opensaml\c\saml\Release" - -!ELSEIF "$(CFG)" == "shar - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /I "..\oncrpc" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib advapi32.lib log4cppD.lib saml_5D.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/shibd.exe" /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" - -!ENDIF - -# Begin Target - -# Name "shar - Win32 Release" -# Name "shar - Win32 Debug" -# Begin Source File - -SOURCE=.\resource.h -# End Source File -# Begin Source File - -SOURCE=".\shar-utils.cpp" -# End Source File -# Begin Source File - -SOURCE=".\shar-utils.h" -# End Source File -# Begin Source File - -SOURCE=.\shar.cpp -# End Source File -# Begin Source File - -SOURCE=.\shar.rc -# End Source File -# Begin Source File - -SOURCE=.\shar_win32.cpp -# End Source File -# Begin Source File - -SOURCE=".\shibrpc-server.cpp" -# End Source File -# Begin Source File - -SOURCE="..\shib-target\shibrpc-svc.c" -# End Source File -# Begin Source File - -SOURCE="..\shib-target\shibrpc-xdr.c" -# End Source File -# End Target -# End Project diff --git a/shar/test-client.cpp b/shar/test-client.cpp deleted file mode 100644 index 945b848..0000000 --- a/shar/test-client.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2001-2007 Internet2 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifdef WIN32 -# define _CRT_NONSTDC_NO_DEPRECATE 1 -# define _CRT_SECURE_NO_DEPRECATE 1 -#endif - -#include -#include -#include - -using namespace shibsp; -using namespace shibtarget; -using namespace saml; -using namespace xmltooling; -using namespace std; - -int main (int argc, char *argv[]) -{ - if (argc<=1) { - cerr << "usage: testclient " << endl; - return -1; - } - const char* config=getenv("SHIBCONFIG"); - if (!config) - config=SHIB_CONFIG; - const char* schemadir=getenv("SHIBSCHEMAS"); - if (!schemadir) - schemadir=SHIB_SCHEMAS; - - ShibTargetConfig& conf=ShibTargetConfig::getConfig(); - SPConfig::getConfig().setFeatures(SPConfig::Listener | SPConfig::InProcess); - if (!conf.init(schemadir) || !conf.load(config)) - return -10; - - try { - DDF in("ping"); - DDFJanitor injan(in); - in.integer(atol(argv[1])); - - DDF out=SPConfig::getConfig().getServiceProvider()->getListenerService()->send(in); - DDFJanitor outjan(out); - - cerr << argv[1] << " -> " << out.integer() << "\n"; - } - catch (exception& e) { - cerr << "caught exception: " << e.what() << "\n"; - } - - conf.shutdown(); - return 0; -} diff --git a/shar/testclient.dsp b/shar/testclient.dsp deleted file mode 100644 index bc66197..0000000 --- a/shar/testclient.dsp +++ /dev/null @@ -1,90 +0,0 @@ -# Microsoft Developer Studio Project File - Name="testclient" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=testclient - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "testclient.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "testclient.mak" CFG="testclient - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "testclient - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "testclient - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "testclient - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "testclient___Win32_Release" -# PROP BASE Intermediate_Dir "testclient___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "testclient___Win32_Release" -# PROP Intermediate_Dir "testclient___Win32_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "../oncrpc" /I "..\..\..\opensaml\c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "testclient - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "testclient___Win32_Debug" -# PROP BASE Intermediate_Dir "testclient___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "testclient___Win32_Debug" -# PROP Intermediate_Dir "testclient___Win32_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "../oncrpc" /I "..\..\..\opensaml\c" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "testclient - Win32 Release" -# Name "testclient - Win32 Debug" -# Begin Source File - -SOURCE=".\test-client.cpp" -# End Source File -# End Target -# End Project diff --git a/shar/testclient.vcproj b/shar/testclient.vcproj deleted file mode 100644 index 05463cd..0000000 --- a/shar/testclient.vcproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shibsp/AccessControl.h b/shibsp/AccessControl.h index 8587d4f..7d3ea73 100644 --- a/shibsp/AccessControl.h +++ b/shibsp/AccessControl.h @@ -62,10 +62,10 @@ namespace shibsp { void SHIBSP_API registerAccessControls(); /** AccessControl based on rudimentary XML syntax. */ - #define XML_ACCESS_CONTROL "edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl" + #define XML_ACCESS_CONTROL "XML" /** Reserved for Apache-style .htaccess support. */ - #define HT_ACCESS_CONTROL "edu.internet2.middleware.shibboleth.sp.apache.provider.htAccessControl" + #define HT_ACCESS_CONTROL "htaccess" }; #endif /* __shibsp_acl_h__ */ diff --git a/shibsp/RequestMapper.h b/shibsp/RequestMapper.h index b680e6b..e3bae59 100644 --- a/shibsp/RequestMapper.h +++ b/shibsp/RequestMapper.h @@ -64,10 +64,10 @@ namespace shibsp { void SHIBSP_API registerRequestMappers(); /** XML-based RequestMapper implementation. */ - #define XML_REQUEST_MAPPER "edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider" + #define XML_REQUEST_MAPPER "XML" /** Hybrid of XML and platform-specific configuration. */ - #define NATIVE_REQUEST_MAPPER "edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider" + #define NATIVE_REQUEST_MAPPER "Native" }; #endif /* __shibsp_reqmap_h__ */ diff --git a/shibsp/ServiceProvider.h b/shibsp/ServiceProvider.h index cd4d3e1..e9ea103 100644 --- a/shibsp/ServiceProvider.h +++ b/shibsp/ServiceProvider.h @@ -170,7 +170,7 @@ namespace shibsp { void SHIBSP_API registerServiceProviders(); /** SP based on integrated XML and native server configuration. */ - #define XML_SERVICE_PROVIDER "edu.internet2.middleware.shibboleth.sp.provider.XMLServiceProvider" + #define XML_SERVICE_PROVIDER "XML" }; #endif /* __shibsp_sp_h__ */ diff --git a/shibsp/SessionCache.h b/shibsp/SessionCache.h index 46195d2..d350927 100644 --- a/shibsp/SessionCache.h +++ b/shibsp/SessionCache.h @@ -223,10 +223,10 @@ namespace shibsp { }; /** SessionCache implementation that delegates to a remoted version. */ - #define REMOTED_SESSION_CACHE "edu.internet2.middleware.shibboleth.sp.provider.RemotedSessionCache" + #define REMOTED_SESSION_CACHE "Remoted" /** SessionCache implementation backed by a StorageService. */ - #define STORAGESERVICE_SESSION_CACHE "edu.internet2.middleware.shibboleth.sp.provider.StorageServiceSessionCache" + #define STORAGESERVICE_SESSION_CACHE "StorageService" /** * Registers SessionCache classes into the runtime. diff --git a/shibsp/impl/XMLAccessControl.cpp b/shibsp/impl/XMLAccessControl.cpp index 6058eff..68a9a1d 100644 --- a/shibsp/impl/XMLAccessControl.cpp +++ b/shibsp/impl/XMLAccessControl.cpp @@ -117,7 +117,9 @@ namespace { void SHIBSP_API shibsp::registerAccessControls() { - SPConfig::getConfig().AccessControlManager.registerFactory(XML_ACCESS_CONTROL, XMLAccessControlFactory); + SPConfig& conf=SPConfig::getConfig(); + conf.AccessControlManager.registerFactory(XML_ACCESS_CONTROL, XMLAccessControlFactory); + conf.AccessControlManager.registerFactory("edu.internet2.middleware.shibboleth.sp.provider.XMLAccessControl", XMLAccessControlFactory); } Rule::Rule(const DOMElement* e) diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp index d356923..772c51c 100644 --- a/shibsp/impl/XMLRequestMapper.cpp +++ b/shibsp/impl/XMLRequestMapper.cpp @@ -154,7 +154,10 @@ void SHIBSP_API shibsp::registerRequestMappers() { SPConfig& conf=SPConfig::getConfig(); conf.RequestMapperManager.registerFactory(XML_REQUEST_MAPPER, XMLRequestMapperFactory); + conf.RequestMapperManager.registerFactory("edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider", XMLRequestMapperFactory); + conf.RequestMapperManager.registerFactory("edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap", XMLRequestMapperFactory); conf.RequestMapperManager.registerFactory(NATIVE_REQUEST_MAPPER, XMLRequestMapperFactory); + conf.RequestMapperManager.registerFactory("edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider", XMLRequestMapperFactory); } short Override::acceptNode(const DOMNode* node) const diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp index 4267ccd..b2b87fb 100644 --- a/shibsp/impl/XMLServiceProvider.cpp +++ b/shibsp/impl/XMLServiceProvider.cpp @@ -343,17 +343,16 @@ XMLApplication::XMLApplication( bool hardACS=false, hardSessionInit=false; const DOMElement* child = XMLHelper::getFirstChildElement(propcheck->getElement()); while (child) { - xmltooling::auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME)); - if (!bindprop.get() || !*(bindprop.get())) { - log.warn("md:AssertionConsumerService element has no Binding attribute, skipping it..."); - child = XMLHelper::getNextSiblingElement(child); - continue; - } - try { // A handler is based on the Binding property in conjunction with the element name. // If it's an ACS or SI, also handle index/id mappings and defaulting. if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,AssertionConsumerService::LOCAL_NAME)) { + auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME)); + if (!bindprop.get() || !*(bindprop.get())) { + log.warn("md:AssertionConsumerService element has no Binding attribute, skipping it..."); + child = XMLHelper::getNextSiblingElement(child); + continue; + } handler=conf.AssertionConsumerServiceManager.newPlugin(bindprop.get(),child); // Map by binding (may be > 1 per binding, e.g. SAML 1.0 vs 1.1) #ifdef HAVE_GOOD_STL @@ -376,6 +375,12 @@ XMLApplication::XMLApplication( } } else if (XMLString::equals(child->getLocalName(),SessionInitiator)) { + auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME)); + if (!bindprop.get() || !*(bindprop.get())) { + log.warn("SessionInitiator element has no Binding attribute, skipping it..."); + child = XMLHelper::getNextSiblingElement(child); + continue; + } handler=conf.SessionInitiatorManager.newPlugin(bindprop.get(),child); pair si_id=handler->getString("id"); if (si_id.first && si_id.second) @@ -393,13 +398,31 @@ XMLApplication::XMLApplication( } } else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,SingleLogoutService::LOCAL_NAME)) { + auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME)); + if (!bindprop.get() || !*(bindprop.get())) { + log.warn("md:SingleLogoutService element has no Binding attribute, skipping it..."); + child = XMLHelper::getNextSiblingElement(child); + continue; + } handler=conf.SingleLogoutServiceManager.newPlugin(bindprop.get(),child); } else if (XMLHelper::isNodeNamed(child,samlconstants::SAML20MD_NS,ManageNameIDService::LOCAL_NAME)) { + auto_ptr_char bindprop(child->getAttributeNS(NULL,EndpointType::BINDING_ATTRIB_NAME)); + if (!bindprop.get() || !*(bindprop.get())) { + log.warn("md:ManageNameIDService element has no Binding attribute, skipping it..."); + child = XMLHelper::getNextSiblingElement(child); + continue; + } handler=conf.ManageNameIDServiceManager.newPlugin(bindprop.get(),child); } else { - handler=conf.HandlerManager.newPlugin(bindprop.get(),child); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); + if (!type.get() || !*(type.get())) { + log.warn("Handler element has no type attribute, skipping it..."); + child = XMLHelper::getNextSiblingElement(child); + continue; + } + handler=conf.HandlerManager.newPlugin(type.get(),child); } // Save off the objects after giving the property set to the handler for its use. @@ -463,7 +486,7 @@ XMLApplication::XMLApplication( vector os2providers; child = XMLHelper::getFirstChildElement(e,_MetadataProvider); while (child) { - xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type)); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); log.info("building metadata provider of type %s...",type.get()); try { auto_ptr mp(samlConf.MetadataProviderManager.newPlugin(type.get(),child)); @@ -499,7 +522,7 @@ XMLApplication::XMLApplication( ChainingTrustEngine* chainTrust = NULL; child = XMLHelper::getFirstChildElement(e,TrustProvider); while (child) { - xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type)); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); log.info("building trust provider of type %s...",type.get()); try { if (!m_trust) { @@ -725,7 +748,7 @@ const vector& XMLApplication::getAssertionConsumerServicesByBind #ifdef HAVE_GOOD_STL ACSBindingMap::const_iterator i=m_acsBindingMap.find(binding); #else - xmltooling::auto_ptr_char temp(binding); + auto_ptr_char temp(binding); ACSBindingMap::const_iterator i=m_acsBindingMap.find(temp.get()); #endif if (i!=m_acsBindingMap.end()) @@ -774,7 +797,7 @@ void XMLConfigImpl::doExtensions(const DOMElement* e, const char* label, Categor if (exts) { exts=XMLHelper::getFirstChildElement(exts,Library); while (exts) { - xmltooling::auto_ptr_char path(exts->getAttributeNS(NULL,_path)); + auto_ptr_char path(exts->getAttributeNS(NULL,_path)); try { if (path.get()) { XMLToolingConfig::getConfig().load_library(path.get(),(void*)exts); @@ -823,7 +846,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o if (!logconf || !*logconf) logconf=e->getAttributeNS(NULL,logger); if (logconf && *logconf) { - xmltooling::auto_ptr_char logpath(logconf); + auto_ptr_char logpath(logconf); log.debug("loading new logging configuration from (%s), check log destination for status of configuration",logpath.get()); XMLToolingConfig::getConfig().log_config(logpath.get()); } @@ -872,7 +895,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o else { child=XMLHelper::getFirstChildElement(SHAR,Listener); if (child) { - xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type)); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); if (type.get()) plugtype=type.get(); } @@ -898,8 +921,8 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o string inmemID; child=XMLHelper::getFirstChildElement(container,_StorageService); while (child) { - xmltooling::auto_ptr_char id(child->getAttributeNS(NULL,Id)); - xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type)); + auto_ptr_char id(child->getAttributeNS(NULL,Id)); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); if (id.get() && type.get()) { try { log.info("building StorageService (%s) of type %s...", id.get(), type.get()); @@ -916,7 +939,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o child=XMLHelper::getFirstChildElement(container,_SessionCache); if (child) { - xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type)); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); log.info("building Session Cache of type %s...",type.get()); m_outer->m_sessionCache=conf.SessionCacheManager.newPlugin(type.get(),child); } @@ -941,7 +964,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o StorageService* replaySS=NULL; child=XMLHelper::getFirstChildElement(container,_ReplayCache); if (child) { - xmltooling::auto_ptr_char ssid(child->getAttributeNS(NULL,_StorageService)); + auto_ptr_char ssid(child->getAttributeNS(NULL,_StorageService)); if (ssid.get() && *ssid.get()) { replaySS = m_outer->m_storage[ssid.get()]; if (replaySS) @@ -967,7 +990,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o if (conf.isEnabled(SPConfig::RequestMapping)) { child=XMLHelper::getFirstChildElement(SHIRE,RequestMapProvider); if (child) { - xmltooling::auto_ptr_char type(child->getAttributeNS(NULL,_type)); + auto_ptr_char type(child->getAttributeNS(NULL,_type)); log.info("building RequestMapper of type %s...",type.get()); m_requestMapper=conf.RequestMapperManager.newPlugin(type.get(),child); } @@ -986,9 +1009,9 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o // Step down and process resolvers. child=XMLHelper::getFirstChildElement(child); while (child) { - xmltooling::auto_ptr_char id(child->getAttributeNS(NULL,Id)); + auto_ptr_char id(child->getAttributeNS(NULL,Id)); if (!id.get() || !*(id.get())) { - log.warn("skipping CredentialsResolver with no Id attribute"); + log.warn("skipping CredentialResolver with no Id attribute"); child = XMLHelper::getNextSiblingElement(child); continue; } @@ -996,7 +1019,7 @@ XMLConfigImpl::XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* o if (XMLString::equals(child->getLocalName(),FileResolver)) plugtype=FILESYSTEM_CREDENTIAL_RESOLVER; else { - xmltooling::auto_ptr_char c(child->getAttributeNS(NULL,_type)); + auto_ptr_char c(child->getAttributeNS(NULL,_type)); plugtype=c.get(); } diff --git a/shibsp/remoting/ListenerService.h b/shibsp/remoting/ListenerService.h index 931b2b1..f3cf95d 100644 --- a/shibsp/remoting/ListenerService.h +++ b/shibsp/remoting/ListenerService.h @@ -138,13 +138,13 @@ namespace shibsp { void SHIBSP_API registerListenerServices(); /** Listener based on in-memory simulated remoting. */ - #define MEMORY_LISTENER_SERVICE "edu.internet2.middleware.shibboleth.sp.provider.MemoryListener" + #define MEMORY_LISTENER_SERVICE "MemoryListener" /** Listener based on TCP socket remoting. */ - #define TCP_LISTENER_SERVICE "edu.internet2.middleware.shibboleth.sp.provider.TCPListener" + #define TCP_LISTENER_SERVICE "TCPListener" /** Listener based on UNIX domain socket remoting. */ - #define UNIX_LISTENER_SERVICE "edu.internet2.middleware.shibboleth.sp.provider.UnixListener" + #define UNIX_LISTENER_SERVICE "UnixListener" }; #endif /* __shibsp_listener_h__ */ diff --git a/siterefresh/siterefresh.dsp b/siterefresh/siterefresh.dsp deleted file mode 100644 index aba1c74..0000000 --- a/siterefresh/siterefresh.dsp +++ /dev/null @@ -1,90 +0,0 @@ -# Microsoft Developer Studio Project File - Name="siterefresh" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=siterefresh - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "siterefresh.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "siterefresh.mak" CFG="siterefresh - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "siterefresh - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "siterefresh - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "siterefresh - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I ".." /I "..\..\..\opensaml\c" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 log4cpp.lib xerces-c_2.lib xsec_1_2.lib saml_5.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\opensaml\c\saml\Release" - -!ELSEIF "$(CFG)" == "siterefresh - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I ".." /I "..\..\..\opensaml\c" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 log4cppD.lib xerces-c_2D.lib xsec_1_2D.lib saml_5D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\opensaml\c\saml\Debug" - -!ENDIF - -# Begin Target - -# Name "siterefresh - Win32 Release" -# Name "siterefresh - Win32 Debug" -# Begin Source File - -SOURCE=.\siterefresh.cpp -# End Source File -# End Target -# End Project diff --git a/test/Makefile.am b/test/Makefile.am index 373c82a..a5346a3 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,14 +2,9 @@ AUTOMAKE_OPTIONS = foreign -bin_PROGRAMS = shibtest posttest +bin_PROGRAMS = shibtest shibtest_SOURCES = shibtest.cpp -posttest_SOURCES = posttest.cpp - shibtest_LDADD = $(top_builddir)/shib/libshib.la \ $(top_builddir)/shib-target/libshib-target.la - -posttest_LDADD = $(top_builddir)/shib/libshib.la \ - $(top_builddir)/shib-target/libshib-target.la diff --git a/test/inittest.cpp b/test/inittest.cpp deleted file mode 100644 index 1a86c10..0000000 --- a/test/inittest.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2001-2007 Internet2 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "../shib-target/shib-target.h" -#include "../shib-target/shib-paths.h" - -using namespace std; -using namespace saml; -using namespace shibboleth; -using namespace shibtarget; - -ShibTargetConfig* g_Config = NULL; - -void shutdown(void) -{ - g_Config->shutdown(); - g_Config = NULL; -} - -void init(void) -{ - try { - g_Config=&ShibTargetConfig::getConfig(); - g_Config->setFeatures( - ShibTargetConfig::Listener | - ShibTargetConfig::Metadata | - ShibTargetConfig::AAP | - ShibTargetConfig::RequestMapper | - ShibTargetConfig::LocalExtensions - ); - - if (!g_Config->init(SHIB_SCHEMAS) || !g_Config->load(SHIB_CONFIG)) { - cerr << "init() failed to initialize SHIB Target" << endl; - exit(1); - } - } - catch (...) { - cerr << "init() failed to initialize SHIB Target" << endl; - exit (1); - } -} - -int main(int argc, char* argv[]) -{ - cout << "Running init 1.." << endl; - init(); - cout << "Running shutdown 1.." << endl; - shutdown(); - cout << "Running init 2.." << endl; - init(); - cout << "Running shutdown 2.." << endl; - shutdown(); - cout << "Done." << endl; - exit(0); -} diff --git a/test/posttest.cpp b/test/posttest.cpp deleted file mode 100644 index c295825..0000000 --- a/test/posttest.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2001-2007 Internet2 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifdef WIN32 -# define _CRT_NONSTDC_NO_DEPRECATE 1 -# define _CRT_SECURE_NO_DEPRECATE 1 -#endif - -#include -#include - -#include -#include - -using namespace shibsp; -using namespace shibtarget; -using namespace shibboleth; -using namespace saml; -using namespace std; - -int main(int argc,char* argv[]) -{ - char* a_param=NULL; - char* r_param=NULL; - char* f_param=NULL; - char* path=NULL; - char* config=NULL; - - for (int i=1; i -r [-a -d -c ]" << endl; - exit(0); - } - - if (!path) - path=getenv("SHIBSCHEMAS"); - if (!path) - path=SHIB_SCHEMAS; - if (!config) - config=getenv("SHIBCONFIG"); - if (!config) - config=SHIB_CONFIG; - if (!a_param) - a_param="default"; - - ShibTargetConfig& conf=ShibTargetConfig::getConfig(); - SPConfig::getConfig().setFeatures( - SPConfig::Listener | - SPConfig::Metadata | - SPConfig::Trust | - SPConfig::OutOfProcess - ); - if (!conf.init(path) || !conf.load(config)) - return -10; - - try { - string buf; - ifstream is(f_param); - char ch; - is >> ch; - while (!is.fail()) { - buf+=ch; - is >> ch; - } - - auto_ptr_XMLCh recip(r_param); - - ServiceProvider* sp=SPConfig::getConfig().getServiceProvider(); - xmltooling::Locker locker(sp); - - const IApplication* app=dynamic_cast(sp->getApplication(a_param)); - if (!app) { - throw ConfigurationException("Unable to locate application for new session, deleted?"); - } - - SAMLBrowserProfile::BrowserProfileResponse bpr= - app->getBrowserProfile()->receive(buf.c_str(), recip.get(), NULL, 1); - - cout << "Success!" << endl; - bpr.clear(); - } - catch(exception& e) { - cerr << "caught an exception: " << e.what() << endl; - } - - conf.shutdown(); - return 0; -}