summaryrefslogtreecommitdiff
path: root/libopie2
Side-by-side diff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiesecurity/multiauthpassword.cpp47
-rw-r--r--libopie2/opiesecurity/multiauthpassword.h10
2 files changed, 48 insertions, 9 deletions
diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp
index 42341f7..8eda554 100644
--- a/libopie2/opiesecurity/multiauthpassword.cpp
+++ b/libopie2/opiesecurity/multiauthpassword.cpp
@@ -48,52 +48,85 @@
#include "multiauthpassword.h"
namespace Opie {
namespace Security {
/**
- * If the users requires authentication... #fixme
+ * Tells if the users requires authentication (used internally to
+ * know whether to repaint the screen on resume)
*
- * @todo fix up at_poweron attribute
+ * \param at_poweron true if we are booting Opie, false if we are resuming it
+ * \return true if authenticate() launched right now would trigger an authentication
*/
bool MultiauthPassword::needToAuthenticate(bool at_poweron)
{
Config cfg("Security");
cfg.setGroup("Misc");
if ( !at_poweron && cfg.readBoolEntry("onStart", false) )
return true;
else if ( at_poweron && cfg.readBoolEntry("onResume", false) )
return true;
else
return false;
}
+
/**
- * \brief Require user authentication to unlock and continue
+ * \brief Require (if configured so) user authentication to unlock and continue
*
* This method will check if you require authentication
* and then will lock the screen and ask for a successful
* authentication (explaining what it does or not, depending
* on your local configuration).
* It may go into an event loop, but anyhow it will only end
* when the user has successfully authenticated to the system.
*/
-void MultiauthPassword::authenticate(bool at_poweron)
+void MultiauthPassword::authenticate(int lockMode)
{
- if ( ! needToAuthenticate(at_poweron) )
- return;
+ /**
+ * \par Conditions
+ *
+ * If lockMode is an If, it's conditional:
+ * \li IfPowerOn will not trigger an authentication if
+ * onStart is set to false in Security.conf,
+ * \li IfResume will not trigger an authentication if
+ * onResume is set to false in Security.conf.
+ */
+ if ( (lockMode == IfPowerOn) || (lockMode == IfResume) )
+ {
+ Config cfg("Security");
+ cfg.setGroup("Misc");
+ if ( (
+ (lockMode == IfPowerOn) && cfg.readBoolEntry("onStart", false)
+ ) || (
+ (lockMode == IfResume) && cfg.readBoolEntry("onResume", false)
+ ) )
+ return;
+ }
+
+ /**
+ * \li TestNow will ensure that the authentication window will let
+ * people escape through the last screen (which they can reach skipping
+ * all the authentication steps)
+ * \li LockNow will always go on with the authentication, and won't let
+ * people escape.
+ */
+ bool allowByPass = false;
+
+ if (lockMode == TestNow)
+ allowByPass = true;
/* Constructs the main window, which displays messages and blocks
* access to the desktop
*/
- MultiauthMainWindow win;
+ MultiauthMainWindow win(allowByPass);
// 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;
diff --git a/libopie2/opiesecurity/multiauthpassword.h b/libopie2/opiesecurity/multiauthpassword.h
index fe276da..effdaa1 100644
--- a/libopie2/opiesecurity/multiauthpassword.h
+++ b/libopie2/opiesecurity/multiauthpassword.h
@@ -33,27 +33,33 @@
#ifndef OPIE_SEC_MULTIAUTHPASSWORD_H
#define OPIE_SEC_MULTIAUTHPASSWORD_H
namespace Opie {
namespace Security {
+enum lockMode {
+ IfPowerOn,
+ IfResume,
+ TestNow,
+ LockNow };
/**
* This is the dropin replacement for the libqpe Password class.
* If you call authenticate() a widget will cover the whole screen
* and only return if the user is able to authenticate with any of the
* configured Authentication Plugins.
* It uses the Opie::Security::MultiauthMainWindow QDialog internally.
*
* @author Clement Séveillac, Holger Freyther
*/
class MultiauthPassword {
+
public:
- static bool needToAuthenticate( bool atpoweron = false );
- static void authenticate(bool atpoweron = false);
+ static void authenticate(int authMode = LockNow);
+ static bool needToAuthenticate( bool atpoweron = false );
};
}
}
#endif