Changed the way to test authentication: instead of having a hardcoded config

option, allowByPass, we now have a "Test now" button in the configuration
interface. We add to change both the config app and the libopie2security files
for that, since the MultiauthMainWindow constructor has to know whether to
implement a debug mode (with an new argument, false by default). We also had
to give MultiauthGeneralConfig a link to MultiauthConfig, since the test
button triggers the writing of the whole configuration.
Some cleaning too (m_ on *all* member attributes, removal of obsolete
allowByPass / explanScreens checking code.

4 files changed, 100 insertions, 66 deletions

diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index 3c73d7b..192b8ca 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -1,9 +1,8 @@
-#include "multiauthconfig.h"
-
 #include <opie2/odebug.h>
+#include <opie2/multiauthmainwindow.h>
 
 #include <qgroupbox.h>
 #include <qvgroupbox.h>
 #include <qpe/resource.h>
 #include <qlayout.h>
 #include <qlabel.h>
@@ -14,12 +13,14 @@
 #include <qtoolbutton.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 
+#include "multiauthconfig.h"
+
 
 using Opie::Security::MultiauthPluginInterface;
 using Opie::Security::MultiauthPluginObject;
 using Opie::Security::MultiauthConfigWidget;
 /// keeps information about MultiauthPluginObject plugins
 struct MultiauthPlugin {
@@ -53,79 +54,94 @@ class ToolButton : public QToolButton {
                 setFocusPolicy( QWidget::NoFocus );
                 setToggleButton( t );
                 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
             }
 };
 
-    MultiauthGeneralConfig::MultiauthGeneralConfig(QWidget * parent, const char * name = "general Opie-multiauthentication config widget")
-: QWidget(parent, name), onStart(0), onResume(0), nbSuccessMin(0)
+    MultiauthGeneralConfig::MultiauthGeneralConfig(MultiauthConfig * parentConfig, QWidget * parent, const char * name = "general Opie-multiauthentication config widget")
+: QWidget(parent, name), m_onStart(0), m_onResume(0), m_noProtectConfig(0), m_explanScreens(0), m_nbSuccessMin(0), m_tryButton(0)
 {
+    // keep track of the MultiauthConfig parent in one of our attributes
+    m_parentConfig = parentConfig;
     QVBoxLayout *vb = new QVBoxLayout(this);
     vb->setSpacing(11);
     vb->setMargin(11);
     vb->setAlignment( Qt::AlignTop );
 
     QGroupBox *lockBox = new QGroupBox(0, Qt::Vertical, tr("When to lock Opie"), this, "lock box");
     vb->addWidget(lockBox);
     QGridLayout *boxLayout = new QGridLayout( lockBox->layout() );
-    onStart = new QCheckBox( tr( "on Opie start" ), lockBox, "lock on opie start");
-    onResume = new QCheckBox( tr( "on Opie resume" ), lockBox, "lock on opie resume");
-    boxLayout->addWidget(onStart, 0, 0);
-    boxLayout->addWidget(onResume, 0, 1);
+    m_onStart = new QCheckBox( tr( "on Opie start" ), lockBox, "lock on opie start");
+    m_onResume = new QCheckBox( tr( "on Opie resume" ), lockBox, "lock on opie resume");
+    boxLayout->addWidget(m_onStart, 0, 0);
+    boxLayout->addWidget(m_onResume, 0, 1);
 
     QGroupBox *nbBox = new QGroupBox(0, Qt::Vertical, tr("Multiple plugins authentication"), this, "nb box");
     vb->addWidget(nbBox);
     QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() );
-    nbSuccessMin = new QSpinBox(nbBox);
+    m_nbSuccessMin = new QSpinBox(nbBox);
     QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox);
-    nbBoxLayout->addWidget(nbSuccessMin, 0, 0);
+    nbBoxLayout->addWidget(m_nbSuccessMin, 0, 0);
     nbBoxLayout->addWidget(lNbSuccessMin, 0, 1);
-    nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor
+    m_nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor
 
-    QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Debug options"), this, "dev box");
+    QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Options"), this, "dev box");
     vb->addWidget(devBox);
     QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() );
