From ba93f428e363eaeba99b8567724e675a2f4a867f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 28 Jul 2016 13:19:34 -0400 Subject: correct cut/paste error for setting PO_HTTP_PROXY, and add logging --- indra/llcorehttp/_httppolicyglobal.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/_httppolicyglobal.cpp b/indra/llcorehttp/_httppolicyglobal.cpp index 3d0df96ade..8da6cba6d0 100644 --- a/indra/llcorehttp/_httppolicyglobal.cpp +++ b/indra/llcorehttp/_httppolicyglobal.cpp @@ -88,15 +88,18 @@ HttpStatus HttpPolicyGlobal::set(HttpRequest::EPolicyOption opt, const std::stri switch (opt) { case HttpRequest::PO_CA_PATH: + LL_DEBUGS("CoreHttp") << "Setting global CA Path to " << value << LL_ENDL; mCAPath = value; break; case HttpRequest::PO_CA_FILE: + LL_DEBUGS("CoreHttp") << "Setting global CA File to " << value << LL_ENDL; mCAFile = value; break; case HttpRequest::PO_HTTP_PROXY: - mCAFile = value; + LL_DEBUGS("CoreHttp") << "Setting global Proxy to " << value << LL_ENDL; + mHttpProxy = value; break; default: -- cgit v1.2.3 From f43768414daedd89f922e0d7e9e96f639ceb9bfa Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 6 Dec 2016 13:07:10 -0500 Subject: comment out llcorehttp_test until it can be debugged again --- indra/llcorehttp/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 0bb0348d26..2919e8b6e2 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -136,13 +136,13 @@ if (LL_TESTS) # If http_proxy is in the current environment (e.g. to fetch s3-proxy # autobuild packages), suppress it for this integration test: it screws up # the tests. - LL_ADD_INTEGRATION_TEST(llcorehttp - "${llcorehttp_TEST_SOURCE_FILES}" - "${test_libs}" - "-Dhttp_proxy" - ${PYTHON_EXECUTABLE} - "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" - ) + #LL_ADD_INTEGRATION_TEST(llcorehttp + # "${llcorehttp_TEST_SOURCE_FILES}" + # "${test_libs}" + # "-Dhttp_proxy" + # ${PYTHON_EXECUTABLE} + # "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" + # ) if (DARWIN) # Path inside the app bundle where we'll need to copy libraries -- cgit v1.2.3 From fd3628ef45a8160f2434e0d8b747d31d65685340 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 14 Apr 2017 16:05:59 -0400 Subject: Change certificate store infrastructure to key off of the Subject Key Id rather than sha1 hash, since that is rarely used in modern certs. The previous form was storing trusted certs using an empty sha1 hash value as the key, which meant most certificates matched... not good. Modify the LLCertException to pass certificate information back as LLSD rather than an LLPointer, because when the exception is being thown from the certificate constructor that results in one of a couple of other exceptions (even refcounting won't save you when the problem is that the thing you're pointing to never finished coming into being properly). Update the certificates in the llsechandler_basic_test to modern conventions, and extend the classes to allow for an optional validation date so that the test can use a fixed date. Also make all the certificates include the plain text form for ease of reference. --- indra/llcorehttp/httpcommon.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h index b2db01d038..d715fea78f 100644 --- a/indra/llcorehttp/httpcommon.h +++ b/indra/llcorehttp/httpcommon.h @@ -188,6 +188,7 @@ /// #include "linden_common.h" // Modifies curl/curl.h interfaces +#include "llsd.h" #include "boost/intrusive_ptr.hpp" #include "boost/shared_ptr.hpp" #include "boost/weak_ptr.hpp" @@ -447,14 +448,14 @@ struct HttpStatus mDetails->mMessage = message; } - /// Retrieves an optionally recorded SSL certificate. - void * getErrorData() const + /// Retrieves data about an optionally recorded SSL certificate. + LLSD getErrorData() const { return mDetails->mErrorData; } /// Optionally sets an SSL certificate on this status. - void setErrorData(void *data) + void setErrorData(LLSD data) { mDetails->mErrorData = data; } @@ -467,7 +468,7 @@ private: mType(type), mStatus(status), mMessage(), - mErrorData(NULL) + mErrorData() {} Details(const Details &rhs) : @@ -485,7 +486,7 @@ private: type_enum_t mType; short mStatus; std::string mMessage; - void * mErrorData; + LLSD mErrorData; }; boost::shared_ptr
mDetails; -- cgit v1.2.3 From 5bfc1e7ed764f4d63b02a2f0c4081c55acae9cdb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 18 Jan 2018 08:23:49 -0500 Subject: copy all versions of libnghttp for tests --- indra/llcorehttp/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 40ec836f12..bff329f4a5 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -180,6 +180,10 @@ if (DARWIN) COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LL_TEST_DESTINATION_DIR} DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ) + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libnghttp2*.dylib ${LL_TEST_DESTINATION_DIR} + DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libnghttp2.dylib + ) foreach(expat ${EXPAT_COPY}) add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LL_TEST_DESTINATION_DIR} -- cgit v1.2.3