address review comments

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>

Author: jeclrsg

esp/services/ws_workunits/ws_workunitsHelpers.cpp

@@ -5143,8 +5143,8 @@ void CWsWuFileHelper::readLocalFileToBuffer(const char* file, offset_t sizeLimit
         throw MakeStringException(ECLWATCH_CANNOT_READ_FILE, "Cannot read %s.", file);
 }
 
-void CWsWuFileHelper::createHelperFileArchive(IEspContext& context, const char* wuid,
-    IArrayOf<IConstWUFileOption>& wuFileOptions, bool useGZip, MemoryBuffer& result, StringBuffer& archiveFileName)
+IFileIOStream* CWsWuFileHelper::createHelperFileArchive(IEspContext& context, const char* wuid,
+    IArrayOf<IConstWUFileOption>& wuFileOptions, bool useGZip, StringBuffer& archiveFileName)
 {
     StringBuffer namePrefixStr, workingFolder;
     Owned<IFile> workingDir = createWorkingFolder(context, wuid, "WUHelpers_", namePrefixStr, workingFolder);
@@ -5187,13 +5187,10 @@ void CWsWuFileHelper::createHelperFileArchive(IEspContext& context, const char*
     if (zipRet != 0)
         throw makeStringExceptionV(ECLWATCH_CANNOT_COMPRESS_DATA, "Failed to create helper file archive for workunit %s.", wuid);
 
-    Owned<IFile> zipFile = createIFile(zipFileNameWithPath.str());
-    Owned<IFileIO> zipIO = zipFile->open(IFOread);
-    size32_t zipSize = (size32_t) zipIO->size();
-    void* data = result.reserve(zipSize);
-    result.setLength(zipIO->read(0, zipSize, data));
-    zipIO->close();
-    zipFile->remove();
+    IFileIOStream* stream = createIOStreamFromFile(zipFileNameWithPath.str(), IFOread);
+    if (!stream)
+        throw makeStringExceptionV(ECLWATCH_INTERNAL_ERROR, "Cannot open stream for archive file %s", zipFileNameWithPath.str());
+    return stream;
 }
 
 void CWsWuEmailHelper::send(const char* body, const void* attachment, size32_t lenAttachment, StringArray& warnings)

esp/services/ws_workunits/ws_workunitsHelpers.hpp

@@ -917,8 +917,8 @@ class CWsWuFileHelper
     IFileIOStream* createWUFileIOStream(IEspContext &context, const char *wuid, IArrayOf<IConstWUFileOption> &wuFileOptions,
         CWUFileDownloadOption &downloadOptions, StringBuffer &contentType);
 
-    void createHelperFileArchive(IEspContext &context, const char *wuid, IArrayOf<IConstWUFileOption> &wuFileOptions,
-        bool useGZip, MemoryBuffer &result, StringBuffer &archiveFileName);
+    IFileIOStream* createHelperFileArchive(IEspContext &context, const char *wuid, IArrayOf<IConstWUFileOption> &wuFileOptions,
+        bool useGZip, StringBuffer &archiveFileName);
 
     void validateFilePath(const char *file, WsWuInfo &winfo, CWUFileType wuFileType, bool UNCFileName, const char *fileType, const char *compType, const char *compName);
     bool validateWUFile(const char *file, WsWuInfo &winfo, CWUFileType wuFileType);

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -4295,8 +4295,8 @@ bool CWsWorkunitsEx::onWUHelperFileArchive(IEspContext &context, IEspWUHelperFil
         resp.setThefile(mb);
         resp.setThefile_mimetype(HTTP_TYPE_OCTET_STREAM);
         resp.setFileName(archiveFileName.str());
-        VStringBuffer headerStr("attachment;filename=%s", archiveFileName.str());
-        context.addCustomerHeader("Content-disposition", headerStr.str());
+        VStringBuffer headerStr("attachment; filename=\"%s\"", archiveFileName.str());
+        context.addCustomerHeader("Content-Disposition", headerStr.str());
     }
     catch(IException* e)
     {