[cpp-sp] 01/01: Stuff to get Curl agent to run on windows
Rod Widdowson
rdw at steadingsoftware.com
Thu Feb 6 19:52:03 UTC 2025
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/CurlWindows
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=9552267ed91b09421e7dfc48edc63526560f1c4e
commit 9552267ed91b09421e7dfc48edc63526560f1c4e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Feb 6 19:51:30 2025 +0000
Stuff to get Curl agent to run on windows
---
Projects/vc22/Tests.vcxproj | 20 ++++++++++++++++++--
Projects/vc22/Tests.vcxproj.filters | 9 +++++++++
Projects/vc22/shibsp.vcxproj | 10 ++--------
shibsp/impl/DefaultAgent.cpp | 3 ++-
shibsp/remoting/impl/RemotingService.cpp | 2 ++
5 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/Projects/vc22/Tests.vcxproj b/Projects/vc22/Tests.vcxproj
index 6e5826ef..e05056ec 100644
--- a/Projects/vc22/Tests.vcxproj
+++ b/Projects/vc22/Tests.vcxproj
@@ -31,6 +31,22 @@
<ClCompile Include="..\..\tests\AgentTestSuite.cpp" />
<ClCompile Include="..\..\tests\impl\XMLAccessControlTests.cpp" />
<ClCompile Include="..\..\tests\impl\XMLRequestMapperTests.cpp" />
+ <ClCompile Include="..\..\tests\remoting\impl\RemotingServiceTests.cpp">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\tests\remoting\impl\SecretSourceTests.cpp">
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS=1;SHIBSP_LITE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
<ClCompile Include="..\..\tests\util\BoostPropertySetTests.cpp" />
<ClCompile Include="..\..\tests\util\PropertyTreeTests.cpp" />
<ClCompile Include="..\..\tests\util\ReloadableXMLFileTests.cpp" />
@@ -116,7 +132,7 @@
<LibraryPath>$(SolutionDir)$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <IncludePath>$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -124,7 +140,7 @@
<LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(SolutionDir)..\..\..\boost_1_80_0;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
+ <IncludePath>$(SolutionDir)..\..\..\boost;$(SolutionDir)..\..\;$(SolutionDir)..\..\shibsp;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
diff --git a/Projects/vc22/Tests.vcxproj.filters b/Projects/vc22/Tests.vcxproj.filters
index 2dace4bb..97eeff11 100644
--- a/Projects/vc22/Tests.vcxproj.filters
+++ b/Projects/vc22/Tests.vcxproj.filters
@@ -19,6 +19,9 @@
<Filter Include="Source Files\impl">
<UniqueIdentifier>{65368c35-c39d-4f73-8bd8-771497000c2e}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source Files\Remoting">
+ <UniqueIdentifier>{d27f888b-e50a-4bab-beb9-93d592b10c86}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\tests\AgentTestSuite.cpp">
@@ -42,5 +45,11 @@
<ClCompile Include="..\..\tests\util\ReloadableXMLFileTests.cpp">
<Filter>Source Files\util</Filter>
</ClCompile>
+ <ClCompile Include="..\..\tests\remoting\impl\RemotingServiceTests.cpp">
+ <Filter>Source Files\Remoting</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\tests\remoting\impl\SecretSourceTests.cpp">
+ <Filter>Source Files\Remoting</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/Projects/vc22/shibsp.vcxproj b/Projects/vc22/shibsp.vcxproj
index 5eeb86ef..af54a134 100644
--- a/Projects/vc22/shibsp.vcxproj
+++ b/Projects/vc22/shibsp.vcxproj
@@ -167,12 +167,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">_HAS_STD_BYTE=0;SHIBSP_LITE;WIN32;NDEBUG;SHIBSP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_HAS_STD_BYTE=0;SHIBSP_LITE;WIN32;_DEBUG;SHIBSP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_HAS_STD_BYTE=0;SHIBSP_LITE;WIN32;NDEBUG;SHIBSP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\shibsp\remoting\impl\ddf.cpp">
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -387,7 +381,7 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>Ws2_32.lib;$(IntDir)\NativeEventLog.res;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>V:\perforce\SP\curl\builds\libcurl-vc-x64-release-dll-ipv6-sspi\lib\libcurl.lib;Ws2_32.lib;$(IntDir)\NativeEventLog.res;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -425,7 +419,7 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>Ws2_32.lib;$(IntDir)\NativeEventLog.res;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>V:\perforce\SP\curl\builds\libcurl-vc-x64-release-dll-ipv6-sspi\lib\libcurl.lib;Ws2_32.lib;$(IntDir)\NativeEventLog.res;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
diff --git a/shibsp/impl/DefaultAgent.cpp b/shibsp/impl/DefaultAgent.cpp
index ac559c49..869fe40b 100644
--- a/shibsp/impl/DefaultAgent.cpp
+++ b/shibsp/impl/DefaultAgent.cpp
@@ -156,7 +156,8 @@ void DefaultAgent::doRemotingService()
if (child) {
string t(child->get("type",
#ifdef WIN32
- WIN_HTTP_REMOTING_SERVICE
+ CURL_HTTP_REMOTING_SERVICE
+ //WIN_HTTP_REMOTING_SERVICE
#else
CURL_HTTP_REMOTING_SERVICE
#endif
diff --git a/shibsp/remoting/impl/RemotingService.cpp b/shibsp/remoting/impl/RemotingService.cpp
index fccf4894..27adb0d1 100644
--- a/shibsp/remoting/impl/RemotingService.cpp
+++ b/shibsp/remoting/impl/RemotingService.cpp
@@ -31,6 +31,7 @@ using namespace std;
namespace shibsp {
#ifdef WIN32
extern RemotingService* SHIBSP_DLLLOCAL WinHTTPRemotingServiceFactory(ptree& pt, bool deprecationSupport);
+ extern RemotingService* SHIBSP_DLLLOCAL CurlHTTPRemotingServiceFactory(ptree& pt, bool deprecationSupport);
#else
extern RemotingService* SHIBSP_DLLLOCAL CurlHTTPRemotingServiceFactory(ptree& pt, bool deprecationSupport);
#endif
@@ -40,6 +41,7 @@ void SHIBSP_API shibsp::registerRemotingServices()
{
#ifdef WIN32
//AgentConfig::getConfig().RemotingServiceManager.registerFactory(WIN_HTTP_REMOTING_SERVICE, WinHTTPRemotingServiceFactory);
+ AgentConfig::getConfig().RemotingServiceManager.registerFactory(CURL_HTTP_REMOTING_SERVICE, CurlHTTPRemotingServiceFactory);
#else
AgentConfig::getConfig().RemotingServiceManager.registerFactory(CURL_HTTP_REMOTING_SERVICE, CurlHTTPRemotingServiceFactory);
#endif
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list