Added suport for the sudoers checkbox to history.

Recent remote scans now encode the sudo mode into the "target" that is
stored in the recent remote hosts list.

Author: matejak

include/OscapScannerRemoteSsh.h

@@ -31,11 +31,12 @@ class OscapScannerRemoteSsh : public OscapScannerBase
     Q_OBJECT
 
     public:
-        static void splitTarget(const QString& in, QString& target, unsigned short& port);
+        static void splitTarget(const QString& in, QString& target, unsigned short& port, bool& userIsSudoer);
 
         OscapScannerRemoteSsh();
         virtual ~OscapScannerRemoteSsh();
 
+        bool getUserIsSudoer() const;
         void setUserIsSudoer(bool userIsSudoer);
         virtual void setTarget(const QString& target);
         virtual void setSession(ScanningSession* session);

include/RemoteMachineComboBox.h

@@ -47,7 +47,7 @@ class RemoteMachineComboBox : public QWidget
         bool userIsSudoer() const;
 
     public slots:
-        void notifyTargetUsed(const QString& target);
+        void notifyTargetUsed(const QString& target, bool userIsSudoer);
         void clearHistory();
 
     protected slots:

src/MainWindow.cpp

@@ -763,7 +763,10 @@ void MainWindow::scanAsync(ScannerMode scannerMode)
     );
 
     if (target != "localhost")
-        mUI.remoteMachineDetails->notifyTargetUsed(mScanner->getTarget());
+    {
+        bool userIsSudoer = ((OscapScannerRemoteSsh *)mScanner)->getUserIsSudoer();
+        mUI.remoteMachineDetails->notifyTargetUsed(mScanner->getTarget(), userIsSudoer);
+    }
 
     mScanThread->start();
 }

src/OscapScannerRemoteSsh.cpp

@@ -46,7 +46,7 @@ OscapScannerRemoteSsh::OscapScannerRemoteSsh():
 OscapScannerRemoteSsh::~OscapScannerRemoteSsh()
 {}
 
-void OscapScannerRemoteSsh::splitTarget(const QString& in, QString& target, unsigned short& port)
+void OscapScannerRemoteSsh::splitTarget(const QString& in, QString& target, unsigned short& port, bool& userIsSudoer)
 {
     // NB: We dodge a bullet here because the editor will always pass a port
     //     as the last component. A lot of checking and parsing does not need
@@ -56,10 +56,19 @@ void OscapScannerRemoteSsh::splitTarget(const QString& in, QString& target, unsi
     //     being there and always being the last component.
 
     // FIXME: Ideally, this should split from the right side and stop after one split
-    QStringList split = in.split(':');
+    userIsSudoer = false;
+    QStringList sudoerSplit = in.split(' ');
+    if (sudoerSplit.size() > 1)
+    {
+        if (sudoerSplit.at(1) == "sudo")
+	{
+	    userIsSudoer = true;
+	}
+    }
+    QStringList hostPortSplit = sudoerSplit.at(0).split(':');
 
-    const QString portString = split.back();
-    split.removeLast();
+    const QString portString = hostPortSplit.back();
+    hostPortSplit.removeLast();
 
     {
         bool status = false;
@@ -69,25 +78,32 @@ void OscapScannerRemoteSsh::splitTarget(const QString& in, QString& target, unsi
         port = status ? portCandidate : 22;
     }
 
-    target = split.join(":");
+    target = hostPortSplit.join(":");
 }
 
 void OscapScannerRemoteSsh::setTarget(const QString& target)
 {
-    OscapScannerBase::setTarget(target);
+    QStringList sudoerSplit = target.split(' ');
+    OscapScannerBase::setTarget(sudoerSplit.at(0));
 
     if (mSshConnection.isConnected())
         mSshConnection.disconnect();
 
     QString cleanTarget;
     unsigned short port;
+    bool userIsSudoer;
 
-    splitTarget(target, cleanTarget, port);
+    splitTarget(target, cleanTarget, port, userIsSudoer);
 
     mSshConnection.setTarget(cleanTarget);
     mSshConnection.setPort(port);
 }
 
+bool OscapScannerRemoteSsh::getUserIsSudoer() const
+{
+    return mUserIsSudoer;
+}
+
 void OscapScannerRemoteSsh::setUserIsSudoer(bool userIsSudoer)
 {
     mUserIsSudoer = userIsSudoer;

src/RemoteMachineComboBox.cpp

@@ -30,7 +30,7 @@ RemoteMachineComboBox::RemoteMachineComboBox(QWidget* parent):
 
 #if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0))
     // placeholder text is only supported in Qt 4.7 onwards
-    mUI.host->setPlaceholderText(QObject::tr("username@hostname"));
+    mUI.host->setPlaceholderText(QObject::tr("username@hostname [sudo]"));
 #endif
 
     mQSettings = new QSettings(this);
@@ -77,11 +77,12 @@ unsigned int RemoteMachineComboBox::getRecentMachineCount() const
     return mRecentTargets.size();
 }
 
-void RemoteMachineComboBox::notifyTargetUsed(const QString& target)
+void RemoteMachineComboBox::notifyTargetUsed(const QString& target, bool userIsSudoer)
 {
     QString host;
     unsigned short port;
-    OscapScannerRemoteSsh::splitTarget(target, host, port);
+    bool placeholder;
+    OscapScannerRemoteSsh::splitTarget(target, host, port, placeholder);
 
     // skip invalid suggestions
     if (host.isEmpty() || port == 0)
@@ -90,7 +91,8 @@ void RemoteMachineComboBox::notifyTargetUsed(const QString& target)
     const unsigned int machineCount = getRecentMachineCount();
 
     // this moves target to the beginning of the list if it was in the list already
-    mRecentTargets.prepend(target);
+    QString targetWithSudo = target + (userIsSudoer ? " sudo" : "");
+    mRecentTargets.prepend(targetWithSudo);
     mRecentTargets.removeDuplicates();
 
     setRecentMachineCount(machineCount);
@@ -106,6 +108,7 @@ void RemoteMachineComboBox::clearHistory()
 {
     mUI.host->setText("");
     mUI.port->setValue(22);
+    mUI.userIsSudoer->setChecked(false);
 
     const unsigned int machineCount = getRecentMachineCount();
     mRecentTargets.clear();
@@ -167,6 +170,7 @@ void RemoteMachineComboBox::updateHostPort(int index)
     {
         mUI.host->setText("");
         mUI.port->setValue(22);
+        mUI.userIsSudoer->setChecked(false);
         return;
     }
 
@@ -179,10 +183,11 @@ void RemoteMachineComboBox::updateHostPort(int index)
 
     QString host;
     unsigned short port;
+    bool userIsSudoer;
 
-    OscapScannerRemoteSsh::splitTarget(target, host, port);
+    OscapScannerRemoteSsh::splitTarget(target, host, port, userIsSudoer);
 
     mUI.host->setText(host);
     mUI.port->setValue(port);
-
+    mUI.userIsSudoer->setChecked(userIsSudoer);
 }