Update patches for XRootD 5.9.3

[matyasselmeci]

https://github.com/xrootd/xrootd/releases/tag/v5.9.3

[matyasselmeci]

Status	Hash	Name
Applied, automerged	d17a752	[#1] Allow hostname used by XRootD to be overridden by env var.
Applied, conflicts(1)	ab6728e	[#6] [XrdSciTokens] Handle multiple authorization token setups
Applied, clean	a7a389b	[#25] XRootD's xml response for PROPFIND will now include the resourcetype tag for non-collections
Applied, clean	ae5b01f	[#32] Enable write-through mode for cache
Applied, clean	ec89247	[#34] Add S3 as a permitted proxy protocol
Applied, clean	e8010ef	[#42] Full pkcs11 integration
Applied, clean	df8ad9f	[#48] Fix XRootD local build error caused by libXrdAccSciTokens
Merge failures (2)	e239817	[#37] Add TPC worker pool

(1) Multiple conflicts in src/XrdSciTokens/XrdSciTokensAccess.cc
(2) src/XrdHttpTpc/XrdHttpTpc.cc

[matyasselmeci]

The TPC worker pool patch has merge conflicts that I could use some help on. The v5.9.3-pelican branch has all the other patches cherry-picked, except for e239817. @bbockelm can you take a look?

Here is the diff with the conflict markers:

diff --cc src/XrdHttpTpc/XrdHttpTpcTPC.cc
index c09b40b9f,aea5d666e..000000000
--- i/src/XrdHttpTpc/XrdHttpTpcTPC.cc
+++ w/src/XrdHttpTpc/XrdHttpTpcTPC.cc
@@@ -85,93 -85,6 +85,96 @@@ void CurlDeleter::operator()(CURL *curl
      if (curl) curl_easy_cleanup(curl);
  }
  
++<<<<<<< HEAD
 +/******************************************************************************/
 +/*           s o c k o p t _ s e t c l o e x e c _ c a l l b a c k            */
 +/******************************************************************************/
 +  
 +/**
 + * The callback that will be called by libcurl when the socket has been created
 + * https://curl.se/libcurl/c/CURLOPT_SOCKOPTFUNCTION.html
 + *
 + * Note: that this callback has been replaced by the opensocket_callback as it
 + *       was needed for monitoring to report what IP protocol was being used.
 + *       It has been kept in case we will need this callback in the future.
 + */
 +int TPCHandler::sockopt_callback(void *clientp, curl_socket_t curlfd, curlsocktype purpose) {
 +  TPCLogRecord * rec = (TPCLogRecord *)clientp;
 +  if (purpose == CURLSOCKTYPE_IPCXN && rec && rec->pmarkManager.isEnabled()) {
 +      // We will not reach this callback if the corresponding socket could not have been connected
 +      // the socket is already connected only if the packet marking is enabled
 +      return CURL_SOCKOPT_ALREADY_CONNECTED;
 +  }
 +  return CURL_SOCKOPT_OK;
 +}
 +
 +/******************************************************************************/
 +/*                   o p e n s o c k e t _ c a l l b a c k                    */
 +/******************************************************************************/
 +  
 +  
 +/**
 + * The callback that will be called by libcurl when the socket is about to be
 + * opened so we can capture the protocol that will be used.
 + */
 +int TPCHandler::opensocket_callback(void *clientp,
 +                                    curlsocktype purpose,
 +                                    struct curl_sockaddr *aInfo)
 +{
 +  /* CURLSOCKTYPE_IPCXN (for IP based connections) is the only type currently known by curl,
 +   * so let's make sure to reject other types if they appear in the furure */
 +  if (purpose != CURLSOCKTYPE_IPCXN)
 +    return CURL_SOCKET_BAD;
 +
 +  if (!aInfo)
 +    return CURL_SOCKET_BAD;
 +
 +  // Create the socket (note that O_CLOEXEC flag will be set)
 +  int fd = XrdSysFD_Socket(aInfo->family, aInfo->socktype, aInfo->protocol);
 +
 +  if (fd < 0) {
 +    return CURL_SOCKET_BAD;
 +  }
 +
 +  if (!clientp)
 +    return fd;
 +
 +  XrdNetAddr thePeer(&(aInfo->addr));
 +  TPCLogRecord *rec = static_cast<TPCLogRecord*>(clientp);
 +
 +  /* Reject attempts to connect to local/private addresses unless allowed by configuration */
 +  if ((!rec->allow_private && thePeer.isPrivate()) || (!rec->allow_local && thePeer.isLocal())) {
 +    rec->tpc_status = 403; // Forbidden
 +    rec->m_log->Emsg(rec->log_prefix.c_str(),
 +      "Connection to local/private address is forbidden");
 +    close(fd);
 +    return CURL_SOCKET_BAD;
 +  }
 +
 +  rec->isIPv6 = (thePeer.isIPType(XrdNetAddrInfo::IPv6) && !thePeer.isMapped());
 +
 +  std::stringstream connectErrMsg;
 +  if(!rec->pmarkManager.connect(fd, &(aInfo->addr), aInfo->addrlen, CONNECT_TIMEOUT, connectErrMsg)) {
 +    rec->m_log->Emsg(rec->log_prefix.c_str(), "Unable to connect socket: ", connectErrMsg.str().c_str());
 +    close(fd);
 +    return CURL_SOCKET_BAD;
 +  }
 +
 +  return fd;
 +}
 +
 +int TPCHandler::closesocket_callback(void *clientp, curl_socket_t fd) {
 +  TPCLogRecord * rec = (TPCLogRecord *)clientp;
 +
 +  // Destroy the PMark handle associated to the file descriptor before closing it.
 +  // Otherwise, we would lose the socket usage information if the socket is closed before
 +  // the PMark handle is closed.
 +  rec->pmarkManager.endPmark(fd);
 +
 +  return close(fd);
 +}
++=======
++>>>>>>> e239817cc ([#37] Add TPC worker pool)
  
  /******************************************************************************/
  /*                            p r e p a r e U R L                             */
@@@ -856,21 -647,7 +778,24 @@@ int TPCHandler::ProcessPushReq(const st
      }
      curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
      curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, (long) CURL_HTTP_VERSION_1_1);
++<<<<<<< HEAD
 +#if CURL_AT_LEAST_VERSION(7, 85, 0)
 +    curl_easy_setopt(curl, CURLOPT_PROTOCOLS_STR,       "https,http");
 +    curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS_STR, "https,http");
 +#else
 +    long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
 +    curl_easy_setopt(curl, CURLOPT_PROTOCOLS, protocols);
 +    curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, protocols);
 +#endif
 +    curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, opensocket_callback);
 +    curl_easy_setopt(curl, CURLOPT_OPENSOCKETDATA, &rec);
 +    curl_easy_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, closesocket_callback);
 +    curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
 +    curl_easy_setopt(curl, CURLOPT_CLOSESOCKETDATA, &rec);
++=======
++>>>>>>> e239817cc ([#37] Add TPC worker pool)
      curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, CONNECT_TIMEOUT);
 +
      auto query_header = XrdOucTUtils::caseInsensitiveFind(req.headers,"xrd-http-fullresource");
      std::string redirect_resource = req.resource;
      if (query_header != req.headers.end()) {
@@@ -981,20 -755,7 +906,21 @@@ int TPCHandler::ProcessPullReq(const st
      }
      curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
      curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, (long) CURL_HTTP_VERSION_1_1);
++<<<<<<< HEAD
 +#if CURL_AT_LEAST_VERSION(7, 85, 0)
 +    curl_easy_setopt(curl, CURLOPT_PROTOCOLS_STR,       "https,http");
 +    curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS_STR, "https,http");
 +#else
 +    long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
 +    curl_easy_setopt(curl, CURLOPT_PROTOCOLS, protocols);
 +    curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, protocols);
 +#endif
 +    curl_easy_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, opensocket_callback);
 +    curl_easy_setopt(curl, CURLOPT_OPENSOCKETDATA, &rec);
 +    curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, sockopt_callback);
++=======
++>>>>>>> e239817cc ([#37] Add TPC worker pool)
      curl_easy_setopt(curl, CURLOPT_SOCKOPTDATA , &rec);
-     curl_easy_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, closesocket_callback);
-     curl_easy_setopt(curl, CURLOPT_CLOSESOCKETDATA, &rec);
      curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, CONNECT_TIMEOUT);
      std::unique_ptr<XrdSfsFile> fh(m_sfs->newFile(name, m_monid++));
      if (!fh.get()) {

[matyasselmeci]

I had Claude take a pass at fixing the TPC patch: matyasselmeci@d5ed2f6

[matyasselmeci]

We're going to build without the TPC patch for now.