Merge pull request #239 from jan-cerny/tempfile

matejak · web-flow · commit b3f41b4a72b9 · 2020-01-07T09:56:38.000+01:00
Remove space from temporary file names
diff --git a/include/Exceptions.h b/include/Exceptions.h
@@ -57,9 +57,6 @@ SCAP_WORKBENCH_SIMPLE_EXCEPTION(SshConnectionException,
 SCAP_WORKBENCH_SIMPLE_EXCEPTION(TailoringWindowException,
     "There was a problem with TailoringWindow!\n");
 
-SCAP_WORKBENCH_SIMPLE_EXCEPTION(TemporaryDirException,
-    "There was a problem with TemporaryDir!\n");
-
 SCAP_WORKBENCH_SIMPLE_EXCEPTION(OscapScannerRemoteSshException,
     "There was a problem with OscapScannerRemoteSsh!\n");
 
diff --git a/include/ForwardDecls.h b/include/ForwardDecls.h
@@ -50,7 +50,6 @@ class SyncProcess;
 class SSGIntegrationDialog;
 class TailoringWindow;
 class TailorProfileDialog;
-class TemporaryDir;
 class XCCDFItemPropertiesDockWidget;
 class XCCDFItemSelectUndoCommand;
 class XCCDFValueChangeUndoCommand;
diff --git a/include/OscapScannerLocal.h b/include/OscapScannerLocal.h
@@ -22,10 +22,9 @@
 #ifndef SCAP_WORKBENCH_OSCAP_SCANNER_LOCAL_H_
 #define SCAP_WORKBENCH_OSCAP_SCANNER_LOCAL_H_
 
-#include <QTemporaryFile>
-
 #include "ForwardDecls.h"
 #include "OscapScannerBase.h"
+#include "Utils.h"
 
 
 class OscapScannerLocal : public OscapScannerBase
@@ -54,7 +53,7 @@ class OscapScannerLocal : public OscapScannerBase
 
         void evaluateWithOfflineRemediation();
         void evaluateWithOtherSettings();
-        static void setFilenameToTempFile(QTemporaryFile& file);
+        static void setFilenameToTempFile(SpacelessQTemporaryFile& file);
 };
 
 #endif
diff --git a/include/RPMOpenHelper.h b/include/RPMOpenHelper.h
@@ -23,7 +23,7 @@
 #define SCAP_WORKBENCH_RPM_OPEN_HELPER_H_
 
 #include "ForwardDecls.h"
-#include "TemporaryDir.h"
+#include "Utils.h"
 #include <QWidget>
 
 /**
@@ -66,7 +66,7 @@ class RPMOpenHelper
     private:
         static QString getRPMExtractPath();
 
-        TemporaryDir mTempDir;
+        SpacelessQTemporaryDir mTempDir;
 
         QString mInputPath;
         QString mTailoringPath;
diff --git a/include/RemediationRoleSaver.h b/include/RemediationRoleSaver.h
@@ -103,7 +103,7 @@ class ResultBasedProcessRemediationSaver : public RemediationSaverBase
 
     private:
         virtual void saveToFile(const QString& filename);
-        QTemporaryFile mArfFile;
+        SpacelessQTemporaryFile mArfFile;
 };
 
 
@@ -138,7 +138,7 @@ class ResultBasedLibraryRemediationSaver : public RemediationSaverBase
 
     private:
         virtual void saveToFile(const QString& filename);
-        QTemporaryFile mArfFile;
+        SpacelessQTemporaryFile mArfFile;
 };
 
 
diff --git a/include/RemoteSsh.h b/include/RemoteSsh.h
@@ -24,7 +24,7 @@
 
 #include "ForwardDecls.h"
 #include "ProcessHelpers.h"
-#include "TemporaryDir.h"
+#include "Utils.h"
 #include <QObject>
 
 class SshConnection : public QObject
@@ -57,7 +57,7 @@ class SshConnection : public QObject
         QString mTarget;
         unsigned short mPort;
 
-        TemporaryDir* mSocketDir;
+        SpacelessQTemporaryDir* mSocketDir;
         QString mMasterSocket;
         QProcessEnvironment mEnvironment;
 
diff --git a/include/ResultViewer.h b/include/ResultViewer.h
@@ -23,9 +23,9 @@
 #define SCAP_WORKBENCH_RESULT_VIEWER_H_
 
 #include "ForwardDecls.h"
+#include "Utils.h"
 
 #include <QWidget>
-#include <QTemporaryFile>
 #include <QUrl>
 #include <QMenu>
 #include <QLabel>
@@ -97,7 +97,7 @@ class ResultViewer : public QWidget
         QByteArray mResults;
         QByteArray mReport;
         /// If user requests to open the file via desktop services
-        QTemporaryFile* mReportFile;
+        SpacelessQTemporaryFile* mReportFile;
         QByteArray mARF;
 };
 
diff --git a/include/ScanningSession.h b/include/ScanningSession.h
@@ -23,9 +23,8 @@
 #define SCAP_WORKBENCH_SCANNING_SESSION_H_
 
 #include "ForwardDecls.h"
+#include "Utils.h"
 
-#include <QTemporaryDir>
-#include <QTemporaryFile>
 #include <QSet>
 #include <QDir>
 #include <map>
@@ -292,7 +291,7 @@ class ScanningSession
         mutable struct xccdf_tailoring* mTailoring;
 
         /// Temporary copy of opened DS or XCCDF file
-        QTemporaryDir* mTempOpenDir;
+        SpacelessQTemporaryDir* mTempOpenDir;
         /// Path to temporary DS or XCCDF file
         QString mTempOpenPath;
         /// Path to original DS or XCCDF file
@@ -301,9 +300,9 @@ class ScanningSession
         QSet<QString> mClosureOfOriginalFile;
 
         /// Temporary file provides auto deletion and a valid temp file path
-        QTemporaryFile mTailoringFile;
+        SpacelessQTemporaryFile mTailoringFile;
         /// Temporary file provides auto deletion and a valid temp file path
-        QTemporaryFile mGuideFile;
+        SpacelessQTemporaryFile mGuideFile;
 
         /// Whether or not validation should be skipped
         bool mSkipValid;
diff --git a/include/TemporaryDir.h b/include/TemporaryDir.h
diff --git a/include/Utils.h b/include/Utils.h
@@ -28,6 +28,8 @@
 #include <QDir>
 #include <QIcon>
 #include <QUrl>
+#include <QTemporaryFile>
+#include <QTemporaryDir>
 
 /**
  * @brief Retrieves QDir representing the share directory
@@ -115,4 +117,14 @@ void openUrlGuarded(const QUrl& url);
  */
 const QString& getSetSidPath();
 
