[Proxy] Avoid SEGV when doing passthrogh TPC.

xrootd · Jun 15, 2020 · a591cb4 · a591cb4
1 parent 249b1b5
commit a591cb4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/XrdPss/XrdPss.cc b/src/XrdPss/XrdPss.cc
@@ -736,6 +736,10 @@ int XrdPssFile::Open(const char *path, int Oflag, mode_t Mode, XrdOucEnv &Env)
    bool ucgiOK  = true;
    bool ioCache = (Oflag & O_DIRECT);
 
+// Record the security environment
+//
+   entity = Env.secEnv();
+
 // Turn off direct flag if set (we record it separately
 //
    if (ioCache) Oflag &= ~O_DIRECT;
@@ -976,7 +980,8 @@ int XrdPssFile::Fstat(struct stat *buff)
 {
     if (fd < 0)
        {if (!tpcPath) return -XRDOSS_E8004;
-        if (XrdProxySS.Stat(tpcPath, buff))
+        XrdOucEnv fstatEnv(0, 0, entity);
+        if (XrdProxySS.Stat(tpcPath, buff, 0, &fstatEnv))
            memset(buff, 0, sizeof(struct stat));
         return XrdOssOK;
        }

diff --git a/src/XrdPss/XrdPss.hh b/src/XrdPss/XrdPss.hh
@@ -65,6 +65,7 @@ const    char      *tident;
 /******************************************************************************/
 
 struct XrdOucIOVec;
+class  XrdSecEntity;
 class  XrdSfsAio;
 
 class XrdPssFile : public XrdOssDF
@@ -93,7 +94,7 @@ ssize_t Write(const void *, off_t, size_t);
 int     Write(XrdSfsAio *aiop);
 
          // Constructor and destructor
-         XrdPssFile(const char *tid) : tident(tid), tpcPath(0)
+         XrdPssFile(const char *tid) : tident(tid), tpcPath(0), entity(0)
                                        {fd = -1;}
 
 virtual ~XrdPssFile() {if (fd >= 0) Close();
@@ -104,6 +105,8 @@ private:
 
 const char *tident;
       char *tpcPath;
+
+const XrdSecEntity *entity;
 };
 
 /******************************************************************************/

diff --git a/src/XrdPss/XrdPssUrlInfo.cc b/src/XrdPss/XrdPssUrlInfo.cc
@@ -116,6 +116,7 @@ XrdPssUrlInfo::XrdPssUrlInfo(XrdOucEnv  *envP, const char *path,
 // Preset for no id in the url
 //
    *theID  = 0;
+    tident = 0;
 
 // If there is an environment point, get user's cgi and set the tident from it
 //