-    noProtectConfig = new QCheckBox( tr("Don't protect this config screen"), devBox, "don't protect config");
-    explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens");
-    allowBypass = new QCheckBox( tr("Allow to bypass authentication"), devBox, "AllowBypass");
-    QLabel *logicNote = new QLabel( "<p>" + tr("Note: the third option implies the second one") + "</p>", devBox );
-    devBoxLayout->addWidget(noProtectConfig, 0, 0);
-    devBoxLayout->addWidget(explanScreens, 1, 0);
-    devBoxLayout->addWidget(allowBypass, 2, 0);
-    devBoxLayout->addMultiCellWidget(logicNote, 3, 3, 0, 1);
+    m_noProtectConfig = new QCheckBox( tr("Don't protect this config screen"), devBox, "don't protect config");
+    m_explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens");
+    devBoxLayout->addWidget(m_noProtectConfig, 0, 0);
+    devBoxLayout->addWidget(m_explanScreens, 1, 0);
+
+    QVGroupBox *tryBox = new QVGroupBox(tr("Testing"), this, "try box");
+    vb->addWidget(tryBox);
+    m_tryButton = new QPushButton( tr("Test the authentication now"), tryBox, "try button");
+    connect( m_tryButton, SIGNAL(clicked()), this, SLOT(tryAuth()) );
 
-    connect( explanScreens, SIGNAL(toggled(bool)), this, SLOT(checkBypass()) );
-    connect( allowBypass, SIGNAL(toggled(bool)), this, SLOT(checkScreens()) );
 }
 
 /// nothing to do
 MultiauthGeneralConfig::~MultiauthGeneralConfig()
 {}
 
-/// Be sure that explanScreens is checked if allowBypass is
-void MultiauthGeneralConfig::checkScreens()
+/// launches the authentication process, as configured, with the option to bypass it
+void MultiauthGeneralConfig::tryAuth()
 {
-    if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) )
-        explanScreens->setChecked(true);
-}
+    QMessageBox confirmSave(
+                         tr("Attention"),
+                         "<p>" + tr("You must save your current settings before trying to authenticate. Press OK to accept and launch a simulated authentication process.") + "</p><p><em>" +
+                         tr("If you don't like the result of this test, don't forget to change your settings before you exit the configuration application!") + "</em></p>",
+                         QMessageBox::Warning,
+                         QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
+                         0, QString::null, TRUE, WStyle_StaysOnTop);
+    confirmSave.setButtonText(QMessageBox::Cancel, tr("Cancel"));
+    confirmSave.setButtonText(QMessageBox::Yes, tr("OK"));
 
-/// Be sure that allowBypass is not checked if explanScreens is not
-void MultiauthGeneralConfig::checkBypass()
+    if ( confirmSave.exec() == QMessageBox::Yes)
 {
-    if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) )
-        allowBypass->setChecked(false);
-}
-
-
-
+        owarn << "writing config as user accepted" << oendl;
+        m_parentConfig->writeConfigs();
+        owarn << "testing authentication" << oendl;
 
+        /* launch the authentication in debug, aka "allowBypass == true", mode
+         */
 
+        Opie::Security::MultiauthMainWindow win(true);
+        // resize the QDialog object so it fills all the screen
+        QRect desk = qApp->desktop()->geometry();
+        win.setGeometry( 0, 0, desk.width(), desk.height() );
 
+        // the authentication has already succeeded (without win interactions)
+        if ( win.isAlreadyDone() )
+            return;
 
+        win.exec();
 
+    }
 
+}
 
 
 /// Builds and displays the Opie multi-authentication configuration dialog
 static void test_and_start() {
     Config pcfg("Security");
     pcfg.setGroup( "Misc" );
@@ -136,13 +152,13 @@ static void test_and_start() {
         exit( -1 );
     }
 }
 
 
 
