From 9fa20fb1e2c6c04c0d8edd4fa894dfeffaa95ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 12 Jan 2019 23:18:01 +0000
Subject: [PATCH] Remove "mv" command from allowed external command list

---
 src/core/fstab.cpp                   | 37 +++++++---------------------
 src/plugins/sfdisk/sfdiskbackend.cpp |  5 ----
 src/util/externalcommand_whitelist.h |  3 ---
 3 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/core/fstab.cpp b/src/core/fstab.cpp
index 6bdc7f2..650c96f 100644
--- a/src/core/fstab.cpp
+++ b/src/core/fstab.cpp
@@ -19,6 +19,7 @@
 
 #include "core/fstab.h"
 #include "util/externalcommand.h"
+#include "util/report.h"
 
 #if defined(Q_OS_LINUX)
     #include <blkid/blkid.h>
@@ -228,9 +229,8 @@ static void parseFsSpec(const QString& m_fsSpec, FstabEntry::Type& m_entryType,
     }
 }
 
-static void writeEntry(QFile& output, const FstabEntry& entry)
+static void writeEntry(QTextStream& s, const FstabEntry& entry)
 {
-    QTextStream s(&output);
     if (entry.entryType() == FstabEntry::Type::comment) {
         s << entry.comment() << "\n";
         return;
@@ -256,32 +256,13 @@ static void writeEntry(QFile& output, const FstabEntry& entry)
 
 bool writeMountpoints(const FstabEntryList& fstabEntries, const QString& filename)
 {
-    QTemporaryFile out;
-    out.setAutoRemove(false);
+    Report report(nullptr);
+    QByteArray fstabContents;
+    QTextStream out(&fstabContents);
 
-    if (!out.open()) {
-        qWarning() << "could not open output file " << out.fileName();
-        return false;
-    } else {
-        for (const auto &e : fstabEntries)
-            writeEntry(out, e);
+    for (const auto &e : fstabEntries)
+        writeEntry(out, e);
 
-        out.close();
-        const QString bakFilename = QStringLiteral("%1.bak").arg(filename);
-        ExternalCommand mvCmd(QStringLiteral("mv"), { filename, bakFilename } );
-
-        if ( !(mvCmd.run(-1) && mvCmd.exitCode() == 0) ) {
-            qWarning() << "could not backup " << filename << " to " << bakFilename;
-            return false;
-        }
-
-        ExternalCommand mvCmd2(QStringLiteral("mv"), { out.fileName(), filename } );
-
-        if ( !(mvCmd2.run(-1) && mvCmd2.exitCode() == 0) ) {
-            qWarning() << "could not move " << out.fileName() << " to " << filename;
-            return false;
-        }
-    }
-
-    return true;
+    ExternalCommand cmd;
+    return cmd.writeData(report, fstabContents, filename, 0);
 }
diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp
index 3daa188..8110617 100644
--- a/src/plugins/sfdisk/sfdiskbackend.cpp
+++ b/src/plugins/sfdisk/sfdiskbackend.cpp
@@ -151,19 +151,14 @@ Device* SfdiskBackend::scanDevice(const QString& deviceNode)
             QRegularExpressionMatchIterator i  = re.globalMatch(content);
 
             while (i.hasNext()) {
-
                 QRegularExpressionMatch reMatch = i.next();
-
                 QString name = reMatch.captured(1);
 
                 if ((QStringLiteral("/dev/md") + name) == deviceNode) {
                     Log(Log::Level::information) << xi18nc("@info:status", "Software RAID Device found: %1", deviceNode);
-
                     d = new SoftwareRAID( QStringLiteral("md") + name, SoftwareRAID::Status::Active );
-
                     break;
                 }
-
             }
         }
 
diff --git a/src/util/externalcommand_whitelist.h b/src/util/externalcommand_whitelist.h
index 7ae4240..9cd8f74 100644
--- a/src/util/externalcommand_whitelist.h
+++ b/src/util/externalcommand_whitelist.h
@@ -19,9 +19,6 @@
 #define KPMCORE_EXTERNALCOMMAND_WHITELIST_H
 
 QString allowedCommands[] = {
-// TODO try to remove these later
-QStringLiteral("mv"),
-
 // TODO no root needed
 QStringLiteral("lsblk"),
 QStringLiteral("udevadm"),