Implement directory listing

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "vendor/gtest"]
 	path = vendor/gtest
 	url = https://github.com/google/googletest.git
+
+[submodule "vendor/tinyxml2"]
+	path = vendor/tinyxml2
+	url = https://github.com/leethomason/tinyxml2.git

CMakeLists.txt

@@ -47,12 +47,19 @@ if(NOT APPLE)
   SET( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined")
 endif()
 
+if( NOT XROOTD_EXTERNAL_TINYXML2 )
+	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+	add_subdirectory(vendor/tinyxml2)
+else()
+	find_package(tinyxml2::tinyxml2)
+endif()
+
 include_directories(${XROOTD_INCLUDES} ${CURL_INCLUDE_DIRS} ${LIBCRYPTO_INCLUDE_DIRS})
 
-add_library(XrdS3 SHARED src/S3File.cc src/S3AccessInfo.cc src/S3FileSystem.cc src/AWSv4-impl.cc src/S3Commands.cc src/HTTPCommands.cc src/stl_string_utils.cc src/shortfile.cc src/logging.cc)
+add_library(XrdS3 SHARED src/S3File.cc src/S3Directory.cc src/S3AccessInfo.cc src/S3FileSystem.cc src/AWSv4-impl.cc src/S3Commands.cc src/HTTPCommands.cc src/stl_string_utils.cc src/shortfile.cc src/logging.cc)
 add_library(XrdHTTPServer SHARED src/HTTPFile.cc src/HTTPFileSystem.cc src/HTTPCommands.cc src/stl_string_utils.cc src/shortfile.cc src/logging.cc)
 
-target_link_libraries(XrdS3 -ldl ${XROOTD_UTILS_LIB} ${XROOTD_SERVER_LIB} ${CURL_LIBRARIES} ${LIBCRYPTO_LIBRARIES})
+target_link_libraries(XrdS3 -ldl ${XROOTD_UTILS_LIB} ${XROOTD_SERVER_LIB} ${CURL_LIBRARIES} ${LIBCRYPTO_LIBRARIES} tinyxml2::tinyxml2)
 target_link_libraries(XrdHTTPServer -ldl ${XROOTD_UTILS_LIB} ${XROOTD_SERVER_LIB} ${CURL_LIBRARIES} ${LIBCRYPTO_LIBRARIES})
 
 # The CMake documentation strongly advises against using these macros; instead, the pkg_check_modules

src/AWSv4-impl.cc

@@ -201,7 +201,9 @@ std::string canonicalizeQueryString(
 	}
 
 	// We'll always have a superflous trailing ampersand.
-	canonicalQueryString.erase(canonicalQueryString.end() - 1);
+	if (!canonicalQueryString.empty()) {
+		canonicalQueryString.erase(canonicalQueryString.end() - 1);
+	}
 	return canonicalQueryString;
 }
 

src/HTTPCommands.cc

@@ -67,8 +67,6 @@ HTTPRequest::~HTTPRequest() {}
 		if (rv##B != CURLE_OK) {                                               \
 			this->errorCode = "E_CURL_LIB";                                    \
 			this->errorMessage = "curl_easy_setopt( " #B " ) failed.";         \
-			/* dprintf( D_ALWAYS, "curl_easy_setopt( %s ) failed (%d): '%s',   \
-			   failing.\n", #B, rv##B, curl_easy_strerror( rv##B ) ); */       \
 			return false;                                                      \
 		}                                                                      \
 	}
@@ -168,6 +166,8 @@ bool HTTPRequest::sendPreparedRequest(const std::string &protocol,
 									  const std::string &uri,
 									  const std::string &payload) {
 
+	m_log.Log(XrdHTTPServer::Debug, "SendRequest", "Sending HTTP request",
+			  uri.c_str());
 	CURLcode rv = curl_global_init(CURL_GLOBAL_ALL);
 	if (rv != 0) {
 		this->errorCode = "E_CURL_LIB";
@@ -317,20 +317,6 @@ bool HTTPRequest::sendPreparedRequest(const std::string &protocol,
 		CAFile = x509_ca_file;
 	}
 
-	if (CAPath.empty()) {
-		char *soap_ssl_ca_dir = getenv("GAHP_SSL_CADIR");
-		if (soap_ssl_ca_dir != NULL) {
-			CAPath = soap_ssl_ca_dir;
-		}
-	}
-
-	if (CAFile.empty()) {
-		char *soap_ssl_ca_file = getenv("GAHP_SSL_CAFILE");
-		if (soap_ssl_ca_file != NULL) {
-			CAFile = soap_ssl_ca_file;
-		}
-	}
-
 	if (!CAPath.empty()) {
 		SET_CURL_SECURITY_OPTION(curl.get(), CURLOPT_CAPATH, CAPath.c_str());
 	}

src/HTTPCommands.hh

@@ -47,6 +47,8 @@ class HTTPRequest {
 	virtual bool SendHTTPRequest(const std::string &payload);
 
 	unsigned long getResponseCode() const { return responseCode; }
+	const std::string & getErrorCode() const {return errorCode;}
+	const std::string & getErrorMessage() const {return errorMessage;}
 	const std::string &getResultString() const { return resultString; }
 
 	// Currently only used in PUTS, but potentially useful elsewhere
@@ -74,7 +76,7 @@ class HTTPRequest {
 	std::string errorCode;
 
 	std::string resultString;
-	unsigned long responseCode;
+	unsigned long responseCode{0};
 	unsigned long expectedResponseCode = 200;
 	bool includeResponseHeader;
 

src/S3AccessInfo.cc

@@ -49,3 +49,9 @@ const std::string &S3AccessInfo::getS3SecretKeyFile() const {
 void S3AccessInfo::setS3SecretKeyFile(const std::string &s3SecretKeyFile) {
 	s3_secret_key_file = s3SecretKeyFile;
 }
+
+const std::string &S3AccessInfo::getS3UrlStyle() const { return s3_url_style; }
+
+void S3AccessInfo::setS3UrlStyle(const std::string &s3UrlStyle) {
+	s3_url_style = s3UrlStyle;
+}

src/S3AccessInfo.hh

@@ -2,8 +2,7 @@
 // Created by Rich Wellner on 2/29/24.
 //
 
-#ifndef XROOTD_S3_HTTP_S3ACCESSINFO_HH
-#define XROOTD_S3_HTTP_S3ACCESSINFO_HH
+#pragma once
 
 #include <string>
 
@@ -33,13 +32,18 @@ class S3AccessInfo {
 
 	void setS3SecretKeyFile(const std::string &s3SecretKeyFile);
 
+	const std::string &getS3UrlStyle() const;
+
+	void setS3UrlStyle(const std::string &s3UrlStyle);
+
+	const int getS3SignatureVersion() const {return 4;}
+
   private:
 	std::string s3_bucket_name;
 	std::string s3_service_name;
 	std::string s3_region;
 	std::string s3_service_url;
 	std::string s3_access_key_file;
 	std::string s3_secret_key_file;
+	std::string s3_url_style;
 };
-
-#endif // XROOTD_S3_HTTP_S3ACCESSINFO_HH