-    MultiauthConfig::MultiauthConfig(QWidget* par, const char* w,  WFlags f)
+    MultiauthConfig::MultiauthConfig(QWidget* par, const char* w = "MultiauthConfig dialog",  WFlags f = 0)
 : QDialog(par, w, TRUE, f),
     m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0),
     m_generalConfig(0), m_loginWidget(0), m_syncWidget(0),
     m_nbSuccessReq(0), m_plugins_changed(false)
 {
     /* Initializes the global configuration window
@@ -159,13 +175,13 @@ static void test_and_start() {
     m_pluginsInstalled = ! list.isEmpty();
     if (m_pluginsInstalled == false)
         owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl;
 
     setCaption( tr( "Security configuration" ) );
     QVBoxLayout *layout = new QVBoxLayout( this );
-    m_mainTW = new Opie::Ui::OTabWidget( this );
+    m_mainTW = new Opie::Ui::OTabWidget( this, "main tab widget" );
     layout->addWidget(m_mainTW);
 
     if (m_pluginsInstalled)
     {
         m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget");
         QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
@@ -187,13 +203,13 @@ static void test_and_start() {
         new ToolButton( pluginListVB, tr( "Move Down" ), "down", this , SLOT( moveSelectedDown() ) );
         m_mainTW->addTab( m_pluginListWidget, "pass", tr( "plugins" ) );
 
         connect ( m_pluginListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( pluginsChanged ( ) ) );
 
         // general Opie multi-authentication configuration tab
-        m_generalConfig = new MultiauthGeneralConfig(m_mainTW);
+        m_generalConfig = new MultiauthGeneralConfig(this, m_mainTW);
         m_mainTW->addTab(m_generalConfig, "SettingsIcon", tr( "Authentication") );
 
     }
     // login settings page
     m_loginWidget = new LoginBase(m_mainTW, "login config widget");
     m_mainTW->addTab(m_loginWidget, "security/users", tr( "Login") );
@@ -238,13 +254,13 @@ static void test_and_start() {
         }
 
         // set the first tab as default.
         m_mainTW->setCurrentTab(m_pluginListWidget);
 
         // put the number of plugins as the max number of req. auth.
-        m_generalConfig->nbSuccessMin->setMaxValue( pluginList.count() );
+        m_generalConfig->m_nbSuccessMin->setMaxValue( pluginList.count() );
     }
     else
     {
         /* we don't have any installed plugin there. Let's tell
          * that to the user in a third tab, using the m_pluginListWidget widget
          */
@@ -268,20 +284,25 @@ static void test_and_start() {
 
 /// nothing to do
 MultiauthConfig::~MultiauthConfig()
 {
 }
 
-void MultiauthConfig::accept() {
+/// saves the general and plugin(s) configurations
+void MultiauthConfig::writeConfigs() {
     writeConfig();
 
     MultiauthConfigWidget* confWidget = 0;
     for ( confWidget = configWidgetList.first(); confWidget != 0;
           confWidget = configWidgetList.next() )
         confWidget->writeConfig();
+}
 
+/// on QDialog::accept, we save all the configurations and exit the QDialog normally
+void MultiauthConfig::accept() {
+    writeConfigs();
     QDialog::accept();
 }
 
 void MultiauthConfig::done( int r ) {
     QDialog::done( r );
     close();
@@ -311,18 +332,17 @@ void MultiauthConfig::readConfig()
     // pointer, so we release this Config when we want
     Config* pcfg = new Config("Security");
 
     if (m_pluginsInstalled)
     {
         pcfg->setGroup( "Misc" );
-        m_generalConfig->onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) );
-        m_generalConfig->onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) );
-        m_generalConfig->nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) );
-        m_generalConfig->noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) );
-        m_generalConfig->explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) );
-        m_generalConfig->allowBypass->setChecked( pcfg->readBoolEntry( "allowBypass", false ) );
+        m_generalConfig->m_onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) );
+        m_generalConfig->m_onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) );
+        m_generalConfig->m_nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) );
+        m_generalConfig->m_noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) );
+        m_generalConfig->m_explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) );
 
         pcfg->setGroup( "Plugins" );
         m_excludePlugins = pcfg->readListEntry( "ExcludePlugins", ',' );
         m_allPlugins = pcfg->readListEntry( "AllPlugins", ',' );
     }
 
@@ -420,18 +440,17 @@ void MultiauthConfig::writeConfig()
         }
         pcfg->writeEntry( "ExcludePlugins", exclude, ',' );
         pcfg->writeEntry( "IncludePlugins", include, ',' );
         pcfg->writeEntry( "AllPlugins",  allPlugins, ',' );
 
         pcfg->setGroup( "Misc" );