+class SpacelessQTemporaryFile: public QTemporaryFile {
+    public:
+        SpacelessQTemporaryFile ();
+};
+
+class SpacelessQTemporaryDir: public QTemporaryDir {
+    public:
+        SpacelessQTemporaryDir ();
+};
+
 #endif
diff --git a/src/OscapScannerBase.cpp b/src/OscapScannerBase.cpp
@@ -24,7 +24,6 @@
 
 #include <QThread>
 #include <QAbstractEventDispatcher>
-#include <QTemporaryFile>
 #include <cassert>
 
 extern "C"
diff --git a/src/OscapScannerLocal.cpp b/src/OscapScannerLocal.cpp
@@ -22,7 +22,6 @@
 #include "OscapScannerLocal.h"
 #include "ProcessHelpers.h"
 #include "ScanningSession.h"
-#include "TemporaryDir.h"
 
 #include <stdexcept>
 #include <QThread>
@@ -33,7 +32,7 @@ extern "C"
 #include <xccdf_session.h>
 }
 
-void OscapScannerLocal::setFilenameToTempFile(QTemporaryFile& file)
+void OscapScannerLocal::setFilenameToTempFile(SpacelessQTemporaryFile& file)
 {
     file.open();
     file.close();
@@ -97,21 +96,21 @@ void OscapScannerLocal::evaluate()
     // This is mainly for check-engine-results and oval-results, to ensure
     // we get a full report, including info from these files. openscap's XSLT
     // uses info in the check engine results if it can find them.
-    TemporaryDir workingDir;
-    process.setWorkingDirectory(workingDir.getPath());
+    SpacelessQTemporaryDir workingDir;
+    process.setWorkingDirectory(workingDir.path());
 
     QStringList args;
-    QTemporaryFile inputARFFile;
+    SpacelessQTemporaryFile inputARFFile;
 
-    QTemporaryFile arfFile;
+    SpacelessQTemporaryFile arfFile;
     arfFile.setAutoRemove(true);
     setFilenameToTempFile(arfFile);
 
-    QTemporaryFile reportFile;
+    SpacelessQTemporaryFile reportFile;
     reportFile.setAutoRemove(true);
     setFilenameToTempFile(reportFile);
 
-    QTemporaryFile resultFile;
+    SpacelessQTemporaryFile resultFile;
     resultFile.setAutoRemove(true);
     setFilenameToTempFile(resultFile);
 
@@ -223,7 +222,7 @@ QStringList OscapScannerLocal::getCommandLineArgs() const
 
     if (mScannerMode == SM_OFFLINE_REMEDIATION)
     {
-        QTemporaryFile inputARFFile;
+        SpacelessQTemporaryFile inputARFFile;
         inputARFFile.setAutoRemove(true);
         inputARFFile.open();
         inputARFFile.write(getARFForRemediation());
diff --git a/src/OscapScannerRemoteSsh.cpp b/src/OscapScannerRemoteSsh.cpp
@@ -25,7 +25,6 @@
 
 #include <QThread>
 #include <QAbstractEventDispatcher>
-#include <QTemporaryFile>
 #include <QFileInfo>
 #include <QDir>
 #include <cassert>
@@ -105,7 +104,7 @@ QStringList OscapScannerRemoteSsh::getCommandLineArgs() const
 
     if (mScannerMode == SM_OFFLINE_REMEDIATION)
     {
-        QTemporaryFile inputARFFile;
+        SpacelessQTemporaryFile inputARFFile;
         inputARFFile.setAutoRemove(true);
         inputARFFile.open();
         inputARFFile.write(getARFForRemediation());
@@ -381,7 +380,7 @@ QString OscapScannerRemoteSsh::copyInputFileOver()
 
     QString localPath = "";
 
-    QTemporaryFile inputARFFile;
+    SpacelessQTemporaryFile inputARFFile;
     inputARFFile.setAutoRemove(true);
     if (mScannerMode == SM_OFFLINE_REMEDIATION)
     {
diff --git a/src/RPMOpenHelper.cpp b/src/RPMOpenHelper.cpp
@@ -33,12 +33,12 @@ RPMOpenHelper::RPMOpenHelper(const QString& path)
         const QFileInfo pathInfo(path);
         proc.setCommand(getRPMExtractPath());
         proc.setArguments(QStringList(pathInfo.absoluteFilePath()));
-        proc.setWorkingDirectory(mTempDir.getPath());
+        proc.setWorkingDirectory(mTempDir.path());
     }
 
     proc.run();
 
-    const QDir tempDir(mTempDir.getPath());
+    const QDir tempDir(mTempDir.path());
 
     if (proc.getExitCode() != 0)
     {
diff --git a/src/RemediationRoleSaver.cpp b/src/RemediationRoleSaver.cpp
@@ -27,6 +27,7 @@
 
 #include "RemediationRoleSaver.h"
 #include "DiagnosticsDialog.h"
+#include "Utils.h"
 
 extern "C"
 {
@@ -41,7 +42,6 @@ extern "C"
 #endif
 }
 
-#include "TemporaryDir.h"
 
 
 const QString bashSaveMessage = QObject::tr("Save remediation role as a bash script");
@@ -197,8 +197,8 @@ void ResultBasedProcessRemediationSaver::saveToFile(const QString& filename)
     // This is a lightweight launch though.
     QProcess process(mParentWindow);
 
-    TemporaryDir workingDir;
-    process.setWorkingDirectory(workingDir.getPath());
+    SpacelessQTemporaryDir workingDir;
+    process.setWorkingDirectory(workingDir.path());
     QString program(SCAP_WORKBENCH_LOCAL_OSCAP_PATH);
 
     process.start(program, args);
diff --git a/src/RemoteSsh.cpp b/src/RemoteSsh.cpp
@@ -109,8 +109,8 @@ void SshConnection::connect()
             mSocketDir = 0;
         }
 
-        mSocketDir = new TemporaryDir();
-        mMasterSocket = mSocketDir->getPath() + "/ssh_socket";
+        mSocketDir = new SpacelessQTemporaryDir();
+        mMasterSocket = mSocketDir->path() + "/ssh_socket";
     }
     catch (const SyncProcessException& e)
     {
diff --git a/src/ResultViewer.cpp b/src/ResultViewer.cpp
@@ -158,7 +158,7 @@ void ResultViewer::openReport()
         mReportFile = 0;
     }
 
-    mReportFile = new QTemporaryFile();
+    mReportFile = new SpacelessQTemporaryFile();
     mReportFile->setFileTemplate(mReportFile->fileTemplate() + ".html");
     mReportFile->open();
     mReportFile->write(mReport);
diff --git a/src/SaveAsRPMDialog.cpp b/src/SaveAsRPMDialog.cpp
diff --git a/src/ScanningSession.cpp b/src/ScanningSession.cpp
diff --git a/src/TemporaryDir.cpp b/src/TemporaryDir.cpp
diff --git a/src/Utils.cpp b/src/Utils.cpp
diff --git a/src/main.cpp b/src/main.cpp
