After failing admin authorization, allow retrying by hand

Change-Id: If05f1c6359c2667e0094721540415b5293856370
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

2 files changed, 24 insertions, 2 deletions

diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp
index 468ce6878..14467fecd 100644
--- a/src/libs/installer/adminauthorization_x11.cpp
+++ b/src/libs/installer/adminauthorization_x11.cpp
@@ -33,6 +33,7 @@
 #include "adminauthorization.h"
 
 #include <QtCore/QFile>
+#include <QDebug>
 
 #include <QtGui/QApplication>
 #include <QtGui/QInputDialog>
@@ -72,8 +73,8 @@ static QString getPassword(QWidget *)
     if (QApplication::type() == QApplication::GuiClient) {
         bool ok = false;
         const QString result = QInputDialog::getText(0, QObject::tr("Authorization required"),
-                                                     QObject::tr("Enter your password to authorize for sudo:"),
-                                                     QLineEdit::Password, QString(), &ok);
+           QObject::tr("Enter your password to authorize for sudo:"),
+           QLineEdit::Password, QString(), &ok);
         return ok ? result : QString();
     } else {
         std::cout << QObject::tr("Authorization required").toStdString() << std::endl;
@@ -95,6 +96,9 @@ static void printError(QWidget *parent, const QString &value)
 
 bool AdminAuthorization::execute(QWidget *parent, const QString &program, const QStringList &arguments)
 {
+    const QString fallback = program + QLatin1String(" ") + arguments.join(QLatin1String(" "));
+    qDebug() << "Fallback:" << fallback;
+
     // as we cannot pipe the password to su in QProcess, we need to setup a pseudo-terminal for it
     int masterFD = -1;
     int slaveFD = -1;
diff --git a/src/libs/installer/fsengineclient.cpp b/src/libs/installer/fsengineclient.cpp
index beed6d32d..3221b9f29 100644
--- a/src/libs/installer/fsengineclient.cpp
+++ b/src/libs/installer/fsengineclient.cpp
@@ -33,6 +33,7 @@
 #include "fsengineclient.h"
 
 #include "adminauthorization.h"
+#include "messageboxhandler.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QMutex>
@@ -778,6 +779,23 @@ void FSEngineClientHandler::Private::maybeStartServer()
     if (startServerAsAdmin) {
         AdminAuthorization auth;
         serverStarted = auth.authorize() && auth.execute(0, serverCommand, serverArguments);
+
+        if (!serverStarted) {
+            // something went wrong with authorizing, either user pressed cancel or entered
+            // wrong password
+            const QString fallback = serverCommand + QLatin1String(" ") + serverArguments.join(QLatin1String(" "));
+
+            const QMessageBox::Button res =
+                QInstaller::MessageBoxHandler::critical(QInstaller::MessageBoxHandler::currentBestSuitParent(),
+                QObject::tr("Authorization Error"), QObject::tr("Couldn't get authorization."),
+                QObject::tr("Couldn't get authorization that is needed for continuing the installation.\n"
+                            "Either abort the installation or use the fallback solution by running\n"
+                            "%1\nas root and then clicking ok.").arg(fallback),
+                QMessageBox::Abort | QMessageBox::Ok, QMessageBox::Ok);
+
+            if (res == QMessageBox::Ok)
+                serverStarted = true;
+        }
     } else {
         serverStarted = QProcess::startDetached(serverCommand, serverArguments);
     }