[XrdTpc] Properly forward existing opaque info to the OFS layer

xrootd · Jan 22, 2020 · c47b015 · c47b015
1 parent eb32442
commit c47b015
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/XrdCeph b/src/XrdCeph
diff --git a/src/XrdClHttp b/src/XrdClHttp
diff --git a/src/XrdTpc/XrdTpcTPC.cc b/src/XrdTpc/XrdTpcTPC.cc
@@ -208,8 +208,20 @@ int TPCHandler::OpenWaitStall(XrdSfsFile &fh, const std::string &resource,
     while (1) {
         int orig_ucap = fh.error.getUCap();
         fh.error.setUCap(orig_ucap | XrdOucEI::uIPv64);
-        open_result = fh.open(resource.c_str(), mode, openMode, &sec,
-                              authz.empty() ? NULL: authz.c_str());
+        std::string opaque;
+        size_t pos = resource.find('?');
+        // Extract the path and opaque info from the resource
+        std::string path = resource.substr(0, pos);
+
+        if (pos != std::string::npos) {
+          opaque = resource.substr(pos + 1);
+        }
+
+        // Append the authz information
+        opaque += (opaque.empty() ? "" : "&");
+        opaque += authz;
+        open_result = fh.open(path.c_str(), mode, openMode, &sec, opaque.c_str());
+
         if ((open_result == SFS_STALL) || (open_result == SFS_STARTED)) {
             int secs_to_stall = fh.error.getErrInfo();
             if (open_result == SFS_STARTED) {secs_to_stall = secs_to_stall/2 + 5;}