chore: remove sensitive info from log and dat files

Author: JasonSun0593

src/libs/installer/elevatedexecuteoperation.cpp

@@ -190,8 +190,15 @@ int ElevatedExecuteOperation::Private::run(QStringList &arguments, const Operati
     //readProcessOutput should only called from this current Thread -> Qt::DirectConnection
     QObject::connect(process, SIGNAL(readyRead()), q, SLOT(readProcessOutput()), Qt::DirectConnection);
     process->start(args.front(), args.mid(1));
-    qCDebug(QInstaller::lcInstallerInstallLog) << args.front() << "started, arguments:"
+    if(args.contains(QLatin1String("--regkey")))
+    {
+        qCDebug(QInstaller::lcInstallerInstallLog) << args.front() << "started, arguments:";
+    }
+    else
+    {
+        qCDebug(QInstaller::lcInstallerInstallLog) << args.front() << "started, arguments:"
         << QStringList(args.mid(1)).join(QLatin1String(" "));
+    }
 
     bool success = false;
     //we still like the none blocking possibility to perform this operation without threads

src/libs/installer/operationtracer.cpp

@@ -107,6 +107,11 @@ void OperationTracer::trace(const QString &state)
     if (m_operation->requiresUnreplacedVariables())
         args = m_operation->packageManager()->replaceVariables(m_operation->arguments());
 
+    if(args.contains(QLatin1String("--regkey")))
+    {
+        args.replace(2,QLatin1String(""));
+        args.replace(4,QLatin1String(""));
+    }
     qCDebug(lcInstallerInstallLog).noquote() << QString::fromLatin1("\t- arguments: %1")
         .arg(args.join(QLatin1String(", ")));
 }

src/libs/kdtools/updateoperation.cpp

@@ -543,18 +543,40 @@ QDomDocument UpdateOperation::toXml() const
 
     QDomElement args = doc.createElement(QLatin1String("arguments"));
     const QString target = m_core ? m_core->value(QInstaller::scTargetDir) : QString();
-    Q_FOREACH (const QString &s, arguments()) {
-        QDomElement arg = doc.createElement(QLatin1String("argument"));
-        // Do not call cleanPath to Execute operations paths. The operation might require the
-        // exact separators that are set in the operation call.
-        if (name() == QLatin1String("Execute")) {
-            arg.appendChild(doc.createTextNode(QInstaller::replacePath(s, target,
-                QLatin1String(QInstaller::scRelocatable), false)));
-        } else {
-            arg.appendChild(doc.createTextNode(QInstaller::replacePath(s, target,
-                QLatin1String(QInstaller::scRelocatable))));
+    if(arguments().contains(QLatin1String("--regkey")))
+    {
+        QStringList refinedArgList = arguments();
+        refinedArgList.replace(2,QLatin1String(""));
+        refinedArgList.replace(4,QLatin1String(""));
+        Q_FOREACH (const QString &s, refinedArgList) {
+            QDomElement arg = doc.createElement(QLatin1String("argument"));
+            // Do not call cleanPath to Execute operations paths. The operation might require the
+            // exact separators that are set in the operation call.
+            if (name() == QLatin1String("Execute")) {
+                arg.appendChild(doc.createTextNode(QInstaller::replacePath(s, target,
+                                                                           QLatin1String(QInstaller::scRelocatable), false)));
+            } else {
+                arg.appendChild(doc.createTextNode(QInstaller::replacePath(s, target,
+                                                                           QLatin1String(QInstaller::scRelocatable))));
+            }
+            args.appendChild(arg);
+        }
+    }
+    else
+    {
+        Q_FOREACH (const QString &s, arguments()) {
+            QDomElement arg = doc.createElement(QLatin1String("argument"));
+            // Do not call cleanPath to Execute operations paths. The operation might require the
+            // exact separators that are set in the operation call.
+            if (name() == QLatin1String("Execute")) {
+                arg.appendChild(doc.createTextNode(QInstaller::replacePath(s, target,
+                    QLatin1String(QInstaller::scRelocatable), false)));
+            } else {
+                arg.appendChild(doc.createTextNode(QInstaller::replacePath(s, target,
+                    QLatin1String(QInstaller::scRelocatable))));
+            }
+            args.appendChild(arg);
         }
-        args.appendChild(arg);
     }
     root.appendChild(args);
     if (m_values.isEmpty())