-        pcfg->writeEntry( "onStart",  m_generalConfig->onStart->isChecked() );
-        pcfg->writeEntry( "onResume",  m_generalConfig->onResume->isChecked() );
-        pcfg->writeEntry( "nbSuccessMin",  m_generalConfig->nbSuccessMin->text() );
-        pcfg->writeEntry( "noProtectConfig",  m_generalConfig->noProtectConfig->isChecked() );
-        pcfg->writeEntry( "explanScreens",  m_generalConfig->explanScreens->isChecked() );
-        pcfg->writeEntry( "allowBypass",  m_generalConfig->allowBypass->isChecked() );
+        pcfg->writeEntry( "onStart",  m_generalConfig->m_onStart->isChecked() );
+        pcfg->writeEntry( "onResume",  m_generalConfig->m_onResume->isChecked() );
+        pcfg->writeEntry( "nbSuccessMin",  m_generalConfig->m_nbSuccessMin->text() );
+        pcfg->writeEntry( "noProtectConfig",  m_generalConfig->m_noProtectConfig->isChecked() );
+        pcfg->writeEntry( "explanScreens",  m_generalConfig->m_explanScreens->isChecked() );
     }
 
     /* Login and Sync stuff */
 
     pcfg->setGroup("Sync");
     int auth_peer=0;
@@ -576,13 +595,13 @@ void MultiauthConfig::restoreDefaults()
                          tr("Attention"),
                          "<p>" + tr("All user-defined net ranges will be lost.") + "</p>",
                          QMessageBox::Warning,
                          QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
                          0, QString::null, TRUE, WStyle_StaysOnTop);
     unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel"));
-    unrecbox.setButtonText(QMessageBox::Yes, tr("Ok"));
+    unrecbox.setButtonText(QMessageBox::Yes, tr("OK"));
 
     if ( unrecbox.exec() == QMessageBox::Yes)
     {
         m_syncWidget->syncnet->clear();
         insertDefaultRanges();
     }
diff --git a/core/settings/security/multiauthconfig.h b/core/settings/security/multiauthconfig.h
index 5287083..e64795c 100644
--- a/core/settings/security/multiauthconfig.h
+++ b/core/settings/security/multiauthconfig.h
@@ -54,59 +54,64 @@
 #include <qtextstream.h>
 
 /* UI */
 #include "syncbase.h"
 #include "loginbase.h"
 
