From 969887429084da3b5a5d7d669015ff3489f6521c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 29 Sep 2015 19:43:26 -0500 Subject: Use DM library in tdmtsak instead of making command line calls (cherry picked from commit 6d028f3b522b5a4f978d52cc5b3c187cf329c3b2) --- kdesktop/lock/sakdlg.cc | 10 +++--- tdm/kfrontend/sakdlg.cc | 8 ++--- tdmlib/CMakeLists.txt | 2 +- tdmlib/tdmtsak.cpp | 94 ++++++++++++++++++++++++++++--------------------- 4 files changed, 64 insertions(+), 50 deletions(-) diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index 1bb8305ef..a062fb0fe 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -119,11 +119,11 @@ void SAKDlg::slotSAKProcessExited() SAKDlg::~SAKDlg() { - if ((mSAKProcess) && (mSAKProcess->isRunning())) { - mSAKProcess->kill(SIGTERM); - delete mSAKProcess; - } - hide(); + if ((mSAKProcess) && (mSAKProcess->isRunning())) { + mSAKProcess->kill(SIGKILL); + delete mSAKProcess; + } + hide(); } void SAKDlg::closeDialogForced() diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc index 1f1adefdf..1848c8638 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/tdm/kfrontend/sakdlg.cc @@ -157,10 +157,10 @@ void SAKDlg::processInputPipeCommand(TQString command) { SAKDlg::~SAKDlg() { - if ((mSAKProcess) && (mSAKProcess->isRunning())) { - mSAKProcess->kill(SIGTERM); - delete mSAKProcess; - } + if ((mSAKProcess) && (mSAKProcess->isRunning())) { + mSAKProcess->kill(SIGKILL); + delete mSAKProcess; + } mControlPipeHandlerThread->terminate(); mControlPipeHandlerThread->wait(); diff --git a/tdmlib/CMakeLists.txt b/tdmlib/CMakeLists.txt index 3341e9157..266d4be58 100644 --- a/tdmlib/CMakeLists.txt +++ b/tdmlib/CMakeLists.txt @@ -77,7 +77,7 @@ endif( ) if( BUILD_TSAK ) tde_add_executable( tdmtsak SOURCES tdmtsak.cpp - LINK ${TQT_LIBRARIES} + LINK ${TQT_LIBRARIES} tdecore-shared dmctl-static DESTINATION ${BIN_INSTALL_DIR} SETUID DESCRIPTION "Secure Attention Key interface for TDM" diff --git a/tdmlib/tdmtsak.cpp b/tdmlib/tdmtsak.cpp index c893f86ec..768bcda80 100644 --- a/tdmlib/tdmtsak.cpp +++ b/tdmlib/tdmtsak.cpp @@ -1,6 +1,6 @@ /* This file is part of the TDE project - Copyright (C) 2011 Timothy Pearson + Copyright (C) 2011 - 2015 Timothy Pearson This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -18,10 +18,12 @@ Boston, MA 02110-1301, USA. */ -#include "tdmtsak.h" - #include +#include "dmctl.h" + +#include "tdmtsak.h" + #define FIFO_FILE "/tmp/tdesocket-global/tsak" TQString exec(const char * cmd) { @@ -44,15 +46,17 @@ bool is_vt_local() { return false; } else { - TQString cvtName = ""; - TQString output = exec("tdmctl list"); - TQStringList sessionList = TQStringList::split('\t', output, false); - // See if the current session is local - for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) { - TQStringList sessionInfoList = TQStringList::split(',', *it, true); - if ((*(sessionInfoList.at(0))).startsWith(":")) { - if (TQString(currentDisplay).startsWith(*(sessionInfoList.at(0)))) { - return true; + DM dm; + SessList sess; + if (dm.localSessions(sess)) { + TQString user, loc; + for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) { + DM::sess2Str2(*it, user, loc); + TQStringList sessionInfoList = TQStringList::split(',', loc, true); + if ((*(sessionInfoList.at(0))).startsWith(":")) { + if (TQString(currentDisplay).startsWith(*(sessionInfoList.at(0)))) { + return true; + } } } } @@ -68,44 +72,54 @@ bool is_vt_active() { return true; } else { + DM dm; + SessList sess; TQString cvtName = ""; - TQString output = exec("tdmctl list"); - TQString curConsole = exec("fgconsole"); - bool intFound; - int curConsoleNum = curConsole.toInt(&intFound); - if (intFound == false) { + TQString curConsole; + int curConsoleNum = dm.activeVT(); + if (curConsoleNum < 0) { return true; } - curConsole = TQString("vt%1").arg(curConsoleNum);; - TQStringList sessionList = TQStringList::split('\t', output, false); - for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) { - TQStringList sessionInfoList = TQStringList::split(',', *it, true); - if ((*(sessionInfoList.at(0))).startsWith(":")) { - if ((*(sessionInfoList.at(1))) == TQString(curConsole)) { - cvtName = (*(sessionInfoList.at(0))); + curConsole = TQString("vt%1").arg(curConsoleNum); + if (dm.localSessions(sess)) { + TQString user, loc; + for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) { + DM::sess2Str2(*it, user, loc); + TQStringList sessionInfoList = TQStringList::split(',', loc, true); + if ((*(sessionInfoList.at(0))).startsWith(":")) { + if ((*(sessionInfoList.at(1))).stripWhiteSpace() == TQString(curConsole)) { + cvtName = (*(sessionInfoList.at(0))); + } } } - } - if (cvtName != "") { - if (TQString(currentDisplay).startsWith(cvtName)) { - return true; + if (cvtName != "") { + if (TQString(currentDisplay).startsWith(cvtName)) { + return true; + } + else { + return false; + } } else { - return false; - } - } - else { - // See if the current session is local - // If it is, then the VT is not currently active and the SAK must be requested later when it is active - for ( TQStringList::Iterator it = sessionList.begin(); it != sessionList.end(); ++it ) { - TQStringList sessionInfoList = TQStringList::split(',', *it, true); - if ((*(sessionInfoList.at(0))).startsWith(":")) { - if (TQString(currentDisplay).startsWith(*(sessionInfoList.at(0)))) { - return false; + // See if the current session is local + // If it is, then the VT is not currently active and the SAK must be requested later when it is active + for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) { + DM::sess2Str2(*it, user, loc); + if ((*it).self) { + TQStringList sessionInfoList = TQStringList::split(',', loc, true); + if ((*(sessionInfoList.at(1))).startsWith(" vt")) { + // Local and inactive + return false; + } } } + // Hmm, not local + // Do not reject the SAK + return true; } - // Hmm, not local + } + else { + // Failure! // Do not reject the SAK return true; } -- cgit v1.2.1