author | clem <clem> | 2004-10-08 22:50:28 (UTC) |
---|---|---|
committer | clem <clem> | 2004-10-08 22:50:28 (UTC) |
commit | 2f29d0ec4bb2355f193d744c890add203bd6f2b2 (patch) (unidiff) | |
tree | a703b00b673b9be036415393b53d9c95a5bb87cd /core | |
parent | dec031cc21181d70e0c806bcf6c228044f7df90b (diff) | |
download | opie-2f29d0ec4bb2355f193d744c890add203bd6f2b2.zip opie-2f29d0ec4bb2355f193d744c890add203bd6f2b2.tar.gz opie-2f29d0ec4bb2355f193d744c890add203bd6f2b2.tar.bz2 |
Big commit thanks to a little feature request :-) We now have an O-menu applet
to lock the PDA immediately, and the internal way to ask for an authentication
(on resume, on start up, on demand or for a simple test) is much cleaner:
it's through MultiauthPassword(int lockMode) (instead of the old bool at_poweron)
-rw-r--r-- | core/applets/lockapplet/.cvsignore | 4 | ||||
-rw-r--r-- | core/applets/lockapplet/config.in | 4 | ||||
-rw-r--r-- | core/applets/lockapplet/lock.cpp | 84 | ||||
-rw-r--r-- | core/applets/lockapplet/lock.h | 36 | ||||
-rw-r--r-- | core/applets/lockapplet/lockapplet.pro | 12 | ||||
-rw-r--r-- | core/applets/lockapplet/opie-lockapplet.control | 11 | ||||
-rw-r--r-- | core/launcher/serverapp.cpp | 3 | ||||
-rw-r--r-- | core/settings/security/demo/main.cpp | 2 | ||||
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 20 |
9 files changed, 157 insertions, 19 deletions
diff --git a/core/applets/lockapplet/.cvsignore b/core/applets/lockapplet/.cvsignore new file mode 100644 index 0000000..5e2908c --- a/dev/null +++ b/core/applets/lockapplet/.cvsignore | |||
@@ -0,0 +1,4 @@ | |||
1 | Makefile* | ||
2 | .moc | ||
3 | .obj | ||
4 | |||
diff --git a/core/applets/lockapplet/config.in b/core/applets/lockapplet/config.in new file mode 100644 index 0000000..ddc3522 --- a/dev/null +++ b/core/applets/lockapplet/config.in | |||
@@ -0,0 +1,4 @@ | |||
1 | config LOCKAPPLET | ||
2 | boolean "opie-lockapplet (button in the Opie menu to lock the PDA)" | ||
3 | default "y" | ||
4 | depends ( LIBQPE || LIBQPE-X11 ) && SECURITY | ||
diff --git a/core/applets/lockapplet/lock.cpp b/core/applets/lockapplet/lock.cpp new file mode 100644 index 0000000..89f27bb --- a/dev/null +++ b/core/applets/lockapplet/lock.cpp | |||
@@ -0,0 +1,84 @@ | |||
1 | #include "lock.h" | ||
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/multiauthpassword.h> | ||
5 | |||
6 | #include <qpe/applnk.h> | ||
7 | #include <qpe/resource.h> | ||
8 | |||
9 | /* QT */ | ||
10 | #include <qiconset.h> | ||
11 | #include <qpopupmenu.h> | ||
12 | #include <qmessagebox.h> | ||
13 | |||
14 | |||
15 | LockMenuApplet::LockMenuApplet() | ||
16 | :QObject( 0, "LockMenuApplet" ) | ||
17 | { | ||
18 | } | ||
19 | |||
20 | LockMenuApplet::~LockMenuApplet ( ) | ||
21 | {} | ||
22 | |||
23 | int LockMenuApplet::position() const | ||
24 | { | ||
25 | return 3; | ||
26 | } | ||
27 | |||
28 | QString LockMenuApplet::name() const | ||
29 | { | ||
30 | return tr( "Lock shortcut" ); | ||
31 | } | ||
32 | |||
33 | QString LockMenuApplet::text() const | ||
34 | { | ||
35 | return tr( "Lock" ); | ||
36 | } | ||
37 | |||
38 | |||
39 | QIconSet LockMenuApplet::icon() const | ||
40 | { | ||
41 | QPixmap pix; | ||
42 | QImage img = Resource::loadImage( "security/lock" ); | ||
43 | if ( !img.isNull() ) | ||
44 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
45 | return pix; | ||
46 | } | ||
47 | |||
48 | QPopupMenu* LockMenuApplet::popup(QWidget*) const | ||
49 | { | ||
50 | /* no subdir */ | ||
51 | return 0; | ||
52 | } | ||
53 | |||
54 | void LockMenuApplet::activated() | ||
55 | { | ||
56 | /* | ||
57 | QMessageBox::information(0,tr("No white rabbit found"), | ||
58 | tr("<qt>No white rabbit was seen near Opie." | ||
59 | "Only the beautiful OpieZilla is available" | ||
60 | "for your pleassure</qt>")); | ||
61 | */ | ||
62 | Opie::Security::MultiauthPassword::authenticate(Opie::Security::LockNow); | ||
63 | } | ||
64 | |||
65 | |||
66 | QRESULT LockMenuApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
67 | { | ||
68 | *iface = 0; | ||
69 | if ( uuid == IID_QUnknown ) | ||
70 | *iface = this; | ||
71 | else if ( uuid == IID_MenuApplet ) | ||
72 | *iface = this; | ||
73 | else | ||
74 | return QS_FALSE; | ||
75 | |||
76 | if ( *iface ) | ||
77 | (*iface)->addRef(); | ||
78 | return QS_OK; | ||
79 | } | ||
80 | |||
81 | Q_EXPORT_INTERFACE() | ||
82 | { | ||
83 | Q_CREATE_INSTANCE( LockMenuApplet ) | ||
84 | } | ||
diff --git a/core/applets/lockapplet/lock.h b/core/applets/lockapplet/lock.h new file mode 100644 index 0000000..ff94bce --- a/dev/null +++ b/core/applets/lockapplet/lock.h | |||
@@ -0,0 +1,36 @@ | |||
1 | /** | ||
2 | * \file lock.h | ||
3 | * \brief defines a lock button that goes in the 'O' Opie menu | ||
4 | * It's based on the examples/menuapplet code of 2004/10/06. | ||
5 | */ | ||
6 | #ifndef CORE_SETTINGS_SECURITY_LOCKAPPLET_LOCK_H | ||
7 | #define CORE_SETTINGS_SECURITY_LOCKAPPLET_LOCK_H | ||
8 | |||
9 | #include <qpe/menuappletinterface.h> | ||
10 | #include <qobject.h> | ||
11 | |||
12 | class LockMenuApplet: public QObject, public MenuAppletInterface | ||
13 | { | ||
14 | |||
15 | Q_OBJECT | ||
16 | |||
17 | public: | ||
18 | LockMenuApplet ( ); | ||
19 | virtual ~LockMenuApplet ( ); | ||
20 | |||
21 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
22 | Q_REFCOUNT | ||
23 | |||
24 | virtual int position() const; | ||
25 | |||
26 | virtual QString name ( ) const; | ||
27 | virtual QIconSet icon ( ) const; | ||
28 | virtual QString text ( ) const; | ||
29 | /* virtual QString tr( const char* ) const; | ||
30 | virtual QString tr( const char*, const char* ) const; | ||
31 | */ | ||
32 | virtual QPopupMenu *popup ( QWidget *parent ) const; | ||
33 | virtual void activated ( ); | ||
34 | }; | ||
35 | |||
36 | #endif | ||
diff --git a/core/applets/lockapplet/lockapplet.pro b/core/applets/lockapplet/lockapplet.pro new file mode 100644 index 0000000..e0ee780 --- a/dev/null +++ b/core/applets/lockapplet/lockapplet.pro | |||
@@ -0,0 +1,12 @@ | |||
1 | TEMPLATE = lib | ||
2 | CONFIG += qt plugn warn_on | ||
3 | HEADERS = lock.h | ||
4 | SOURCES = lock.cpp | ||
5 | TARGET = lockapplet | ||
6 | DESTDIR = $(OPIEDIR)/plugins/applets | ||
7 | INCLUDEPATH += $(OPIEDIR)/include | ||
8 | DEPENDPATH += $(OPIEDIR)/include | ||
9 | LIBS += -lqpe | ||
10 | VERSION = 1.0.0 | ||
11 | |||
12 | include ( $(OPIEDIR)/include.pro ) | ||
diff --git a/core/applets/lockapplet/opie-lockapplet.control b/core/applets/lockapplet/opie-lockapplet.control new file mode 100644 index 0000000..e175a3e --- a/dev/null +++ b/core/applets/lockapplet/opie-lockapplet.control | |||
@@ -0,0 +1,11 @@ | |||
1 | Package: opie-lockapplet | ||
2 | Files: plugins/applets/liblockapplet.so* | ||
3 | Priority: optional | ||
4 | Section: opie/applets | ||
5 | Maintainer: Opie Team <opie@handhelds.org> | ||
6 | Architecture: arm | ||
7 | Depends: task-opie-minimal, opie-security | ||
8 | Description: Lock Opie now | ||
9 | Button to lock Opie (as configured in the Security | ||
10 | settings) on demand. | ||
11 | Version: $QPE_VERSION$EXTRAVERSION | ||
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index dc1f2c7..e541d10 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -465,97 +465,98 @@ void ServerApplication::systemMessage( const QCString& msg, | |||
465 | } | 465 | } |
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | void ServerApplication::reloadPowerWarnSettings ( ) | 469 | void ServerApplication::reloadPowerWarnSettings ( ) |
470 | { | 470 | { |
471 | Config cfg ( "apm" ); | 471 | Config cfg ( "apm" ); |
472 | cfg. setGroup ( "Warnings" ); | 472 | cfg. setGroup ( "Warnings" ); |
473 | 473 | ||
474 | int iv = cfg. readNumEntry ( "checkinterval", 10000 ); | 474 | int iv = cfg. readNumEntry ( "checkinterval", 10000 ); |
475 | 475 | ||
476 | m_apm_timer-> stop ( ); | 476 | m_apm_timer-> stop ( ); |
477 | if ( iv ) | 477 | if ( iv ) |
478 | m_apm_timer-> start ( iv ); | 478 | m_apm_timer-> start ( iv ); |
479 | 479 | ||
480 | m_powerVeryLow = cfg. readNumEntry ( "powerverylow", 10 ); | 480 | m_powerVeryLow = cfg. readNumEntry ( "powerverylow", 10 ); |
481 | m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 ); | 481 | m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 ); |
482 | } | 482 | } |
483 | 483 | ||
484 | void ServerApplication::launcherMessage( const QCString & msg, const QByteArray & data ) | 484 | void ServerApplication::launcherMessage( const QCString & msg, const QByteArray & data ) |
485 | { | 485 | { |
486 | QDataStream stream ( data, IO_ReadOnly ); | 486 | QDataStream stream ( data, IO_ReadOnly ); |
487 | 487 | ||
488 | if ( msg == "deviceButton(int,int,int)" ) { | 488 | if ( msg == "deviceButton(int,int,int)" ) { |
489 | int keycode, press, autoRepeat; | 489 | int keycode, press, autoRepeat; |
490 | stream >> keycode >> press >> autoRepeat; | 490 | stream >> keycode >> press >> autoRepeat; |
491 | 491 | ||
492 | kf->checkButtonAction ( true, keycode, press, autoRepeat ); | 492 | kf->checkButtonAction ( true, keycode, press, autoRepeat ); |
493 | } | 493 | } |
494 | else if ( msg == "keyRegister(int,QCString,QCString)" ) { | 494 | else if ( msg == "keyRegister(int,QCString,QCString)" ) { |
495 | int k; | 495 | int k; |
496 | QCString c, m; | 496 | QCString c, m; |
497 | stream >> k >> c >> m; | 497 | stream >> k >> c >> m; |
498 | 498 | ||
499 | kf -> registerKey( QCopKeyRegister(k, c, m) ); | 499 | kf -> registerKey( QCopKeyRegister(k, c, m) ); |
500 | } | 500 | } |
501 | } | 501 | } |
502 | 502 | ||
503 | 503 | ||
504 | bool ServerApplication::screenLocked() | 504 | bool ServerApplication::screenLocked() |
505 | { | 505 | { |
506 | return loggedin == 0; | 506 | return loggedin == 0; |
507 | } | 507 | } |
508 | 508 | ||
509 | void ServerApplication::login(bool at_poweron) | 509 | void ServerApplication::login(bool at_poweron) |
510 | { | 510 | { |
511 | if ( !loggedin ) { | 511 | if ( !loggedin ) { |
512 | Global::terminateBuiltin("calibrate"); // No tr | 512 | Global::terminateBuiltin("calibrate"); // No tr |
513 | Opie::Security::MultiauthPassword::authenticate(at_poweron); | 513 | int lockMode = at_poweron ? Opie::Security::IfPowerOn : Opie::Security::IfResume; |
514 | Opie::Security::MultiauthPassword::authenticate(lockMode); | ||
514 | loggedin=1; | 515 | loggedin=1; |
515 | #ifndef QT_NO_COP | 516 | #ifndef QT_NO_COP |
516 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 517 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
517 | #endif | 518 | #endif |
518 | } | 519 | } |
519 | } | 520 | } |
520 | 521 | ||
521 | #if defined(QPE_HAVE_TOGGLELIGHT) | 522 | #if defined(QPE_HAVE_TOGGLELIGHT) |
522 | #include <qtopia/config.h> | 523 | #include <qtopia/config.h> |
523 | 524 | ||
524 | #include <sys/ioctl.h> | 525 | #include <sys/ioctl.h> |
525 | #include <sys/types.h> | 526 | #include <sys/types.h> |
526 | #include <fcntl.h> | 527 | #include <fcntl.h> |
527 | #include <unistd.h> | 528 | #include <unistd.h> |
528 | #include <errno.h> | 529 | #include <errno.h> |
529 | #include <linux/ioctl.h> | 530 | #include <linux/ioctl.h> |
530 | #include <time.h> | 531 | #include <time.h> |
531 | #endif | 532 | #endif |
532 | 533 | ||
533 | namespace { | 534 | namespace { |
534 | void execAutoStart(const QDateTime& suspendTime ) { | 535 | void execAutoStart(const QDateTime& suspendTime ) { |
535 | QString appName; | 536 | QString appName; |
536 | int delay; | 537 | int delay; |
537 | QDateTime now = QDateTime::currentDateTime(); | 538 | QDateTime now = QDateTime::currentDateTime(); |
538 | 539 | ||
539 | Config cfg( "autostart" ); | 540 | Config cfg( "autostart" ); |
540 | cfg.setGroup( "AutoStart" ); | 541 | cfg.setGroup( "AutoStart" ); |
541 | appName = cfg.readEntry( "Apps", "" ); | 542 | appName = cfg.readEntry( "Apps", "" ); |
542 | delay = cfg.readNumEntry( "Delay", 0 ); | 543 | delay = cfg.readNumEntry( "Delay", 0 ); |
543 | 544 | ||
544 | // If the time between suspend and resume was longer then the | 545 | // If the time between suspend and resume was longer then the |
545 | // value saved as delay, start the app | 546 | // value saved as delay, start the app |
546 | if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { | 547 | if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { |
547 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 548 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
548 | e << QString( appName ); | 549 | e << QString( appName ); |
549 | } | 550 | } |
550 | } | 551 | } |
551 | } | 552 | } |
552 | 553 | ||
553 | 554 | ||
554 | void ServerApplication::togglePower() | 555 | void ServerApplication::togglePower() |
555 | { | 556 | { |
556 | static bool excllock = false; | 557 | static bool excllock = false; |
557 | 558 | ||
558 | if ( excllock ) | 559 | if ( excllock ) |
559 | return ; | 560 | return ; |
560 | 561 | ||
561 | excllock = true; | 562 | excllock = true; |
diff --git a/core/settings/security/demo/main.cpp b/core/settings/security/demo/main.cpp index 1c49f57..82f940d 100644 --- a/core/settings/security/demo/main.cpp +++ b/core/settings/security/demo/main.cpp | |||
@@ -1,12 +1,12 @@ | |||
1 | #include <opie2/multiauthpassword.h> | 1 | #include <opie2/multiauthpassword.h> |
2 | 2 | ||
3 | #include <opie2/oapplication.h> | 3 | #include <opie2/oapplication.h> |
4 | 4 | ||
5 | /// Run an authentication sequence using the global opie-security settings | 5 | /// Run an authentication sequence using the global opie-security settings |
6 | int main( int argc, char ** argv ) | 6 | int main( int argc, char ** argv ) |
7 | { | 7 | { |
8 | Opie::Core::OApplication app(argc, argv, "Multi-authentication demo"); | 8 | Opie::Core::OApplication app(argc, argv, "Multi-authentication demo"); |
9 | 9 | ||
10 | // Run the authentication process until it succeeds | 10 | // Run the authentication process until it succeeds |
11 | Opie::Security::MultiauthPassword::authenticate(); | 11 | Opie::Security::MultiauthPassword::authenticate(Opie::Security::LockNow); |
12 | } | 12 | } |
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp index 192b8ca..9d5c032 100644 --- a/core/settings/security/multiauthconfig.cpp +++ b/core/settings/security/multiauthconfig.cpp | |||
@@ -1,50 +1,50 @@ | |||
1 | #include <opie2/odebug.h> | 1 | #include <opie2/odebug.h> |
2 | #include <opie2/multiauthmainwindow.h> | 2 | #include <opie2/multiauthpassword.h> |
3 | 3 | ||
4 | #include <qgroupbox.h> | 4 | #include <qgroupbox.h> |
5 | #include <qvgroupbox.h> | 5 | #include <qvgroupbox.h> |
6 | #include <qpe/resource.h> | 6 | #include <qpe/resource.h> |
7 | #include <qlayout.h> | 7 | #include <qlayout.h> |
8 | #include <qlabel.h> | 8 | #include <qlabel.h> |
9 | #include <qhbox.h> | 9 | #include <qhbox.h> |
10 | #include <qheader.h> | 10 | #include <qheader.h> |
11 | #include <qvbox.h> | 11 | #include <qvbox.h> |
12 | #include <qwhatsthis.h> | 12 | #include <qwhatsthis.h> |
13 | #include <qtoolbutton.h> | 13 | #include <qtoolbutton.h> |
14 | #include <qstringlist.h> | 14 | #include <qstringlist.h> |
15 | #include <qdir.h> | 15 | #include <qdir.h> |
16 | #include <qpe/qlibrary.h> | 16 | #include <qpe/qlibrary.h> |
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | 18 | ||
19 | #include "multiauthconfig.h" | 19 | #include "multiauthconfig.h" |
20 | 20 | ||
21 | 21 | ||
22 | using Opie::Security::MultiauthPluginInterface; | 22 | using Opie::Security::MultiauthPluginInterface; |
23 | using Opie::Security::MultiauthPluginObject; | 23 | using Opie::Security::MultiauthPluginObject; |
24 | using Opie::Security::MultiauthConfigWidget; | 24 | using Opie::Security::MultiauthConfigWidget; |
25 | /// keeps information about MultiauthPluginObject plugins | 25 | /// keeps information about MultiauthPluginObject plugins |
26 | struct MultiauthPlugin { | 26 | struct MultiauthPlugin { |
27 | MultiauthPlugin() : library( 0 ), iface( 0 ), pluginObject( 0 ) {} | 27 | MultiauthPlugin() : library( 0 ), iface( 0 ), pluginObject( 0 ) {} |
28 | /// plugin file | 28 | /// plugin file |
29 | QLibrary *library; | 29 | QLibrary *library; |
30 | /// the plugin object interface | 30 | /// the plugin object interface |
31 | QInterfacePtr<MultiauthPluginInterface> iface; | 31 | QInterfacePtr<MultiauthPluginInterface> iface; |
32 | /// the plugin object itself | 32 | /// the plugin object itself |
33 | MultiauthPluginObject *pluginObject; | 33 | MultiauthPluginObject *pluginObject; |
34 | /// name of the plugin file | 34 | /// name of the plugin file |
35 | QString name; | 35 | QString name; |
36 | /// should the plugin be launched during authentication or not | 36 | /// should the plugin be launched during authentication or not |
37 | bool active; | 37 | bool active; |
38 | /// order of the plugin, in the pluginListWidget and during authentication | 38 | /// order of the plugin, in the pluginListWidget and during authentication |
39 | int pos; | 39 | int pos; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | /// list of available MultiauthPlugin objects | 42 | /// list of available MultiauthPlugin objects |
43 | static QValueList<MultiauthPlugin> pluginList; | 43 | static QValueList<MultiauthPlugin> pluginList; |
44 | 44 | ||
45 | 45 | ||
46 | /// extension of QToolButton that adds signals, icons and stuff (taken from todayconfig.cpp) | 46 | /// extension of QToolButton that adds signals, icons and stuff (taken from todayconfig.cpp) |
47 | class ToolButton : public QToolButton { | 47 | class ToolButton : public QToolButton { |
48 | 48 | ||
49 | public: | 49 | public: |
50 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) | 50 | ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) |
@@ -76,112 +76,98 @@ class ToolButton : public QToolButton { | |||
76 | boxLayout->addWidget(m_onResume, 0, 1); | 76 | boxLayout->addWidget(m_onResume, 0, 1); |
77 | 77 | ||
78 | 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"); |
79 | vb->addWidget(nbBox); | 79 | vb->addWidget(nbBox); |
80 | QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() ); | 80 | QGridLayout *nbBoxLayout = new QGridLayout( nbBox->layout() ); |
81 | m_nbSuccessMin = new QSpinBox(nbBox); | 81 | m_nbSuccessMin = new QSpinBox(nbBox); |
82 | QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox); | 82 | QLabel *lNbSuccessMin = new QLabel( tr( "Required successes" ), nbBox); |
83 | nbBoxLayout->addWidget(m_nbSuccessMin, 0, 0); | 83 | nbBoxLayout->addWidget(m_nbSuccessMin, 0, 0); |
84 | nbBoxLayout->addWidget(lNbSuccessMin, 0, 1); | 84 | nbBoxLayout->addWidget(lNbSuccessMin, 0, 1); |
85 | m_nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor | 85 | m_nbSuccessMin->setMinValue(1); // the max value is defined in MultiauthConfig constructor |
86 | 86 | ||
87 | QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Options"), this, "dev box"); | 87 | QGroupBox *devBox = new QGroupBox(0, Qt::Vertical, tr("Options"), this, "dev box"); |
88 | vb->addWidget(devBox); | 88 | vb->addWidget(devBox); |
89 | QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() ); | 89 | QGridLayout *devBoxLayout = new QGridLayout( devBox->layout() ); |
90 | m_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"); |
91 | m_explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens"); | 91 | m_explanScreens = new QCheckBox( tr("Show explanatory screens"), devBox, "Show explan. screens"); |
92 | devBoxLayout->addWidget(m_noProtectConfig, 0, 0); | 92 | devBoxLayout->addWidget(m_noProtectConfig, 0, 0); |
93 | devBoxLayout->addWidget(m_explanScreens, 1, 0); | 93 | devBoxLayout->addWidget(m_explanScreens, 1, 0); |
94 | 94 | ||
95 | QVGroupBox *tryBox = new QVGroupBox(tr("Testing"), this, "try box"); | 95 | QVGroupBox *tryBox = new QVGroupBox(tr("Testing"), this, "try box"); |
96 | vb->addWidget(tryBox); | 96 | vb->addWidget(tryBox); |
97 | m_tryButton = new QPushButton( tr("Test the authentication now"), tryBox, "try button"); | 97 | m_tryButton = new QPushButton( tr("Test the authentication now"), tryBox, "try button"); |
98 | connect( m_tryButton, SIGNAL(clicked()), this, SLOT(tryAuth()) ); | 98 | connect( m_tryButton, SIGNAL(clicked()), this, SLOT(tryAuth()) ); |
99 | 99 | ||
100 | } | 100 | } |
101 | 101 | ||
102 | /// nothing to do | 102 | /// nothing to do |
103 | MultiauthGeneralConfig::~MultiauthGeneralConfig() | 103 | MultiauthGeneralConfig::~MultiauthGeneralConfig() |
104 | {} | 104 | {} |
105 | 105 | ||
106 | /// launches the authentication process, as configured, with the option to bypass it | 106 | /// launches the authentication process, as configured, with the option to bypass it |
107 | void MultiauthGeneralConfig::tryAuth() | 107 | void MultiauthGeneralConfig::tryAuth() |
108 | { | 108 | { |
109 | QMessageBox confirmSave( | 109 | QMessageBox confirmSave( |
110 | tr("Attention"), | 110 | tr("Attention"), |
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>" + | 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>" + |
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>", | 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>", |
113 | QMessageBox::Warning, | 113 | QMessageBox::Warning, |
114 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, | 114 | QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, |
115 | 0, QString::null, TRUE, WStyle_StaysOnTop); | 115 | 0, QString::null, TRUE, WStyle_StaysOnTop); |
116 | confirmSave.setButtonText(QMessageBox::Cancel, tr("Cancel")); | 116 | confirmSave.setButtonText(QMessageBox::Cancel, tr("Cancel")); |
117 | confirmSave.setButtonText(QMessageBox::Yes, tr("OK")); | 117 | confirmSave.setButtonText(QMessageBox::Yes, tr("OK")); |
118 | 118 | ||
119 | if ( confirmSave.exec() == QMessageBox::Yes) | 119 | if ( confirmSave.exec() == QMessageBox::Yes) |
120 | { | 120 | { |
121 | owarn << "writing config as user accepted" << oendl; | 121 | owarn << "writing config as user accepted" << oendl; |
122 | m_parentConfig->writeConfigs(); | 122 | m_parentConfig->writeConfigs(); |
123 | owarn << "testing authentication" << oendl; | 123 | owarn << "testing authentication" << oendl; |
124 | 124 | // launch the authentication in testing mode | |
125 | /* launch the authentication in debug, aka "allowBypass == true", mode | 125 | Opie::Security::MultiauthPassword::authenticate(Opie::Security::TestNow); |
126 | */ | ||
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() ); | ||
132 | |||
133 | // the authentication has already succeeded (without win interactions) | ||
134 | if ( win.isAlreadyDone() ) | ||
135 | return; | ||
136 | |||
137 | win.exec(); | ||
138 | |||
139 | } | ||
140 | 126 | ||
141 | } | 127 | } |
142 | 128 | ||
143 | 129 | ||
144 | /// Builds and displays the Opie multi-authentication configuration dialog | 130 | /// Builds and displays the Opie multi-authentication configuration dialog |
145 | static void test_and_start() { | 131 | static void test_and_start() { |
146 | Config pcfg("Security"); | 132 | Config pcfg("Security"); |
147 | pcfg.setGroup( "Misc" ); | 133 | pcfg.setGroup( "Misc" ); |
148 | bool protectConfigDialog = ! pcfg.readBoolEntry("noProtectConfig", true); | 134 | bool protectConfigDialog = ! pcfg.readBoolEntry("noProtectConfig", true); |
149 | 135 | ||
150 | if (protectConfigDialog && Opie::Security::Internal::runPlugins() != 0) { | 136 | if (protectConfigDialog && Opie::Security::Internal::runPlugins() != 0) { |
151 | owarn << "authentication failed, not showing opie-security" << oendl; | 137 | owarn << "authentication failed, not showing opie-security" << oendl; |
152 | exit( -1 ); | 138 | exit( -1 ); |
153 | } | 139 | } |
154 | } | 140 | } |
155 | 141 | ||
156 | 142 | ||
157 | 143 | ||
158 | MultiauthConfig::MultiauthConfig(QWidget* par, const char* w = "MultiauthConfig dialog", WFlags f = 0) | 144 | MultiauthConfig::MultiauthConfig(QWidget* par, const char* w = "MultiauthConfig dialog", WFlags f = 0) |
159 | : QDialog(par, w, TRUE, f), | 145 | : QDialog(par, w, TRUE, f), |
160 | m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0), | 146 | m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0), |
161 | m_generalConfig(0), m_loginWidget(0), m_syncWidget(0), | 147 | m_generalConfig(0), m_loginWidget(0), m_syncWidget(0), |
162 | m_nbSuccessReq(0), m_plugins_changed(false) | 148 | m_nbSuccessReq(0), m_plugins_changed(false) |
163 | { | 149 | { |
164 | /* Initializes the global configuration window | 150 | /* Initializes the global configuration window |
165 | */ | 151 | */ |
166 | test_and_start(); | 152 | test_and_start(); |
167 | 153 | ||
168 | /* Checks (and memorizes) if any authentication plugins are | 154 | /* Checks (and memorizes) if any authentication plugins are |
169 | * installed on the system | 155 | * installed on the system |
170 | */ | 156 | */ |
171 | QString path = QPEApplication::qpeDir() + "/plugins/security"; | 157 | QString path = QPEApplication::qpeDir() + "/plugins/security"; |
172 | QDir dir( path, "lib*.so" ); | 158 | QDir dir( path, "lib*.so" ); |
173 | QStringList list = dir.entryList(); | 159 | QStringList list = dir.entryList(); |
174 | 160 | ||
175 | m_pluginsInstalled = ! list.isEmpty(); | 161 | m_pluginsInstalled = ! list.isEmpty(); |
176 | if (m_pluginsInstalled == false) | 162 | if (m_pluginsInstalled == false) |
177 | owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl; | 163 | owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl; |
178 | 164 | ||
179 | setCaption( tr( "Security configuration" ) ); | 165 | setCaption( tr( "Security configuration" ) ); |
180 | QVBoxLayout *layout = new QVBoxLayout( this ); | 166 | QVBoxLayout *layout = new QVBoxLayout( this ); |
181 | m_mainTW = new Opie::Ui::OTabWidget( this, "main tab widget" ); | 167 | m_mainTW = new Opie::Ui::OTabWidget( this, "main tab widget" ); |
182 | layout->addWidget(m_mainTW); | 168 | layout->addWidget(m_mainTW); |
183 | 169 | ||
184 | if (m_pluginsInstalled) | 170 | if (m_pluginsInstalled) |
185 | { | 171 | { |
186 | m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget"); | 172 | m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget"); |
187 | QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget); | 173 | QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget); |