Diffstat (limited to 'core/settings/security/multiauthconfig.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 129 |
1 files changed, 74 insertions, 55 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,7 +1,6 @@ | |||
1 | #include "multiauthconfig.h" | ||
2 | |||
3 | #include <opie2/odebug.h> | 1 | #include <opie2/odebug.h> |
2 | #include <opie2/multiauthmainwindow.h> | ||
4 | 3 | ||
5 | #include <qgroupbox.h> | 4 | #include <qgroupbox.h> |
6 | #include <qvgroupbox.h> | 5 | #include <qvgroupbox.h> |
7 | #include <qpe/resource.h> | 6 | #include <qpe/resource.h> |
@@ -16,8 +15,10 @@ | |||
16 | #include <qdir.h> | 15 | #include <qdir.h> |
17 | #include <qpe/qlibrary.h> | 16 | #include <qpe/qlibrary.h> |
18 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
19 | 18 | ||
19 | #include "multiauthconfig.h" | ||
20 | |||
20 | 21 | ||
21 | using Opie::Security::MultiauthPluginInterface; | 22 | using Opie::Security::MultiauthPluginInterface; |
22 | using Opie::Security::MultiauthPluginObject; | 23 | using Opie::Security::MultiauthPluginObject; |
23 | using Opie::Security::MultiauthConfigWidget; | 24 | using Opie::Security::MultiauthConfigWidget; |
@@ -55,75 +56,90 @@ class ToolButton : public QToolButton { | |||
55 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); | 56 | connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); |
56 | } | 57 | } |
57 | }; | 58 | }; |
58 | 59 | ||
59 | MultiauthGeneralConfig::MultiauthGeneralConfig(QWidget * parent, const char * name = "general Opie-multiauthentication config widget") | 60 | MultiauthGeneralConfig::MultiauthGeneralConfig(MultiauthConfig * parentConfig, QWidget * parent, const char * name = "general Opie-multiauthentication config widget") |
60 | : QWidget(parent, name), onStart(0), onResume(0), nbSuccessMin(0) | 61 | : QWidget(parent, name), m_onStart(0), m_onResume(0), m_noProtectConfig(0), m_explanScreens(0), m_nbSuccessMin(0), m_tryButton(0) |
61 | { | 62 | { |
63 | // keep track of the MultiauthConfig parent in one of our attributes | ||
64 | m_parentConfig = parentConfig; | ||
62 | QVBoxLayout *vb = new QVBoxLayout(this); | 65 | QVBoxLayout *vb = new QVBoxLayout(this); |
63 | vb->setSpacing(11); | 66 | vb->setSpacing(11); |
64 | vb->setMargin(11); | 67 | vb->setMargin(11); |
65 | vb->setAlignment( Qt::AlignTop ); | 68 | vb->setAlignment( Qt::AlignTop ); |
66 | 69 | ||
67 | QGroupBox *lockBox = new QGroupBox(0, Qt::Vertical, tr("When to lock Opie"), this, "lock box"); | 70 | QGroupBox *lockBox = new QGroupBox(0, Qt::Vertical, tr("When to lock Opie"), this, "lock box"); |
68 | vb->addWidget(lockBox); | 71 | vb->addWidget(lockBox); |
69 | QGridLayout *boxLayout = new QGridLayout( lockBox->layout() ); | 72 | QGridLayout *boxLayout = new QGridLayout( lockBox->layout() ); |
70 | onStart = new QCheckBox( tr( "on Opie start" ), lockBox, "lock on opie start"); | 73 | m_onStart = new QCheckBox( tr( "on Opie start" ), lockBox, "lock on opie start"); |
71 | onResume = new QCheckBox( tr( "on Opie resume" ), lockBox, "lock on opie resume"); | 74 | m_onResume = new QCheckBox( tr( "on Opie resume" ), lockBox, "lock on opie resume"); |
72 | boxLayout->addWidget(onStart, 0, 0); | 75 | boxLayout->addWidget(m_onStart, 0, 0); |
73 | boxLayout->addWidget(onResume, 0, 1); | 76 | boxLayout->addWidget(m_onResume, 0, 1); |
74 | 77 | ||
75 | QGroupBox *nbBox = new QGroupBox(0, Qt::Vertical, tr("Multiple plugins authentication"), this, "nb box"); | 78 | QGroupBox *nbBox = new QGroupBox(0, Qt::Vertical, tr("Multiple plugins authentication"), this, "nb box"); |
76 | vb->addWidget(nbBox); | 79 | vb->addWidget(nbBox); |
77 | QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() ); | 80 | QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() ); |
78 | nbSuccessMin = new QSpinBox(nbBox); | 81 | m_nbSuccessMin = new QSpinBox(nbBox); |
79 | QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox); | 82 | QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox); |
80 | nbBoxLayout->addWidget(nbSuccessMin, 0, 0); | 83 | nbBoxLayout->addWidget(m_nbSuccessMin, 0, 0); |
81 | nbBoxLayout->addWidget(lNbSuccessMin, 0, 1); | 84 | nbBoxLayout->addWidget(lNbSuccessMin, 0, 1); |
82 | nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor | 85 | m_nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor |
83 | 86 | ||
84 | QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Debug options"), this, "dev box"); | 87 | QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Options"), this, "dev box"); |
85 | vb->addWidget(devBox); | 88 | vb->addWidget(devBox); |
86 | QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() ); | 89 | QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() ); |
87 | noProtectConfig = new QCheckBox( tr("Don't protect this config screen"), devBox, "don't protect config"); | 90 | m_noProtectConfig = new QCheckBox( tr("Don't protect this config screen"), devBox, "don't protect config"); |
88 | explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens"); | 91 | m_explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens"); |
89 | allowBypass = new QCheckBox( tr("Allow to bypass authentication"), devBox, "AllowBypass"); | 92 | devBoxLayout->addWidget(m_noProtectConfig, 0, 0); |
90 | QLabel *logicNote = new QLabel( "<p>" + tr("Note: the third option implies the second one") + "</p>", devBox ); | 93 | devBoxLayout->addWidget(m_explanScreens, 1, 0); |
91 | devBoxLayout->addWidget(noProtectConfig, 0, 0); | 94 | |
92 | devBoxLayout->addWidget(explanScreens, 1, 0); | 95 | QVGroupBox *tryBox = new QVGroupBox(tr("Testing"), this, "try box"); |
93 | devBoxLayout->addWidget(allowBypass, 2, 0); | 96 | vb->addWidget(tryBox); |
94 | devBoxLayout->addMultiCellWidget(logicNote, 3, 3, 0, 1); | 97 | m_tryButton = new QPushButton( tr("Test the authentication now"), tryBox, "try button"); |
95 | 98 | connect( m_tryButton, SIGNAL(clicked()), this, SLOT(tryAuth()) ); | |
96 | connect( explanScreens, SIGNAL(toggled(bool)), this, SLOT(checkBypass()) ); | 99 | |
97 | connect( allowBypass, SIGNAL(toggled(bool)), this, SLOT(checkScreens()) ); | ||
98 | } | 100 | } |
99 | 101 | ||
100 | /// nothing to do | 102 | /// nothing to do |
101 | MultiauthGeneralConfig::~MultiauthGeneralConfig() | 103 | MultiauthGeneralConfig::~MultiauthGeneralConfig() |
102 | {} | 104 | {} |
103 | 105 | ||
104 | /// Be sure that explanScreens is checked if allowBypass is | 106 | /// launches the authentication process, as configured, with the option to bypass it |
105 | void MultiauthGeneralConfig::checkScreens() | 107 | void MultiauthGeneralConfig::tryAuth() |
106 | { | 108 | { |
107 | if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) ) | 109 | QMessageBox confirmSave( |
108 | explanScreens->setChecked(true); | 110 | tr("Attention"), |
109 | } | 111 | "<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>" + |
110 | 112 | 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>", | |
111 | /// Be sure that allowBypass is not checked if explanScreens is not | 113 | QMessageBox::Warning, |
112 | void MultiauthGeneralConfig::checkBypass() | 114 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, |
113 | { | 115 | 0, QString::null, TRUE, WStyle_StaysOnTop); |
114 | if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) ) | 116 | confirmSave.setButtonText(QMessageBox::Cancel, tr("Cancel")); |
115 | allowBypass->setChecked(false); | 117 | confirmSave.setButtonText(QMessageBox::Yes, tr("OK")); |
116 | } | ||
117 | |||
118 | |||
119 | 118 | ||
119 | if ( confirmSave.exec() == QMessageBox::Yes) | ||
120 | { | ||
121 | owarn << "writing config as user accepted" << oendl; | ||
122 | m_parentConfig->writeConfigs(); | ||
123 | owarn << "testing authentication" << oendl; | ||
120 | 124 | ||
125 | /* launch the authentication in debug, aka "allowBypass == true", mode | ||
126 | */ | ||
121 | 127 | ||
128 | Opie::Security::MultiauthMainWindow win(true); | ||
129 | // resize the QDialog object so it fills all the screen | ||
130 | QRect desk = qApp->desktop()->geometry(); | ||
131 | win.setGeometry( 0, 0, desk.width(), desk.height() ); | ||
122 | 132 | ||
133 | // the authentication has already succeeded (without win interactions) | ||
134 | if ( win.isAlreadyDone() ) | ||
135 | return; | ||
123 | 136 | ||
137 | win.exec(); | ||
124 | 138 | ||
139 | } | ||
125 | 140 | ||
141 | } | ||
126 | 142 | ||
127 | 143 | ||
128 | /// Builds and displays the Opie multi-authentication configuration dialog | 144 | /// Builds and displays the Opie multi-authentication configuration dialog |
129 | static void test_and_start() { | 145 | static void test_and_start() { |
@@ -138,9 +154,9 @@ static void test_and_start() { | |||
138 | } | 154 | } |
139 | 155 | ||
140 | 156 | ||
141 | 157 | ||
142 | MultiauthConfig::MultiauthConfig(QWidget* par, const char* w, WFlags f) | 158 | MultiauthConfig::MultiauthConfig(QWidget* par, const char* w = "MultiauthConfig dialog", WFlags f = 0) |
143 | : QDialog(par, w, TRUE, f), | 159 | : QDialog(par, w, TRUE, f), |
144 | m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0), | 160 | m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0), |
145 | m_generalConfig(0), m_loginWidget(0), m_syncWidget(0), | 161 | m_generalConfig(0), m_loginWidget(0), m_syncWidget(0), |
146 | m_nbSuccessReq(0), m_plugins_changed(false) | 162 | m_nbSuccessReq(0), m_plugins_changed(false) |
@@ -161,9 +177,9 @@ static void test_and_start() { | |||
161 | owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl; | 177 | owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl; |
162 | 178 | ||
163 | setCaption( tr( "Security configuration" ) ); | 179 | setCaption( tr( "Security configuration" ) ); |
164 | QVBoxLayout *layout = new QVBoxLayout( this ); | 180 | QVBoxLayout *layout = new QVBoxLayout( this ); |
165 | m_mainTW = new Opie::Ui::OTabWidget( this ); | 181 | m_mainTW = new Opie::Ui::OTabWidget( this, "main tab widget" ); |
166 | layout->addWidget(m_mainTW); | 182 | layout->addWidget(m_mainTW); |
167 | 183 | ||
168 | if (m_pluginsInstalled) | 184 | if (m_pluginsInstalled) |
169 | { | 185 | { |
@@ -189,9 +205,9 @@ static void test_and_start() { | |||
189 | 205 | ||
190 | connect ( m_pluginListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( pluginsChanged ( ) ) ); | 206 | connect ( m_pluginListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( pluginsChanged ( ) ) ); |
191 | 207 | ||
192 | // general Opie multi-authentication configuration tab | 208 | // general Opie multi-authentication configuration tab |
193 | m_generalConfig = new MultiauthGeneralConfig(m_mainTW); | 209 | m_generalConfig = new MultiauthGeneralConfig(this, m_mainTW); |
194 | m_mainTW->addTab(m_generalConfig, "SettingsIcon", tr( "Authentication") ); | 210 | m_mainTW->addTab(m_generalConfig, "SettingsIcon", tr( "Authentication") ); |
195 | 211 | ||
196 | } | 212 | } |
197 | // login settings page | 213 | // login settings page |
@@ -240,9 +256,9 @@ static void test_and_start() { | |||
240 | // set the first tab as default. | 256 | // set the first tab as default. |
241 | m_mainTW->setCurrentTab(m_pluginListWidget); | 257 | m_mainTW->setCurrentTab(m_pluginListWidget); |
242 | 258 | ||
243 | // put the number of plugins as the max number of req. auth. | 259 | // put the number of plugins as the max number of req. auth. |
244 | m_generalConfig->nbSuccessMin->setMaxValue( pluginList.count() ); | 260 | m_generalConfig->m_nbSuccessMin->setMaxValue( pluginList.count() ); |
245 | } | 261 | } |
246 | else | 262 | else |
247 | { | 263 | { |
248 | /* we don't have any installed plugin there. Let's tell | 264 | /* we don't have any installed plugin there. Let's tell |
@@ -270,16 +286,21 @@ static void test_and_start() { | |||
270 | MultiauthConfig::~MultiauthConfig() | 286 | MultiauthConfig::~MultiauthConfig() |
271 | { | 287 | { |
272 | } | 288 | } |
273 | 289 | ||
274 | void MultiauthConfig::accept() { | 290 | /// saves the general and plugin(s) configurations |
291 | void MultiauthConfig::writeConfigs() { | ||
275 | writeConfig(); | 292 | writeConfig(); |
276 | 293 | ||
277 | MultiauthConfigWidget* confWidget = 0; | 294 | MultiauthConfigWidget* confWidget = 0; |
278 | for ( confWidget = configWidgetList.first(); confWidget != 0; | 295 | for ( confWidget = configWidgetList.first(); confWidget != 0; |
279 | confWidget = configWidgetList.next() ) | 296 | confWidget = configWidgetList.next() ) |
280 | confWidget->writeConfig(); | 297 | confWidget->writeConfig(); |
298 | } | ||
281 | 299 | ||
300 | /// on QDialog::accept, we save all the configurations and exit the QDialog normally | ||
301 | void MultiauthConfig::accept() { | ||
302 | writeConfigs(); | ||
282 | QDialog::accept(); | 303 | QDialog::accept(); |
283 | } | 304 | } |
284 | 305 | ||
285 | void MultiauthConfig::done( int r ) { | 306 | void MultiauthConfig::done( int r ) { |
@@ -313,14 +334,13 @@ void MultiauthConfig::readConfig() | |||
313 | 334 | ||
314 | if (m_pluginsInstalled) | 335 | if (m_pluginsInstalled) |
315 | { | 336 | { |
316 | pcfg->setGroup( "Misc" ); | 337 | pcfg->setGroup( "Misc" ); |
317 | m_generalConfig->onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) ); | 338 | m_generalConfig->m_onStart->setChecked( pcfg->readBoolEntry( "onStart", false ) ); |
318 | m_generalConfig->onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) ); | 339 | m_generalConfig->m_onResume->setChecked( pcfg->readBoolEntry( "onResume", false ) ); |
319 | m_generalConfig->nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) ); | 340 | m_generalConfig->m_nbSuccessMin->setValue( pcfg->readNumEntry( "nbSuccessMin", 1 ) ); |
320 | m_generalConfig->noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) ); | 341 | m_generalConfig->m_noProtectConfig->setChecked( pcfg->readBoolEntry( "noProtectConfig", true) ); |
321 | m_generalConfig->explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) ); | 342 | m_generalConfig->m_explanScreens->setChecked( pcfg->readBoolEntry( "explanScreens", true ) ); |
322 | m_generalConfig->allowBypass->setChecked( pcfg->readBoolEntry( "allowBypass", false ) ); | ||
323 | 343 | ||
324 | pcfg->setGroup( "Plugins" ); | 344 | pcfg->setGroup( "Plugins" ); |
325 | m_excludePlugins = pcfg->readListEntry( "ExcludePlugins", ',' ); | 345 | m_excludePlugins = pcfg->readListEntry( "ExcludePlugins", ',' ); |
326 | m_allPlugins = pcfg->readListEntry( "AllPlugins", ',' ); | 346 | m_allPlugins = pcfg->readListEntry( "AllPlugins", ',' ); |
@@ -422,14 +442,13 @@ void MultiauthConfig::writeConfig() | |||
422 | pcfg->writeEntry( "IncludePlugins", include, ',' ); | 442 | pcfg->writeEntry( "IncludePlugins", include, ',' ); |
423 | pcfg->writeEntry( "AllPlugins", allPlugins, ',' ); | 443 | pcfg->writeEntry( "AllPlugins", allPlugins, ',' ); |
424 | 444 | ||
425 | pcfg->setGroup( "Misc" ); | 445 | pcfg->setGroup( "Misc" ); |
426 | pcfg->writeEntry( "onStart", m_generalConfig->onStart->isChecked() ); | 446 | pcfg->writeEntry( "onStart", m_generalConfig->m_onStart->isChecked() ); |
427 | pcfg->writeEntry( "onResume", m_generalConfig->onResume->isChecked() ); | 447 | pcfg->writeEntry( "onResume", m_generalConfig->m_onResume->isChecked() ); |
428 | pcfg->writeEntry( "nbSuccessMin", m_generalConfig->nbSuccessMin->text() ); | 448 | pcfg->writeEntry( "nbSuccessMin", m_generalConfig->m_nbSuccessMin->text() ); |
429 | pcfg->writeEntry( "noProtectConfig", m_generalConfig->noProtectConfig->isChecked() ); | 449 | pcfg->writeEntry( "noProtectConfig", m_generalConfig->m_noProtectConfig->isChecked() ); |
430 | pcfg->writeEntry( "explanScreens", m_generalConfig->explanScreens->isChecked() ); | 450 | pcfg->writeEntry( "explanScreens", m_generalConfig->m_explanScreens->isChecked() ); |
431 | pcfg->writeEntry( "allowBypass", m_generalConfig->allowBypass->isChecked() ); | ||
432 | } | 451 | } |
433 | 452 | ||
434 | /* Login and Sync stuff */ | 453 | /* Login and Sync stuff */ |
435 | 454 | ||
@@ -578,9 +597,9 @@ void MultiauthConfig::restoreDefaults() | |||
578 | QMessageBox::Warning, | 597 | QMessageBox::Warning, |
579 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, | 598 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, |
580 | 0, QString::null, TRUE, WStyle_StaysOnTop); | 599 | 0, QString::null, TRUE, WStyle_StaysOnTop); |
581 | unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); | 600 | unrecbox.setButtonText(QMessageBox::Cancel, tr("Cancel")); |
582 | unrecbox.setButtonText(QMessageBox::Yes, tr("Ok")); | 601 | unrecbox.setButtonText(QMessageBox::Yes, tr("OK")); |
583 | 602 | ||
584 | if ( unrecbox.exec() == QMessageBox::Yes) | 603 | if ( unrecbox.exec() == QMessageBox::Yes) |
585 | { | 604 | { |
586 | m_syncWidget->syncnet->clear(); | 605 | m_syncWidget->syncnet->clear(); |