TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Add remote control socket to kdm

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1255013 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 60de68e5c0
commit 0f05883544
14 changed files with 249 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
kdesktop/lock/lockprocess.cc
Unescape View File

@ -605,6 +605,7 @@ bool LockProcess::dontLock()
//---------------------------------------------------------------------------
void LockProcess::quitSaver()
{
DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
if (closeCurrentWindow()) {
TQTimer::singleShot( 0, this, SLOT(quitSaver()) );
return;

100
kdm/kfrontend/kgreeter.cpp
Unescape View File

@ -71,8 +71,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <utmp.h>
#include <utmpx.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <limits.h>
#include <dirent.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/select.h>
#include <sys/time.h>
#include <termios.h>
#include <signal.h>
#include <X11/Xlib.h>
#define FIFO_DIR "/tmp/ksocket-global/kdm"
#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1"
#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1"
class UserListView : public KListView {
public:
UserListView( bool _them, TQWidget *parent = 0, const char *name = 0 )
@ -161,6 +178,8 @@ KGreeter::KGreeter( bool framed )
, prevValid( true )
, needLoad( false )
, themed( framed )
, mPipe_fd( -1 )
, closingDown( false )
{
stsFile = new KSimpleConfig( _stsFile );
stsFile->setGroup( "PrevUser" );
@ -185,16 +204,95 @@ KGreeter::KGreeter( bool framed )
curPlugin = 0;
pluginList = KGVerify::init( _pluginsLogin );
}
TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
}
KGreeter::~KGreeter()
{
if (mPipe_fd != -1) {
closingDown = true;
::close(mPipe_fd);
::unlink(mPipeFilename.ascii());
}
hide();
delete userList;
delete verify;
delete stsFile;
}
void KGreeter::handleInputPipe(void) {
if (closingDown) {
::unlink(mPipeFilename.ascii());
return;
}
if (isShown() == false) {
TQTimer::singleShot( 100, this, TQT_SLOT(handleInputPipe()) );
return;
}
char readbuf[2048];
int displayNumber;
TQString currentDisplay;
currentDisplay = TQString(getenv("DISPLAY"));
currentDisplay = currentDisplay.replace(":", "");
displayNumber = currentDisplay.toInt();
mPipeFilename = TQString(FIFO_FILE).tqarg(displayNumber);
::unlink((TQString(FIFO_SAK_FILE).tqarg(displayNumber)).ascii());
/* Create the FIFOs if they do not exist */
umask(0);
struct stat buffer;
int status;
status = stat(FIFO_DIR, &buffer);
if (status == 0) {
int file_mode = ((buffer.st_mode & S_IRWXU) >> 6) * 100;
file_mode = file_mode + ((buffer.st_mode & S_IRWXG) >> 3) * 10;
file_mode = file_mode + ((buffer.st_mode & S_IRWXO) >> 0) * 1;
if ((file_mode != 600) || (buffer.st_uid != 0) || (buffer.st_gid != 0)) {
::unlink(mPipeFilename.ascii());
printf("[WARNING] Possible security breach! Please check permissions on " FIFO_DIR " (must be 600 and owned by root/root, got %d %d/%d). Not listening for login credentials on remote control socket.\n", file_mode, buffer.st_uid, buffer.st_gid); fflush(stdout);
return;
}
}
mkdir(FIFO_DIR,0600);
mknod(mPipeFilename.ascii(), S_IFIFO|0600, 0);
chmod(mPipeFilename.ascii(), 0600);
mPipe_fd = ::open(mPipeFilename.ascii(), O_RDONLY | O_NONBLOCK);
int numread;
TQString inputcommand = "";
while ((!inputcommand.contains('\n')) && (!closingDown)) {
numread = ::read(mPipe_fd, readbuf, 2048);
readbuf[numread] = 0;
readbuf[2047] = 0;
inputcommand += readbuf;
tqApp->processEvents();
}
if (closingDown) {
::unlink(mPipeFilename.ascii());
return;
}
inputcommand = inputcommand.replace('\n', "");
TQStringList commandList = TQStringList::split('\t', inputcommand, false);
if ((*(commandList.at(0))) == "LOGIN") {
if (verify) {
verify->setUser( (*(commandList.at(1))) );
verify->setPassword( (*(commandList.at(2))) );
accept();
}
}
if (!closingDown) {
TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
::close(mPipe_fd);
::unlink(mPipeFilename.ascii());
}
else {
::unlink(mPipeFilename.ascii());
}
}
void KGreeter::readFacesList()
{
FILE *f = fopen( TQFile::encodeName( _faceDir + "/.randomlist" ), "rt" );
@ -742,6 +840,7 @@ KGreeter::verifyOk()
GSendStr( "default" );
}
GSendInt( G_Ready );
closingDown = true;
done( ex_exit );
}
@ -1165,6 +1264,7 @@ KThemedGreeter::slotAskAdminPassword()
if (k.exec()) {
GSendInt(G_Ready);
hide();
closingDown = true;
done(ex_exit);
}
}

