HPCC-29480 Move traceName code

Signed-off-by: wangkx <[email protected]>
hpcc-systems · Jul 14, 2023 · 361f43f · 361f43f
1 parent 853a042
commit 361f43f
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/dali/dfu/dfurun.cpp b/dali/dfu/dfurun.cpp
@@ -594,21 +594,17 @@ class CDFUengine: public CInterface, implements IDFUengine
         if (write)
             auditflags |= DALI_LDAP_WRITE_WANTED;
 
-        StringBuffer traceName;
-        fd->getTraceName(traceName);
-        if (traceName.length() > 255)
-        {
-            traceName.setLength(255);
-            traceName.append("...");
-        }
         SecAccessFlags perm = queryDistributedFileDirectory().getFDescPermissions(fd,user,auditflags);
-        if (write)
+        if ((write && !HASWRITEPERMISSION(perm)) || (!write && !HASREADPERMISSION(perm)))
         {
-            if (!HASWRITEPERMISSION(perm))
-                throw makeStringExceptionV(DFSERR_CreateAccessDenied,"Create permission denied for physical file(s): %s",traceName.str());
+            StringBuffer traceName;
+            fd->getTraceName(traceName);
+            elideString(traceName, 255);
+            if (write)
+                throw makeStringExceptionV(DFSERR_CreateAccessDenied, "Create permission denied for physical file(s): %s",traceName.str());
+            else
+                throw makeStringExceptionV(DFSERR_LookupAccessDenied, "Lookup permission denied for physical file(s): %s",traceName.str());
         }
-        else if (!HASREADPERMISSION(perm))
-            throw makeStringExceptionV(DFSERR_LookupAccessDenied,"Lookup permission denied for physical file(s): %s",traceName.str());
     }
 
     void checkForeignFilePermissions(IConstDFUfileSpec *fSpec,IFileDescriptor *fd,IUserDescriptor *user,bool write)