A couple big changes:

1) Add lumina-checkpass subproject: this is a tiny C program for comparing an input again the current user's password with PAM (required for screen unlocker in lumina-wm)
2) Completely finish up the Screensaver implementation in lumina-wm - the lock/unlock screen works great now, and I also set it up to cut the current screen brightness in half when the screensaver starts up (returns to normal level on activity).

1 files changed, 36 insertions, 93 deletions

diff --git a/lumina-wm-INCOMPLETE/LLockScreen.cpp b/lumina-wm-INCOMPLETE/LLockScreen.cpp
index 3778042f..de95aac8 100644
--- a/lumina-wm-INCOMPLETE/LLockScreen.cpp
+++ b/lumina-wm-INCOMPLETE/LLockScreen.cpp
@@ -7,30 +7,24 @@
 #include "LLockScreen.h"
 #include "ui_LLockScreen.h"
 
-//Standard C libary for username/system fetch
-#include <unistd.h>
-//#include <sys/param.h>
-
-//PAM libraries
-#include <sys/types.h>
-#include <security/pam_appl.h>
-#include <security/openpam.h>
-//#include <sys/wait.h>
-//#include <pwd.h>
-//#include <login_cap.h>
-
+#define NUMTRIES 3
+#define WAITMINS 1
 #define DEBUG 1
 
 LLockScreen::LLockScreen(QWidget *parent) : QWidget(parent), ui(new Ui::LLockScreen()){
   ui->setupUi(this);
   waittime = new QTimer(this);
-    waittime->setInterval(300000); //5 minutes (too many attempts in short time)
+    waittime->setInterval(WAITMINS*60000); //(too many attempts in short time)
     waittime->setSingleShot(true);
+  refreshtime = new QTimer(this); //timer to update the wait time display
+    refreshtime->setInterval(6000); //6 seconds (1/10 second)
+	
   connect(ui->tool_unlock, SIGNAL(clicked()), this, SLOT(TryUnlock()) );
   connect(ui->line_password, SIGNAL(returnPressed()), this, SLOT(TryUnlock()) );
   connect(ui->line_password, SIGNAL(textEdited(QString)), this, SIGNAL(InputDetected()) );
   connect(ui->line_password, SIGNAL(cursorPositionChanged(int,int)), this, SIGNAL(InputDetected()) );
   connect(waittime, SIGNAL(timeout()), this, SLOT(aboutToShow()) );
+  connect(refreshtime, SIGNAL(timeout()), this, SLOT(UpdateLockInfo()) );
 }
 
 LLockScreen::~LLockScreen(){
@@ -44,114 +38,63 @@ void LLockScreen::LoadSystemDetails(){
    ui->label_hostname->setText( QHostInfo::localHostName() );
    ui->tool_unlock->setIcon( LXDG::findIcon("document-decrypt","") );
    attempts = 0;
-  bool ok = PAM_lockSession(user);
-  qDebug() << "Closed PAM session:" << ok;
 }
 
 void LLockScreen::aboutToHide(){
   //auto-hide timeout - clear display
   ui->line_password->clear();
   ui->line_password->clearFocus();
-  if(!waittime->isActive()){ ui->label_info->clear(); } //could be obsolete the next time the lock screen is shown
-  
+  if(refreshtime->isActive()){ refreshtime->stop(); }
 } 
 
 void LLockScreen::aboutToShow(){
   if(!waittime->isActive()){
-    ui->label_info->setText( PAM_checkLockInfo( QString(getlogin()) ) );
+    ui->label_info->clear();
     this->setEnabled(true);
-    triesleft = 4; //back to initial number of tries
+    triesleft = NUMTRIES; //back to initial number of tries
+    if(refreshtime->isActive()){ refreshtime->stop(); }
+  }else{
+    if(!refreshtime->isActive()){ refreshtime->start(); }
   }
+  UpdateLockInfo();
   ui->line_password->clear();
   ui->line_password->setFocus();
 } 
 
 // =================
-//         PRIVATE
+//      PRIVATE SLOTS
 // =================
-// PAM structures for the functions below
-static struct pam_conv pamc = { openpam_nullconv, NULL };
-pam_handle_t *pamh;
-
-bool LLockScreen::PAM_checkpass(QString user, QString pass, QString &info){
-  //Convert the inputs to C character arrays for use in PAM
-  if(DEBUG){qDebug() << "Check Password w/PAM:" << user << pass;}
-  QByteArray tmp2 = pass.toUtf8();
-  char* cPassword = tmp2.data();
-  //initialize variables
-  bool result = false;
-    //Place the user-supplied password into the structure 
-    int ret = pam_set_item(pamh, PAM_AUTHTOK, cPassword);
-    //Set the TTY 
-    //Authenticate with PAM
-    ret = pam_authenticate(pamh,0);
-    if( ret == PAM_SUCCESS ){
-      //Check for valid, unexpired account and verify access restrictions
-      ret = pam_acct_mgmt(pamh,0);
-      if( ret == PAM_SUCCESS ){
-        result = true; 
-	ret = pam_setcred(pamh,PAM_REINITIALIZE_CRED);
-	ret = pam_end(pamh,ret);      
-      }else{ info = PAM_getError(ret); }
-    }else{
-      info = PAM_getError(ret);
-    }
-  if(DEBUG){ qDebug() << " - Result:" << result << ret; }
-  //return verification result
-  return result;	
-}
-
-QString LLockScreen::PAM_checkLockInfo(QString user){
-  //Return info string with any account lock/reset info
-  return ""; //not implemented yet
-}
-
-QString LLockScreen::PAM_getError(int ret){
-  QString err;
-  //Interpret a PAM error message and log it
-  //qWarning() << "PAM Error: " << ret;
-  switch( ret ){
-  case PAM_MAXTRIES:
-    err = tr("Too Many Failures: Try again later.");
-    break;
-  case PAM_NEW_AUTHTOK_REQD:
-    err = tr("Password Expired: Contact System Admin");
-    break;
-  default:
-    triesleft--;
-    if(triesleft>0){ err = QString(tr("Failure: %1 Attempts Remaining")).arg( QString::number(triesleft) ); }
-    else{err = tr("Too Many Failures: Try again in 5 minutes"); }
-    if(DEBUG){ err.append("\n"+QString(pam_strerror(pamh, ret)) ); }
-  }
-  return err;
+void LLockScreen::UpdateLockInfo(){
+  QString info;
+  /*if(triesleft>0 && triesleft<NUMTRIES ){ 
+    if(triesleft==1){info = tr("1 Attempt Left"); }
+    else{info = QString(tr("%1 Attempts Left")).arg(QString::number(triesleft)); }
+  }else*/ 
+  if(waittime->isActive()){ 
+    info = tr("Too Many Failures")+"\n"+ QString(tr("Wait %1 Minutes")).arg( QString::number(qRound(waittime->remainingTime()/6000.0)/10.0) );
+  }else if(attempts>0){ info.append("\n"+QString(tr("Failed Attempts: %1")).arg(QString::number(attempts)) ); }
+  ui->label_info->setText(info);	
 }
 
-bool LLockScreen::PAM_lockSession(QString user){
-  QByteArray tmp = user.toUtf8();
-  char* cUser = tmp.data();
-  int ret = pam_start( user=="root" ? "system": "login", cUser, &pamc, &pamh);
-  //if(ret == PAM_SUCCESS){ ret = pam_setcred(pamh,PAM_DELETE_CRED); }
-  return (ret== PAM_SUCCESS);
-}
-// =================
-//      PRIVATE SLOTS
-// =================
 void LLockScreen::TryUnlock(){
   attempts++;
   this->setEnabled(false);
   QString pass = ui->line_password->text();
     ui->line_password->clear();
-  QString user = QString(getlogin());
-  QString info;
-  bool ok = PAM_checkpass(user, pass, info);
+  bool ok = (LUtils::runCmd("lumina-checkpass", QStringList() << pass) == 0);
   if(ok){
     emit ScreenUnlocked();
     this->setEnabled(true);
-  }else if(triesleft>1){
-    this->setEnabled(true);
-    ui->label_info->setText(info);
   }else{
-    ui->label_info->setText(info);
-    waittime->start();
+    triesleft--;
+    if(triesleft>0){ 
+      this->setEnabled(true);
+    }else{ 
+      waittime->start(); 
+      refreshtime->start();
+    }
+    ui->line_password->setFocus();
   }
+  UpdateLockInfo();
+
 }