8
kdm/kfrontend/kgreeter.h
Unescape View File

@ -71,6 +71,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
void slotUserClicked( TQListViewItem * );
void slotSessionSelected( int );
void slotUserEntered();
void handleInputPipe();
public:
TQString curUser, dName;
@ -104,6 +105,13 @@ class KGreeter : public KGDialog, public KGVerifyHandler {
private slots:
void slotLoadPrevWM();
private:
int mPipe_fd;
TQString mPipeFilename;
protected:
bool closingDown;
public: // from KGVerifyHandler
virtual void verifyPluginChanged( int id );
virtual void verifyClear();

7
kdm/kfrontend/kgverify.cpp
Unescape View File

@ -268,6 +268,13 @@ KGVerify::setUser( const TQString &user )
gplugActivity();
}
void
KGVerify::setPassword( const TQString &pass )
{
greet->setPassword( pass );
gplugActivity();
}
void
KGVerify::start()
{

1
kdm/kfrontend/kgverify.h
Unescape View File

@ -100,6 +100,7 @@ class KGVerify : public TQObject, public KGreeterPluginHandler {
void presetEntity( const TQString &entity, int field );
TQString getEntity() const;
void setUser( const TQString &user );
void setPassword( const TQString &pass );
/* virtual */ void selectPlugin( int id );
bool entitiesLocal() const;
bool entitiesFielded() const;

97
kdm/kfrontend/sakdlg.cc
Unescape View File

@ -38,7 +38,9 @@
#include <tqlistview.h>
#include <tqheader.h>
#include <tqcheckbox.h>
#include <tqtimer.h>
#include <fcntl.h>
#include <ctype.h>
#include <unistd.h>
#include <stdlib.h>
@ -52,12 +54,29 @@
#include <X11/Xatom.h>
#include <fixx11h.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <limits.h>
#include <dirent.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/select.h>
#include <sys/time.h>
#include <termios.h>
#include <signal.h>
#include "kfdialog.h"
#ifndef AF_LOCAL
# define AF_LOCAL AF_UNIX
#endif
#define FIFO_DIR "/tmp/ksocket-global/kdm"
#define FIFO_FILE "/tmp/ksocket-global/kdm/kdmctl-%1"
#define FIFO_SAK_FILE "/tmp/ksocket-global/kdm/kdmctl-sak-%1"
bool trinity_desktop_lock_use_system_modal_dialogs = TRUE;
extern bool trinity_desktop_lock_use_sak;
@ -67,7 +86,7 @@ extern bool trinity_desktop_lock_use_sak;
//
SAKDlg::SAKDlg(TQWidget *parent)
: TQDialog(parent, "information dialog", true, (trinity_desktop_lock_use_system_modal_dialogs?((WFlags)WStyle_StaysOnTop):((WFlags)WX11BypassWM))),
mUnlockingFailed(false)
mUnlockingFailed(false), mPipe_fd(-1), closingDown(false)
{
if (trinity_desktop_lock_use_system_modal_dialogs) {
// Signal that we do not want any window controls to be shown at all
@ -109,21 +128,97 @@ SAKDlg::SAKDlg(TQWidget *parent)
*mSAKProcess << "kdmtsak" << "dm";
connect(mSAKProcess, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start();
TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
}
void SAKDlg::slotSAKProcessExited()
{
int retcode = mSAKProcess->exitStatus();
if (retcode != 0) trinity_desktop_lock_use_sak = false;
closingDown = true;
hide();
}
void SAKDlg::handleInputPipe(void) {
if (closingDown) {
::unlink(mPipeFilename.ascii());
return;
}
if (isShown() == false) {
TQTimer::singleShot( 100, this, TQT_SLOT(handleInputPipe()) );
return;
}
char readbuf[2048];
int displayNumber;
TQString currentDisplay;
currentDisplay = TQString(getenv("DISPLAY"));
currentDisplay = currentDisplay.replace(":", "");
displayNumber = currentDisplay.toInt();
mPipeFilename = TQString(FIFO_SAK_FILE).tqarg(displayNumber);
::unlink((TQString(FIFO_FILE).tqarg(displayNumber)).ascii());
/* Create the FIFOs if they do not exist */
umask(0);
struct stat buffer;
int status;
status = stat(FIFO_DIR, &buffer);
if (status == 0) {
int file_mode = ((buffer.st_mode & S_IRWXU) >> 6) * 100;
file_mode = file_mode + ((buffer.st_mode & S_IRWXG) >> 3) * 10;
file_mode = file_mode + ((buffer.st_mode & S_IRWXO) >> 0) * 1;
if ((file_mode != 600) || (buffer.st_uid != 0) || (buffer.st_gid != 0)) {
::unlink(mPipeFilename.ascii());
printf("[WARNING] Possible security breach! Please check permissions on " FIFO_DIR " (must be 600 and owned by root/root, got %d %d/%d). Not listening for login credentials on remote control socket.\n", file_mode, buffer.st_uid, buffer.st_gid); fflush(stdout);
return;
}
}
mkdir(FIFO_DIR,0600);
mknod(mPipeFilename.ascii(), S_IFIFO|0600, 0);
chmod(mPipeFilename.ascii(), 0600);
mPipe_fd = ::open(mPipeFilename.ascii(), O_RDONLY | O_NONBLOCK);
int numread;
TQString inputcommand = "";
while ((!inputcommand.contains('\n')) && (!closingDown)) {
numread = ::read(mPipe_fd, readbuf, 2048);
readbuf[numread] = 0;
readbuf[2047] = 0;
inputcommand += readbuf;
tqApp->processEvents();
}
if (closingDown) {
::unlink(mPipeFilename.ascii());
return;
}
inputcommand = inputcommand.replace('\n', "");
TQStringList commandList = TQStringList::split('\t', inputcommand, false);
if ((*(commandList.at(0))) == "CLOSE") {
mSAKProcess->kill();
}
if (!closingDown) {
TQTimer::singleShot( 0, this, TQT_SLOT(handleInputPipe()) );
::close(mPipe_fd);
::unlink(mPipeFilename.ascii());
}
else {
::unlink(mPipeFilename.ascii());
}
}
SAKDlg::~SAKDlg()
{
if ((mSAKProcess) && (mSAKProcess->isRunning())) {
mSAKProcess->kill(SIGTERM);
delete mSAKProcess;
}
if (mPipe_fd != -1) {
closingDown = true;
::close(mPipe_fd);
::unlink(mPipeFilename.ascii());
}
hide();
}

6
kdm/kfrontend/sakdlg.h
Unescape View File

@ -38,6 +38,7 @@ public:
private slots:
void slotSAKProcessExited();
void handleInputPipe();
protected slots:
virtual void reject();
@ -52,6 +53,11 @@ private:
TQStringList::iterator currLayout;
int sPid, sFd;
KProcess* mSAKProcess;
int mPipe_fd;
TQString mPipeFilename;
protected:
bool closingDown;
};
#endif

7
kdmlib/kgreet_classic.cpp
Unescape View File

@ -217,6 +217,13 @@ KClassicGreeter::setUser( const TQString &user )
passwdEdit->selectAll();
}
void // virtual
KClassicGreeter::setPassword( const TQString &pass )
{
passwdEdit->erase();
passwdEdit->insert( pass );
}
void // virtual
KClassicGreeter::setEnabled( bool enable )
{

1
kdmlib/kgreet_classic.h
Unescape View File

@ -50,6 +50,7 @@ class KClassicGreeter : public TQObject, public KGreeterPlugin {
virtual void presetEntity( const TQString &entity, int field );
virtual TQString getEntity() const;
virtual void setUser( const TQString &user );
virtual void setPassword( const TQString &pass );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );

7
kdmlib/kgreet_pam.cpp
Unescape View File

@ -263,6 +263,13 @@ KPamGreeter::setUser( const TQString &user )
}
}
void // virtual
KPamGreeter::setPassword( const TQString &pass )
{
authEdit[0]->erase();
authEdit[0]->insert( pass );
}
void // virtual
KPamGreeter::setEnabled(bool enable)
{

1
kdmlib/kgreet_pam.h
Unescape View File

@ -50,6 +50,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
virtual void presetEntity( const TQString &entity, int field );
virtual TQString getEntity() const;
virtual void setUser( const TQString &user );
virtual void setPassword( const TQString &pass );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );

7
kdmlib/kgreet_winbind.cpp
Unescape View File

@ -297,6 +297,13 @@ KWinbindGreeter::setUser( const TQString &user )
passwdEdit->selectAll();
}
void // virtual
KWinbindGreeter::setPassword( const TQString &pass )
{
passwdEdit->erase();
passwdEdit->insert( pass );
}
void // virtual
KWinbindGreeter::setEnabled( bool enable )
{

1
kdmlib/kgreet_winbind.h
Unescape View File

@ -54,6 +54,7 @@ class KWinbindGreeter : public TQObject, public KGreeterPlugin {
virtual void presetEntity( const TQString &entity, int field );
virtual TQString getEntity() const;
virtual void setUser( const TQString &user );
virtual void setPassword( const TQString &pass );
virtual void setEnabled( bool on );
virtual bool textMessage( const char *message, bool error );
virtual void textPrompt( const char *prompt, bool echo, bool nonBlocking );

6
kdmlib/kgreeterplugin.h
Unescape View File

@ -151,6 +151,12 @@ public:
*/
virtual void setUser( const TQString &user ) = 0;
/**
* "Push" a password into the talker.
* @param pass the password to set.
*/
virtual void setPassword( const TQString &pass ) = 0;
/**
* En-/disable any widgets contained in the talker.
* Will be called only when not running.

Write Preview
Loading…
Cancel
Save