Add a knob to use fixed path `iceauth` tool

`system()` and `popen()` may unsafe unless using absolute command path.
Rely on PATH environment variable set by users may result in unwanted tool.

Signed-off-by: OBATA Akio <obache@wizdas.com>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ac8c8ca54a)
v3.5.13-sru
OBATA Akio 4 years ago committed by Slávek Banko
parent f250423e9d
commit 35bff96a9c
Signed by: SlavekB
GPG Key ID: 608F5293A04BE668

@ -1094,6 +1094,17 @@ if( WITH_HSPELL )
endif( WITH_HSPELL )
##### find tools path ###########################
if( NOT WIN32 AND NOT ICEAUTH_PATH )
find_program( ICEAUTH_PATH iceauth )
if( ${ICEAUTH_PATH} STREQUAL "ICEAUTH_PATH-NOTFOUND" )
tde_message_fatal( "iceauth command was not found in path." )
endif()
message( STATUS "Found iceauth: ${ICEAUTH_PATH}" )
endif( NOT WIN32 AND NOT ICEAUTH_PATH )
##### write configure files #####################
configure_file( config.h.cmake config.h )

@ -909,6 +909,15 @@
/* Defined if your system has XRandR support */
#cmakedefine XRANDR_SUPPORT 1
/* Defines the executable of iceauth */
#cmakedefine ICEAUTH_PATH "@ICEAUTH_PATH@"
#ifdef ICEAUTH_PATH
# define ICEAUTH_COMMAND ICEAUTH_PATH
#else
# define ICEAUTH_COMMAND "iceauth"
#endif
/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only

@ -213,13 +213,26 @@ public:
TQCString DCOPClient::iceauthPath()
{
#ifdef Q_OS_WIN32
#if defined(ICEAUTH_PATH)
if (
# if defined(Q_WS_WIN)
access(ICEAUTH_PATH, 0) == 0
# else
access(ICEAUTH_PATH, X_OK) == 0
# endif
)
{
return TQCString(ICEAUTH_PATH);
}
#elif defined(Q_OS_WIN32)
char szPath[512];
char * pszFilePart;
int ret;
ret = SearchPathA(NULL,"iceauth.exe",NULL,sizeof(szPath)/sizeof(szPath[0]),szPath,&pszFilePart);
if(ret != 0)
return TQCString(szPath);
#else
TQCString path = ::getenv("PATH");
if (path.isEmpty())
@ -233,9 +246,9 @@ TQCString DCOPClient::iceauthPath()
{
return fPath;
}
fPath = strtok(NULL, ":\b");
}
#endif
return 0;
}

@ -151,7 +151,7 @@ static void cleanupDCOPsocket(char *buffer)
if (socket_file)
unlink(socket_file);
snprintf(cmd, BUFFER_SIZE, "iceauth remove netid='%s'", buffer);
snprintf(cmd, BUFFER_SIZE, ICEAUTH_COMMAND " remove netid='%s'", buffer);
system(cmd);
}

@ -16,6 +16,8 @@
* Boston, MA 02110-1301, USA.
**/
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@ -236,7 +238,7 @@ void KHostName::changeDcop()
::symlink(fname.data(), compatLink.data()); // Compatibility link
// Update .ICEauthority
TQString cmd = "iceauth list "+KProcess::quote("netid="+oldNetId);
TQString cmd = ICEAUTH_COMMAND " list "+KProcess::quote("netid="+oldNetId);
FILE *iceFile = popen(TQFile::encodeName(cmd), "r");
if (!iceFile)
{
@ -271,7 +273,7 @@ void KHostName::changeDcop()
if (netId != oldNetId)
continue;
cmd = "iceauth add ";
cmd = ICEAUTH_COMMAND " add ";
cmd += KProcess::quote(protName);
cmd += " '' ";
cmd += KProcess::quote(newNetId);
@ -288,7 +290,7 @@ void KHostName::changeDcop()
char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME");
if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname))
{
TQString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId);
TQString cmd = ICEAUTH_COMMAND " remove "+KProcess::quote("netid="+oldNetId);
system(TQFile::encodeName(cmd));
unlink(origFName.data());
origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link

@ -367,9 +367,9 @@ int main()
close(fd);
xsetenv("ICEAUTHORITY", iceauthority);
fout = popen("iceauth >/dev/null 2>&1", "w");
fout = popen(ICEAUTH_COMMAND " >/dev/null 2>&1", "w");
if (!fout) {
perror("kdesu_stub: popen iceauth");
perror("kdesu_stub: popen " ICEAUTH_COMMAND);
exit(1);
}
for (i=0; host[i]; i++)

Loading…
Cancel
Save