20 files changed, 47 insertions, 23 deletions
diff --git a/noncore/securityplugins/blueping/bluepingplugin.cpp b/noncore/securityplugins/blueping/bluepingplugin.cpp index af0448b..f4c5e95 100644 --- a/noncore/securityplugins/blueping/bluepingplugin.cpp +++ b/noncore/securityplugins/blueping/bluepingplugin.cpp @@ -1,30 +1,33 @@ #include "bluepingplugin.h" #include <opie2/oapplication.h> #include <opie2/odebug.h> #include <opie2/odevice.h> #include <qdialog.h> #include <qlayout.h> #include <qhbox.h> #include <qlabel.h> #include <qpushbutton.h> #include <qtimer.h> using namespace Opie::Core; +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthConfigWidget; + /// creates and initializes the m_config Config object BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0) { m_config = new Config("Security"); m_config->setGroup("BluepingPlugin"); bluetoothAlreadyRestarted = false; } /// deletes the m_config Config object and noticeW if necessary BluepingPlugin::~BluepingPlugin() { delete m_config; if (m_ping != 0) delete m_ping; } /// Simply return its name (Blueping plugin) diff --git a/noncore/securityplugins/blueping/bluepingplugin.h b/noncore/securityplugins/blueping/bluepingplugin.h index c122471..0df3f78 100644 --- a/noncore/securityplugins/blueping/bluepingplugin.h +++ b/noncore/securityplugins/blueping/bluepingplugin.h @@ -33,41 +33,41 @@ #ifndef BLUEPING_PLUGIN_H #define BLUEPING_PLUGIN_H #include <opie2/multiauthplugininterface.h> #include <opie2/oprocess.h> #include <qobject.h> #include <qstring.h> #include <qpe/config.h> /// Multi-authentication bluetooth plugin, which tries to ping a specific MAC address. /** * The plugin itself, implementing the main authenticate() function. */ -class BluepingPlugin : public QObject, public MultiauthPluginObject { +class BluepingPlugin : public QObject, public Opie::Security::MultiauthPluginObject { Q_OBJECT public: BluepingPlugin(); virtual ~BluepingPlugin(); int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; QString pixmapNameWidget() const; QString pluginName() const; signals: /// Signal carrying the result code of this plugin void emitCode(int resultCode); private slots: void success(); void failure(); void skip(); void ping(); void pingFinished(Opie::Core::OProcess * ping); private: diff --git a/noncore/securityplugins/blueping/bluepingpluginimpl.cpp b/noncore/securityplugins/blueping/bluepingpluginimpl.cpp index f7b1bfc..dbca91f 100644 --- a/noncore/securityplugins/blueping/bluepingpluginimpl.cpp +++ b/noncore/securityplugins/blueping/bluepingpluginimpl.cpp @@ -1,18 +1,21 @@ #include "bluepingpluginimpl.h" +using Opie::Security::MultiauthPluginInterface; +using Opie::Security::MultiauthPluginObject; + BluepingPluginImpl::BluepingPluginImpl() { bluepingPlugin = new BluepingPlugin(); } BluepingPluginImpl::~BluepingPluginImpl() { delete bluepingPlugin; } MultiauthPluginObject* BluepingPluginImpl::plugin() { return bluepingPlugin; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( BluepingPluginImpl ) } diff --git a/noncore/securityplugins/blueping/bluepingpluginimpl.h b/noncore/securityplugins/blueping/bluepingpluginimpl.h index 2fd023a..4663602 100644 --- a/noncore/securityplugins/blueping/bluepingpluginimpl.h +++ b/noncore/securityplugins/blueping/bluepingpluginimpl.h @@ -24,35 +24,34 @@ : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef BLUEPING_PLUGIN_IMPL_H #define BLUEPING_PLUGIN_IMPL_H #include "bluepingplugin.h" /// Standard multiauth plugin class -class BluepingPluginImpl : public MultiauthPluginInterface{ +class BluepingPluginImpl : public Opie::Security::MultiauthPluginInterface{ public: BluepingPluginImpl(); virtual ~BluepingPluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); /// defines standard addRef() and release() functions Q_REFCOUNT; - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); private: /// the plugin itself BluepingPlugin *bluepingPlugin; - ulong ref; }; #endif diff --git a/noncore/securityplugins/dummy/dummyplugin.cpp b/noncore/securityplugins/dummy/dummyplugin.cpp index 0d19e43..594825e 100644 --- a/noncore/securityplugins/dummy/dummyplugin.cpp +++ b/noncore/securityplugins/dummy/dummyplugin.cpp @@ -1,25 +1,28 @@ #include "dummyplugin.h" #include <opie2/oapplication.h> #include <qdialog.h> #include <qlayout.h> #include <qlabel.h> #include <qpushbutton.h> +using Opie::Security::MultiauthConfigWidget; +using Opie::Security::MultiauthPluginObject; + /// Simply return its name (Dummy plugin) QString DummyPlugin::pluginName() const { return "Dummy plugin"; } /// no configuration widget for the moment MultiauthConfigWidget * DummyPlugin::configWidget(QWidget * parent) { return 0l; } QString DummyPlugin::pixmapNameWidget() const { return "security/dummyplugin"; } QString DummyPlugin::pixmapNameConfig() const { return 0l; } diff --git a/noncore/securityplugins/dummy/dummyplugin.h b/noncore/securityplugins/dummy/dummyplugin.h index 9680dff..3bfca98 100644 --- a/noncore/securityplugins/dummy/dummyplugin.h +++ b/noncore/securityplugins/dummy/dummyplugin.h @@ -29,38 +29,38 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef DUMMY_PLUGIN_H #define DUMMY_PLUGIN_H #include <qobject.h> #include <qstring.h> #include <opie2/multiauthplugininterface.h> /// Multi-authentication example plugin, implementing a trivial 'yes/no' verification. /** * The plugin itself, implementing the main authenticate() function. */ -class DummyPlugin : public QObject, public MultiauthPluginObject { +class DummyPlugin : public QObject, public Opie::Security::MultiauthPluginObject { Q_OBJECT public: int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; QString pixmapNameWidget() const; QString pluginName() const; signals: /// Signal carrying the result code of this plugin void emitCode(int resultCode); private slots: void success(); void failure(); void skip(); }; #endif diff --git a/noncore/securityplugins/dummy/dummypluginimpl.cpp b/noncore/securityplugins/dummy/dummypluginimpl.cpp index 518996c..54dbdd1 100644 --- a/noncore/securityplugins/dummy/dummypluginimpl.cpp +++ b/noncore/securityplugins/dummy/dummypluginimpl.cpp @@ -1,18 +1,21 @@ #include "dummypluginimpl.h" +using Opie::Security::MultiauthPluginInterface; +using Opie::Security::MultiauthPluginObject; + DummyPluginImpl::DummyPluginImpl() { dummyPlugin = new DummyPlugin(); } DummyPluginImpl::~DummyPluginImpl() { delete dummyPlugin; } MultiauthPluginObject* DummyPluginImpl::plugin() { return dummyPlugin; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( DummyPluginImpl ) } diff --git a/noncore/securityplugins/dummy/dummypluginimpl.h b/noncore/securityplugins/dummy/dummypluginimpl.h index 49a18cd..ce8620d 100644 --- a/noncore/securityplugins/dummy/dummypluginimpl.h +++ b/noncore/securityplugins/dummy/dummypluginimpl.h @@ -24,35 +24,34 @@ : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef DUMMY_PLUGIN_IMPL_H #define DUMMY_PLUGIN_IMPL_H #include "dummyplugin.h" /// Standard multiauth plugin class -class DummyPluginImpl : public MultiauthPluginInterface{ +class DummyPluginImpl : public Opie::Security::MultiauthPluginInterface{ public: DummyPluginImpl(); virtual ~DummyPluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); /// defines standard addRef() and release() functions Q_REFCOUNT; - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); private: /// the plugin itself DummyPlugin *dummyPlugin; - ulong ref; }; #endif diff --git a/noncore/securityplugins/notice/noticeConfigWidget.cpp b/noncore/securityplugins/notice/noticeConfigWidget.cpp index e2c2d83..e532232 100644 --- a/noncore/securityplugins/notice/noticeConfigWidget.cpp +++ b/noncore/securityplugins/notice/noticeConfigWidget.cpp @@ -1,26 +1,28 @@ #include "noticeConfigWidget.h" #include <opie2/odebug.h> #include <qwidget.h> #include <qlayout.h> #include <qlabel.h> #include <qregexp.h> #include <qgroupbox.h> +using Opie::Security::MultiauthConfigWidget; + /// constructs the widget, filling the noticeMLE QMultiLineEdit with the "noticeText" entry NoticeConfigWidget::NoticeConfigWidget(QWidget* parent = 0, const char* name = "Notice configuration widget") : MultiauthConfigWidget(parent, name) { QVBoxLayout *baseLayout = new QVBoxLayout( this); baseLayout->setSpacing(11); baseLayout->setMargin(6); baseLayout->setAlignment( Qt::AlignTop ); QGroupBox *configBox = new QGroupBox(0, Qt::Vertical, tr("Set the message the user must accept"), this); baseLayout->addWidget(configBox); QVBoxLayout *boxLayout = new QVBoxLayout( configBox->layout() ); QLabel * comment1 = new QLabel("<p><em>" + tr("You may want to consult your legal department for proper wording here.") + "</em></p>", configBox); boxLayout->addWidget(comment1); // Set the multilineedit box text to getNoticeText() diff --git a/noncore/securityplugins/notice/noticeConfigWidget.h b/noncore/securityplugins/notice/noticeConfigWidget.h index 69f15bf..c90484c 100644 --- a/noncore/securityplugins/notice/noticeConfigWidget.h +++ b/noncore/securityplugins/notice/noticeConfigWidget.h @@ -36,36 +36,37 @@ #include <qpushbutton.h> #include <qmultilineedit.h> #include <qpe/config.h> #include <opie2/multiauthconfigwidget.h> static char defaultNoticeText [] = "<h2>NOTICE TO USERS</h2>\n" "<p>This is a private computer system and is the property of " "the company XXX / Mr or Ms X. It is for authorized " "use only. Users have no expectation of privacy.</p>\n" "<p><strong>Unauthorized or improper use of this system may result in " "disciplinary action and civil and criminal penalties. <em>By continuing to use " "this system you indicate your awareness of and consent to these " "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>"; -class NoticeConfigWidget : public MultiauthConfigWidget { +class NoticeConfigWidget : public Opie::Security::MultiauthConfigWidget { Q_OBJECT public: NoticeConfigWidget(QWidget* parent, const char* name); virtual ~NoticeConfigWidget(); virtual void writeConfig(); private: QMultiLineEdit * noticeMLE; QPushButton * resetNoticeButton; private slots: void resetNotice(); private: Config * m_config; QString getNoticeText(); void setNoticeText(QString noticeText); }; #endif // NOTICECONFIGWIDGET_H + diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp index bacc439..25a452a 100644 --- a/noncore/securityplugins/notice/noticeplugin.cpp +++ b/noncore/securityplugins/notice/noticeplugin.cpp @@ -1,23 +1,25 @@ #include "noticeplugin.h" #include <opie2/oapplication.h> #include <qmessagebox.h> #include <qregexp.h> +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthConfigWidget; /// creates and initializes the m_config Config object NoticePlugin::NoticePlugin() : MultiauthPluginObject(), noticeW(0) { m_config = new Config("Security"); m_config->setGroup("NoticePlugin"); } /// deletes the m_config Config object and noticeW if necessary NoticePlugin::~NoticePlugin() { delete m_config; if (noticeW != 0) delete noticeW; } /// Simply return its name (Notice plugin) QString NoticePlugin::pluginName() const { diff --git a/noncore/securityplugins/notice/noticeplugin.h b/noncore/securityplugins/notice/noticeplugin.h index 842d47b..4aa6f02 100644 --- a/noncore/securityplugins/notice/noticeplugin.h +++ b/noncore/securityplugins/notice/noticeplugin.h @@ -30,35 +30,35 @@ Boston, MA 02111-1307, USA. */ #ifndef NOTICE_PLUGIN_H #define NOTICE_PLUGIN_H #include <qstring.h> #include <qpe/config.h> #include <opie2/multiauthplugininterface.h> #include "noticeConfigWidget.h" /// Multi-authentication plugin, having the user accept a (legal, etc.) notice text. /** * The plugin itself, implementing the main authenticate() function. */ -class NoticePlugin : public QObject, public MultiauthPluginObject { +class NoticePlugin : public QObject, public Opie::Security::MultiauthPluginObject { Q_OBJECT; public: NoticePlugin(); virtual ~NoticePlugin(); int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; QString pixmapNameWidget() const; QString pluginName() const; private: NoticeConfigWidget * noticeW; Config * m_config; QString getNoticeText(); }; #endif diff --git a/noncore/securityplugins/notice/noticepluginimpl.cpp b/noncore/securityplugins/notice/noticepluginimpl.cpp index 34e3cfc..7524512 100644 --- a/noncore/securityplugins/notice/noticepluginimpl.cpp +++ b/noncore/securityplugins/notice/noticepluginimpl.cpp @@ -1,18 +1,21 @@ #include "noticepluginimpl.h" +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthPluginInterface; + NoticePluginImpl::NoticePluginImpl() { noticePlugin = new NoticePlugin(); } NoticePluginImpl::~NoticePluginImpl() { delete noticePlugin; } MultiauthPluginObject* NoticePluginImpl::plugin() { return noticePlugin; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( NoticePluginImpl ) } diff --git a/noncore/securityplugins/notice/noticepluginimpl.h b/noncore/securityplugins/notice/noticepluginimpl.h index b2a1140..1b1e22f 100644 --- a/noncore/securityplugins/notice/noticepluginimpl.h +++ b/noncore/securityplugins/notice/noticepluginimpl.h @@ -26,36 +26,35 @@ -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef NOTICE_PLUGIN_IMPL #define NOTICE_PLUGIN_IMPL #include "noticeplugin.h" /** * \brief Standard multiauth plugin class */ -class NoticePluginImpl : public MultiauthPluginInterface{ +class NoticePluginImpl : public Opie::Security::MultiauthPluginInterface{ public: NoticePluginImpl(); virtual ~NoticePluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); /// defines standard addRef() and release() functions Q_REFCOUNT; - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); private: /// the plugin itself NoticePlugin *noticePlugin; - ulong ref; }; #endif diff --git a/noncore/securityplugins/pin/pin.cpp b/noncore/securityplugins/pin/pin.cpp index 37dc5be..c21ffcd 100644 --- a/noncore/securityplugins/pin/pin.cpp +++ b/noncore/securityplugins/pin/pin.cpp @@ -28,34 +28,37 @@ #include <opie2/odebug.h> #include <opie2/oapplication.h> /* QT */ #include <qpe/config.h> #include <qlabel.h> #include <qlineedit.h> #include <qtextview.h> #include <qstring.h> #include <qdialog.h> /* UNIX */ #include <unistd.h> #include <stdlib.h> #include <time.h> extern "C" char *crypt(const char *key, const char *salt); +using Opie::Security::MultiauthConfigWidget; +using Opie::Security::MultiauthPluginObject; + /// set to TRUE when we press the 'Skip' button -bool isSkip = FALSE; +static bool isSkip = FALSE; /// PIN input graphical widget. /** * Inherits the PinDialogBase class defined originally in pinDialogBase.ui interface file. * \sa PinDlg and PinDialog (the class generated from the .ui file) * It comes from the original PIN locking code in Opie : * \sa http://dudu.dyn.2-h.org/opiedoxydoc/library_2password_8cpp-source.html */ class PinDialog : public PinDialogBase { Q_OBJECT public: PinDialog( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~PinDialog(); diff --git a/noncore/securityplugins/pin/pin.h b/noncore/securityplugins/pin/pin.h index 6cd328a..1832210 100644 --- a/noncore/securityplugins/pin/pin.h +++ b/noncore/securityplugins/pin/pin.h @@ -30,39 +30,39 @@ Boston, MA 02111-1307, USA. */ #ifndef PIN_H #define PIN_H #include <qobject.h> #include <qstring.h> #include <opie2/multiauthplugininterface.h> #include "pinConfigWidget.h" /// Multi-authentication plugin, implementing a PIN verification. /** * The plugin itself, implementing the main authenticate() function. */ -class PinPlugin : public QObject, public MultiauthPluginObject { +class PinPlugin : public QObject, public Opie::Security::MultiauthPluginObject { Q_OBJECT public: int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; QString pixmapNameWidget() const; QString pluginName() const; private slots: QString getPIN( const QString& prompt ); QString getCryptedPIN( const QString& prompt ); void changePIN(); void clearPIN(); private: QString encrypt(const QString& pin); bool verify(const QString& pin, const QString& hash); }; #endif // PIN_H diff --git a/noncore/securityplugins/pin/pinConfigWidget.cpp b/noncore/securityplugins/pin/pinConfigWidget.cpp index 53e1a20..b34db8b 100644 --- a/noncore/securityplugins/pin/pinConfigWidget.cpp +++ b/noncore/securityplugins/pin/pinConfigWidget.cpp @@ -1,23 +1,25 @@ #include <qwidget.h> #include <qlayout.h> #include <qlabel.h> #include <qgroupbox.h> #include "pinConfigWidget.h" +using Opie::Security::MultiauthConfigWidget; + PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN configuration widget") : MultiauthConfigWidget(parent, name) { QVBoxLayout * baseLayout = new QVBoxLayout( this); baseLayout->setSpacing(11); baseLayout->setMargin(11); baseLayout->setAlignment( Qt::AlignTop ); QGroupBox * configBox = new QGroupBox(0, Qt::Vertical, tr("Configure your PIN here"), this); baseLayout->addWidget(configBox); QVBoxLayout *boxLayout = new QVBoxLayout( configBox->layout() ); QLabel * description = new QLabel("<p>" + tr("PIN protection provides a minimal level of protection from casual access to this device.") + "</p>", configBox); boxLayout->addWidget(description); QHBoxLayout * buttonLayout = new QHBoxLayout(); diff --git a/noncore/securityplugins/pin/pinConfigWidget.h b/noncore/securityplugins/pin/pinConfigWidget.h index 3242ad0..6d5edff 100644 --- a/noncore/securityplugins/pin/pinConfigWidget.h +++ b/noncore/securityplugins/pin/pinConfigWidget.h @@ -24,28 +24,28 @@ : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef PINCONFIGWIDGET_H #define PINCONFIGWIDGET_H #include <qpushbutton.h> #include <opie2/multiauthconfigwidget.h> -class PinConfigWidget : public MultiauthConfigWidget { +class PinConfigWidget : public Opie::Security::MultiauthConfigWidget { public: PinConfigWidget(QWidget* parent, const char* name); virtual ~PinConfigWidget(); virtual void writeConfig(); ///\todo to protect? QPushButton *changePIN; QPushButton *clearPIN; }; #endif // PINCONFIGWIDGET_H diff --git a/noncore/securityplugins/pin/pinpluginimpl.cpp b/noncore/securityplugins/pin/pinpluginimpl.cpp index 1c32f81..6cd2467 100644 --- a/noncore/securityplugins/pin/pinpluginimpl.cpp +++ b/noncore/securityplugins/pin/pinpluginimpl.cpp @@ -1,18 +1,21 @@ #include "pinpluginimpl.h" +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthPluginInterface; + PinPluginImpl::PinPluginImpl() { pinPlugin = new PinPlugin(); } PinPluginImpl::~PinPluginImpl() { delete pinPlugin; } MultiauthPluginObject* PinPluginImpl::plugin() { return pinPlugin; } Q_EXPORT_INTERFACE() { Q_CREATE_INSTANCE( PinPluginImpl ) } diff --git a/noncore/securityplugins/pin/pinpluginimpl.h b/noncore/securityplugins/pin/pinpluginimpl.h index e604b64..cbb9ef0 100644 --- a/noncore/securityplugins/pin/pinpluginimpl.h +++ b/noncore/securityplugins/pin/pinpluginimpl.h @@ -24,35 +24,34 @@ : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef PIN_PLUGIN_IMPL_H #define PIN_PLUGIN_IMPL_H #include "pin.h" /// Standard multiauth plugin class -class PinPluginImpl : public MultiauthPluginInterface{ +class PinPluginImpl : public Opie::Security::MultiauthPluginInterface{ public: PinPluginImpl(); virtual ~PinPluginImpl(); QRESULT queryInterface( const QUuid &, QUnknownInterface** ); // defines standard addRef() and release() functions Q_REFCOUNT; - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); private: /// the plugin itself PinPlugin *pinPlugin; - ulong ref; }; #endif |