+class MultiauthConfig;
+class MultiauthGeneralConfig;
 
 /// the "misc" configuration tab, about general Opie Multiauth settings
 class MultiauthGeneralConfig : public QWidget
 {
     Q_OBJECT
 public:
-    MultiauthGeneralConfig(QWidget * parent, const char * name);
+    MultiauthGeneralConfig(MultiauthConfig * parentConfig, QWidget * parent, const char * name);
     ~MultiauthGeneralConfig();
 protected:
-    QCheckBox *onStart, *onResume, *noProtectConfig, *explanScreens, *allowBypass;
-    QSpinBox *nbSuccessMin;
+    QCheckBox *m_onStart, *m_onResume, *m_noProtectConfig, *m_explanScreens;
+    QSpinBox *m_nbSuccessMin;
 private:
     friend class MultiauthConfig;
+    /// pointer to the MultiauthConfig that called us
+    MultiauthConfig *m_parentConfig;
+    QPushButton *m_tryButton;
 private slots:
-    void checkBypass();
-    void checkScreens();
+    void tryAuth();
 };
 
 /// the whole configuration dialog
 class MultiauthConfig : public QDialog
 {
     Q_OBJECT
     
 public:
     static QString appName() { return QString::fromLatin1("security"); }
     MultiauthConfig(QWidget *parent, const char* name, WFlags fl);
     virtual ~MultiauthConfig();
-    void writeConfig();
     QList<Opie::Security::MultiauthConfigWidget> configWidgetList;
     
 protected slots:
     void accept();
     void done(int r); 
     void pluginsChanged();
     void moveSelectedUp();
     void moveSelectedDown();
+    void writeConfigs();
 
 private slots:
     // Login and Sync stuff
     void setSyncNet(const QString&);
     void changeLoginName(int);
     void toggleAutoLogin(bool);
     void restoreDefaults();
     void insertDefaultRanges();
     void deleteListEntry();
 
 private:
+    friend class MultiauthGeneralConfig;
     /// the widget holding all the tabs (or pages)
     Opie::Ui::OTabWidget *m_mainTW;
     /// list of authentication plugins in the "Plugins" page
     QListView *m_pluginListView;
     QStringList m_allPlugins, m_excludePlugins;
     QMap<QString,QCheckListItem*> m_plugins;
@@ -121,12 +126,13 @@ private:
 
     int m_nbSuccessReq;
     bool m_plugins_changed;
     bool m_pluginsInstalled;
     
     void readConfig();
+    void writeConfig();
     void loadPlugins();
 
     // Login and Sync stuff
     void loadUsers();
     bool telnetAvailable() const;
     bool sshAvailable() const;
diff --git a/libopie2/opiesecurity/multiauthmainwindow.cpp b/libopie2/opiesecurity/multiauthmainwindow.cpp
index fa247ab..fb720bb 100644
--- a/libopie2/opiesecurity/multiauthmainwindow.cpp
+++ b/libopie2/opiesecurity/multiauthmainwindow.cpp
@@ -3,28 +3,35 @@
 #include "multiauthcommon.h"
 #include <qpe/config.h>
 
 namespace Opie {
 namespace Security {
 
-/// Initializes widgets according to allowBypass and explanScreens config
-MultiauthMainWindow::MultiauthMainWindow()
+/// Initializes widgets according to allowBypass argument (false by default) and explanScreens config
+/**
+ * \note if allowBypass is true, we will show explanatory screens anyway
+ */
+MultiauthMainWindow::MultiauthMainWindow(bool allowBypass = false)
     : QDialog(0, "main Opie multiauth modal dialog", TRUE,
               Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop)
 
 {
     alreadyDone = false;
     // initializes widget pointers which not always point to an object
     quit = 0;
     message2 = 0;
 
+    if (allowBypass == true)
+        explanScreens = true;
+    else
+    {
     Config *pcfg = new Config("Security");
     pcfg->setGroup("Misc");
     explanScreens = pcfg->readBoolEntry("explanScreens", true);
-    allowBypass = pcfg->readBoolEntry("allowBypass", false);
     delete pcfg;
+    }
 
     layout = new QVBoxLayout(this);
     layout->setSpacing(11);
     layout->setMargin(11);
     layout->setAlignment( Qt::AlignTop );
 
@@ -50,13 +57,13 @@ MultiauthMainWindow::MultiauthMainWindow()
     {
         quit = new QPushButton("Exit", this);
         layout->addWidget(quit, 0, Qt::AlignHCenter);
         if ( allowBypass == true )
         {
             // very important: we can close the widget through the quit button, and bypass authentication, only if allowBypass is set!
-            message2 = new QLabel("<center><i>" + tr("Note: the 'exit' button should be removed for real protection, through Security config dialog") + ".</i></center>", this);
+            message2 = new QLabel("<center><i>" + tr("Note: this 'exit' button only appears during <b>simulations</b>, like the one we are in.") + "</i></center>", this);
             layout->addWidget(message2);
             QObject::connect(quit, SIGNAL(clicked()), this, SLOT(close()));
         }
         else
         {
             quit->hide();
@@ -111,16 +118,18 @@ void MultiauthMainWindow::proceed() {
                 if ( message2 != 0 ) message2->hide();
             }
         }
         else
         {
             // authentication has failed, explain that according to allowBypass
-            message->setText( "<center><h3>" + tr("You have not succeeded enough authentication steps!") + "</h3></center>" );
+            message->setText( "<center><h3>" + tr("You have <b>not</b> succeeded enough authentication steps!") + "</h3></center>" );
             proceedButton->show();
             if ( allowBypass == true )
-                message2->setText( "<center><p>" + tr("Note: if 'allow to bypass' was uncheck in Security config, you would have to go back through all the steps now.") + "</p></center>" );
+            {
+                message2->setText( "<center><p>" + tr("Be careful: if this was not a <b>simulation</b>, you would have to go back through all the steps now.") + "</p></center>" );
+                message2->show();
         }
     }
 }
 
 /** When we don't show explanatory screens and we succeed authentication,
  * as early as during the proceed() call of the constructor, the caller must know
diff --git a/libopie2/opiesecurity/multiauthmainwindow.h b/libopie2/opiesecurity/multiauthmainwindow.h
index 626b8b3..9d2376b 100644
--- a/libopie2/opiesecurity/multiauthmainwindow.h
+++ b/libopie2/opiesecurity/multiauthmainwindow.h
@@ -52,13 +52,13 @@ namespace Security {
  * with it.
  */
 class MultiauthMainWindow : public QDialog {
     Q_OBJECT
 
     public:
-        MultiauthMainWindow();
+        MultiauthMainWindow(bool allowBypass = false);
         ~MultiauthMainWindow();
         bool isAlreadyDone();
 
     private:
         QVBoxLayout * layout;
         QLabel * title, * message, * message2;