summaryrefslogtreecommitdiff
authorclem <clem>2004-10-05 23:38:06 (UTC)
committer clem <clem>2004-10-05 23:38:06 (UTC)
commitc09e45b02053c61b4e195c9d79a573ebfed2c521 (patch) (side-by-side diff)
tree504a1a7d6b29e9dc186b2a7a7431ea41482041e3
parent2d05ffb4bad93532e17b9350ff2d66fe3419cbe3 (diff)
downloadopie-c09e45b02053c61b4e195c9d79a573ebfed2c521.zip
opie-c09e45b02053c61b4e195c9d79a573ebfed2c521.tar.gz
opie-c09e45b02053c61b4e195c9d79a573ebfed2c521.tar.bz2
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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/multiauthconfig.cpp129
-rw-r--r--core/settings/security/multiauthconfig.h18
-rw-r--r--libopie2/opiesecurity/multiauthmainwindow.cpp29
-rw-r--r--libopie2/opiesecurity/multiauthmainwindow.h2
4 files changed, 106 insertions, 72 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,217 +1,233 @@
-#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>
#include <qhbox.h>
#include <qheader.h>
#include <qvbox.h>
#include <qwhatsthis.h>
#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 {
MultiauthPlugin() : library( 0 ), iface( 0 ), pluginObject( 0 ) {}
/// plugin file
QLibrary *library;
/// the plugin object interface
QInterfacePtr<MultiauthPluginInterface> iface;
/// the plugin object itself
MultiauthPluginObject *pluginObject;
/// name of the plugin file
QString name;
/// should the plugin be launched during authentication or not
bool active;
/// order of the plugin, in the pluginListWidget and during authentication
int pos;
};
/// list of available MultiauthPlugin objects
static QValueList<MultiauthPlugin> pluginList;
/// extension of QToolButton that adds signals, icons and stuff (taken from todayconfig.cpp)
class ToolButton : public QToolButton {
public:
ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
: QToolButton( parent, name ) {
setPixmap( Resource::loadPixmap( icon ) );
setAutoRaise( TRUE );
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);
-
- connect( explanScreens, SIGNAL(toggled(bool)), this, SLOT(checkBypass()) );
- connect( allowBypass, SIGNAL(toggled(bool)), this, SLOT(checkScreens()) );
+ 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()) );
+
}
/// 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);
-}
-
-/// Be sure that allowBypass is not checked if explanScreens is not
-void MultiauthGeneralConfig::checkBypass()
-{
- if ( (allowBypass->isChecked() == true) && (explanScreens->isChecked() == false) )
- allowBypass->setChecked(false);
-}
-
-
+ 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"));
+ if ( confirmSave.exec() == QMessageBox::Yes)
+ {
+ 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" );
bool protectConfigDialog = ! pcfg.readBoolEntry("noProtectConfig", true);
if (protectConfigDialog && Opie::Security::Internal::runPlugins() != 0) {
owarn << "authentication failed, not showing opie-security" << oendl;
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
*/
test_and_start();
/* Checks (and memorizes) if any authentication plugins are
* installed on the system
*/
QString path = QPEApplication::qpeDir() + "/plugins/security";
QDir dir( path, "lib*.so" );
QStringList list = dir.entryList();
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);
pluginListLayout->setSpacing(6);
pluginListLayout->setMargin(11);
QLabel * pluginListTitle = new QLabel( tr( "Load which plugins in what order:" ), m_pluginListWidget );
pluginListLayout->addWidget(pluginListTitle);
QHBox * pluginListHB = new QHBox(m_pluginListWidget);
pluginListLayout->addWidget(pluginListHB);
m_pluginListView = new QListView(pluginListHB);
m_pluginListView->addColumn("PluginList");
m_pluginListView->header()->hide();
m_pluginListView->setSorting(-1);
QWhatsThis::add(m_pluginListView, tr( "Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the order they will appear in" ));
QVBox * pluginListVB = new QVBox(pluginListHB);
new ToolButton( pluginListVB, tr( "Move Up" ), "up", this , SLOT( moveSelectedUp() ) );
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") );
// sync settings page
m_syncWidget = new SyncBase( m_mainTW, "sync config widget" );
m_mainTW->addTab(m_syncWidget, "security/sync", tr( "Sync") );
// read the "Security" Config file and update our UI
readConfig();
if (m_pluginsInstalled)
{
/* loads plugins configuration widgets in mainTW tabs and in pluginListView
*/
loadPlugins();
for ( int i = pluginList.count() - 1; i >= 0; i-- ) {
MultiauthPlugin plugin = pluginList[i];
@@ -220,127 +236,131 @@ static void test_and_start() {
// (configWidget will return 0l if there is no configuration GUI)
MultiauthConfigWidget* widget = plugin.pluginObject->configWidget(m_mainTW);
if ( widget != 0l ) {
odebug << "plugin " << plugin.name << " has a configuration widget" << oendl;
configWidgetList.append(widget);
m_mainTW->addTab( widget, plugin.pluginObject->pixmapNameConfig(),
plugin.pluginObject->pluginName() );
}
// set the order/activate tab
QPixmap icon = Resource::loadPixmap( plugin.pluginObject->pixmapNameWidget() );
QCheckListItem * item = new QCheckListItem(m_pluginListView, plugin.pluginObject->pluginName(), QCheckListItem::CheckBox );
if ( !icon.isNull() ) {
item->setPixmap( 0, icon );
}
if ( m_excludePlugins.find( plugin.name ) == m_excludePlugins.end() ) {
item->setOn( TRUE );
}
m_plugins[plugin.name] = item;
}
// 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
*/
m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget (no plugins warning)");
QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
pluginListLayout->setSpacing(11);
pluginListLayout->setMargin(11);
pluginListLayout->setAlignment( Qt::AlignTop );
QVGroupBox *warningBox = new QVGroupBox(tr("Important notice"), m_pluginListWidget, "noPlugins warning box");
pluginListLayout->addWidget(warningBox);
QLabel * warningText = new QLabel( "<p>" + tr("To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one <em>opie-multiauth-*</em> package! Once you have done that, you will be able to configure your PDA protection here.") + "</p>", warningBox );
m_mainTW->addTab(m_pluginListWidget, "security/Security", tr( "Locking") );
// set the first tab as default.
m_mainTW->setCurrentTab(m_loginWidget);
}
showMaximized();
}
/// 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();
}
/// moves up the selected plugin
void MultiauthConfig::moveSelectedUp()
{
QListViewItem *item = m_pluginListView->selectedItem();
if ( item && item->itemAbove() ) {
item->itemAbove()->moveItem( item );
}
}
/// moves down the selected plugin
void MultiauthConfig::moveSelectedDown()
{
QListViewItem *item = m_pluginListView->selectedItem();
if ( item && item->itemBelow() ) {
item->moveItem( item->itemBelow() );
}
}
/// reads the <code>Security.conf</code> Config file, and updates parts of the user interface
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", ',' );
}
/* Login and Sync stuff */
pcfg->setGroup("Sync");
int auth_peer = pcfg->readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
int auth_peer_bits = pcfg->readNumEntry("auth_peer_bits",24);
pcfg->setGroup("SyncMode");
int mode = pcfg->readNumEntry("Mode",2); // Default to Sharp
switch( mode ) {
case 0x01:
m_syncWidget->syncModeCombo->setCurrentItem( 0 );
break;
case 0x02:
default:
m_syncWidget->syncModeCombo->setCurrentItem( 1 );
break;
case 0x04:
m_syncWidget->syncModeCombo->setCurrentItem( 2 );
break;
@@ -402,54 +422,53 @@ void MultiauthConfig::writeConfig()
QStringList include;
QStringList allPlugins;
QListViewItemIterator list_it( m_pluginListView );
// this makes sure the names get saved in the order selected
for ( ; list_it.current(); ++list_it ) {
QMap <QString, QCheckListItem *>::Iterator it;
for ( it = m_plugins.begin(); it != m_plugins. end (); ++it ) {
if ( list_it.current() == (*it) && !(*it)-> isOn () ) {
exclude << it.key();
} else if ( list_it.current() == (*it) && (*it)-> isOn () ){
include << it.key();
}
if ( list_it.current() == (*it) ) {
allPlugins << it.key();
}
}
}
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;
int auth_peer_bits;
QString sn = m_syncWidget->syncnet->currentText();
parseNet(sn,auth_peer,auth_peer_bits);
//this is the *selected* (active) net range
pcfg->writeEntry("auth_peer",auth_peer);
pcfg->writeEntry("auth_peer_bits",auth_peer_bits);
//write back all other net ranges in *cleartext*
for (int i=0; i<10; i++) {
QString target;
target.sprintf("net%d", i);
if ( i < m_syncWidget->syncnet->count() )
pcfg->writeEntry(target, m_syncWidget->syncnet->text(i));
else // no more entry in the syncnet list -> we clear the line
pcfg->writeEntry(target, "");
}
@@ -558,49 +577,49 @@ void MultiauthConfig::loadPlugins() {
for( stringit = m_allPlugins.begin(); stringit != m_allPlugins.end(); ++stringit ) {
tempPlugin = ( sortList.find( *stringit ) ).data();
if ( !( (tempPlugin.name).isEmpty() ) ) {
pluginList.append( tempPlugin );
}
}
}
}
void MultiauthConfig::deleteListEntry()
{
m_syncWidget->syncnet->removeItem(m_syncWidget->syncnet->currentItem());
}
void MultiauthConfig::restoreDefaults()
{
QMessageBox unrecbox(
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();
}
m_syncWidget->syncModeCombo->setCurrentItem( 2 );
}
void MultiauthConfig::insertDefaultRanges()
{
m_syncWidget->syncnet->insertItem( "192.168.129.0/24" );
m_syncWidget->syncnet->insertItem( "192.168.1.0/24" );
m_syncWidget->syncnet->insertItem( "192.168.0.0/16" );
m_syncWidget->syncnet->insertItem( "172.16.0.0/12" );
m_syncWidget->syncnet->insertItem( "10.0.0.0/8" );
m_syncWidget->syncnet->insertItem( "1.0.0.0/8" );
m_syncWidget->syncnet->insertItem( tr( "Any" ) );
m_syncWidget->syncnet->insertItem( tr( "None" ) );
}
void MultiauthConfig::updateGUI()
{
m_loginWidget->autologinToggle->setChecked(autoLogin);
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
@@ -36,110 +36,116 @@
#include <opie2/multiauthplugininterface.h>
#include <opie2/multiauthcommon.h>
/* OPIE */
#include <opie2/otabwidget.h>
/* QT */
#include <qdialog.h>
#include <qwidget.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qpe/config.h>
#include <qlistview.h>
#include <qmap.h>
#include <qcombobox.h>
#include <qpushbutton.h>
#include <qmessagebox.h>
#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;
/// plugin list page
QWidget *m_pluginListWidget;
/// misc config page
MultiauthGeneralConfig *m_generalConfig;
/// login (root / ...) choice page
LoginBase *m_loginWidget;
/// synchronization settings page
SyncBase *m_syncWidget;
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;
void updateGUI();
static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits);
void selectNet(int auth_peer,int auth_peer_bits,bool update);
bool autoLogin;
QString autoLoginName;
};
#endif // MULTIAUTHCONFIG_H
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
@@ -1,80 +1,87 @@
#include "multiauthmainwindow.h"
#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;
- Config *pcfg = new Config("Security");
- pcfg->setGroup("Misc");
- explanScreens = pcfg->readBoolEntry("explanScreens", true);
- allowBypass = pcfg->readBoolEntry("allowBypass", false);
- delete pcfg;
+ if (allowBypass == true)
+ explanScreens = true;
+ else
+ {
+ Config *pcfg = new Config("Security");
+ pcfg->setGroup("Misc");
+ explanScreens = pcfg->readBoolEntry("explanScreens", true);
+ delete pcfg;
+ }
layout = new QVBoxLayout(this);
layout->setSpacing(11);
layout->setMargin(11);
layout->setAlignment( Qt::AlignTop );
// if explanScreens is false, we don't show any text in the QDialog,
// and we proceed directly
if ( explanScreens == true )
{
title = new QLabel("<center><h1>" + tr("Welcome to Opie Multi-authentication Framework") + "</h1></center>", this);
message = new QLabel("<center><h3>" + tr("Launching authentication plugins...") + "</h3></center>", this);
} else {
title = new QLabel("", this);
message = new QLabel("", this);
}
layout->addWidget(title);
layout->addWidget(message);
proceedButton = new QPushButton(tr("Proceed..."), this);
layout->addWidget(proceedButton, 0, Qt::AlignHCenter);
QObject::connect(proceedButton, SIGNAL(clicked()), this, SLOT(proceed()));
if ( explanScreens == true )
{
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();
}
}
else
{
// we will need this button only if runPlugins() fails in proceed()
proceedButton->hide();
// let's proceed now
proceed();
}
}
/// nothing to do
MultiauthMainWindow::~MultiauthMainWindow() {
}
/// launch the authentication
void MultiauthMainWindow::proceed() {
@@ -93,43 +100,45 @@ void MultiauthMainWindow::proceed() {
}
else
{
proceedButton->setText("Another try?");
QString resultMessage;
if (result == 0)
{
// authentication has succeeded, adapt interface then
message->setText( "<center><h3>" + tr("Congratulations! Your authentication has been successful.") + "</h3></center>" );
quit->setText("Enter Opie");
if ( quit->isHidden() )
{
// that means we don't allow to bypass, but now we can show and connect this button
QObject::connect(quit, SIGNAL(clicked()), this, SLOT(close()));
quit->show();
} else {
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
* (through this function) authentication has already been succeeded..
* \todo try to avoid this hack?
*/
bool MultiauthMainWindow::isAlreadyDone() {
return alreadyDone;
}
}
}
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
@@ -34,49 +34,49 @@
*/
#ifndef MULTIAUTHMAINWINDOW_H
#define MULTIAUTHMAINWINDOW_H
#include <qdialog.h>
#include <qlayout.h>
#include <qpushbutton.h>
#include <qlabel.h>
namespace Opie {
namespace Security {
/// Multiauth main window
/**
* This QDialog window displays some information and an exit button,
* and completely hides the desktop, preventing user interactions
* with it.
*/
class MultiauthMainWindow : public QDialog {
Q_OBJECT
public:
- MultiauthMainWindow();
+ MultiauthMainWindow(bool allowBypass = false);
~MultiauthMainWindow();
bool isAlreadyDone();
private:
QVBoxLayout * layout;
QLabel * title, * message, * message2;
QPushButton * proceedButton, * quit;
/// whether to show explanatory screens before and after the authentication plugins
bool explanScreens;
/// allow to bypass authnentication via 'exit' buttons on both explan. screens
bool allowBypass;
/// true when the authentication has been done successfully
bool alreadyDone;
private slots:
void proceed();
private:
struct Private;
Private *d;
};
}
}