pegasus/src/Pegasus/Common/Executor.cpp - diff

Return to Executor.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Executor.cpp between version 1.1.2.1 and 1.1.2.9

version 1.1.2.1, 2007/01/02 06:17:19

version 1.1.2.9, 2007/01/07 21:39:01

Line 54

#include "Mutex.h"

#include "FileSystem.h"

#include "String.h"

#include <Pegasus/Security/Cimservera/Strlcpy.h>

#include <Executor/Strlcpy.h>

#include <Pegasus/Security/Cimservera/Strlcat.h>

#include <Executor/Strlcat.h>

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

# include <Executor/Executor.h>

# include <Executor/Messages.h>

#endif

#if defined(PEGASUS_PAM_AUTHENTICATION)

# include <Pegasus/Security/Cimservera/cimservera.h>

# include <Executor/PAMAuth.h>

#endif

PEGASUS_NAMESPACE_BEGIN

Line 70

static int _sock = -1;

static Mutex _mutex;

static int _getSock()

{

int sock;

_mutex.lock();

sock = _sock;

_mutex.unlock();

return sock;

}

////////////////////////////////////////////////////////////////////////////////

////

Line 96

Line 105

case 'w':

return fopen(path, "wb");

case 'a':

return fopen(path, "a+");

default:

return NULL;

}

Line 244

Line 256

#else /* POSIX CASE FOLLOWS */

static int InProcess_startProviderAgent(

const SessionKey& sessionKey,

const char* module,

int uid,

int gid,

Line 410

Line 423

return status;

}

static int InProcess_pamAuthenticate(

static int InProcess_authenticatePassword(

const char* username,

const char* password)

const char* password,

SessionKey& sessionKey)

{

sessionKey.clear();

#if defined(PEGASUS_PAM_AUTHENTICATION)

return PAMAuthenticate(username, password);

#else

Line 421

Line 437

#endif

}

static int InProcess_pamValidateUser(

static int InProcess_validateUser(

const char* username)

{

#if defined(PEGASUS_PAM_AUTHENTICATION)

Line 441

Line 457

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

//==============================================================================

// _recv()

// Receives *size* bytes from the given socket.

//==============================================================================

static ssize_t _recv(int sock, void* buffer, size_t size)

{

size_t r = size;

char* p = (char*)buffer;

if (size == 0)

return -1;

while (r)

{

ssize_t n;

EXECUTOR_RESTART(read(sock, p, r), n);

if (n == -1)

return -1;

else if (n == 0)

return size - r;

r -= n;

p += n;

}

return size - r;

}

//==============================================================================

// _send()

// Sends *size* bytes on the given socket.

//==============================================================================

static ssize_t _send(int sock, void* buffer, size_t size)

{

size_t r = size;

char* p = (char*)buffer;

while (r)

{

ssize_t n;

EXECUTOR_RESTART(write(sock, p, r), n);

if (n == -1)

return -1;

else if (n == 0)

return size - r;

r -= n;

p += n;

}

return size - r;

}

static int _receiveDescriptorArray(int sock, int descriptors[], size_t count)

{

// This control data begins with a cmsghdr struct followed by the data

Line 506

Line 586

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_PING_REQUEST;

header.code = EXECUTOR_PING_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

ExecutorPingResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

if (response.magic == EXECUTOR_PING_MAGIC)

Line 531

Line 611

{

AutoMutex autoMutex(_mutex);

if (mode != 'r' && mode != 'w')

if (mode != 'r' && mode != 'w' && mode != 'a')

return NULL;

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_OPEN_FILE_REQUEST;

header.code = EXECUTOR_OPEN_FILE_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return NULL;

// Send request body.

// _send request body.

ExecutorOpenFileRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);

request.mode = mode;

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return NULL;

// Receive the response

ExecutorOpenFileResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return NULL;

// Receive descriptor (if response successful).

Line 565

Line 645

{

int fds[1];

if (_receiveDescriptorArray(_sock, fds, 1) != 0)

if (_receiveDescriptorArray(_getSock(), fds, 1) != 0)

return NULL;

if (fds[0] == -1)

Line 588

Line 668

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_RENAME_FILE_REQUEST;

header.code = EXECUTOR_RENAME_FILE_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body.

// _send request body.

ExecutorRenameFileRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.oldPath, oldPath, EXECUTOR_BUFFER_SIZE);

Strlcpy(request.newPath, newPath, EXECUTOR_BUFFER_SIZE);

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorRenameFileResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

return response.status;

Line 621

Line 701

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_REMOVE_FILE_REQUEST;

header.code = EXECUTOR_REMOVE_FILE_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body.

// _send request body.

ExecutorRemoveFileRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorRemoveFileResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

return response.status;

}

static int OutOfProcess_startProviderAgent(

const SessionKey& sessionKey,

const char* module,

int uid,

int gid,

Line 668

Line 749

if (n >= EXECUTOR_BUFFER_SIZE)

return -1;

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_START_PROVIDER_AGENT_REQUEST;

header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body.

// _send request body.

ExecutorStartProviderAgentRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.key, sessionKey.data(), sizeof(request.key));

memcpy(request.module, module, n);

request.uid = uid;

request.gid = gid;

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorStartProviderAgentResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

// Check response status and pid.

Line 706

Line 788

// Receive descriptors.

int descriptors[2];

int result = _receiveDescriptorArray(_sock, descriptors, 2);

int result = _receiveDescriptorArray(_getSock(), descriptors, 2);

if (result == 0)

{

Line 732

Line 814

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_DAEMONIZE_EXECUTOR_REQUEST;

header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Receive the response

ExecutorDaemonizeExecutorResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

return response.status;

}

static int OutOfProcess_changeOwner(

static int OutOfProcess_waitPid(

const char* path,

int pid)

const char* owner)

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_CHANGE_OWNER_REQUEST;

header.code = EXECUTOR_WAIT_PID_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body:

// _send request body:

ExecutorChangeOwnerRequest request;

ExecutorWaitPidRequest request;

Strlcpy(request.path, path, sizeof(request.path));

request.pid = pid;

Strlcpy(request.owner, owner, sizeof(request.owner));

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorChangeOwnerResponse response;

ExecutorWaitPidResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

return response.status;

}

static int OutOfProcess_waitPid(

static int OutOfProcess_authenticatePassword(

int pid)

const char* username,

const char* password,

SessionKey& sessionKey)

{

AutoMutex autoMutex(_mutex);

// Send request header:

sessionKey.clear();

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_WAIT_PID_REQUEST;

header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body:

// _send request body.

ExecutorWaitPidRequest request;

ExecutorAuthenticatePasswordRequest request;

request.pid = pid;

memset(&request, 0, sizeof(request));

Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);

Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorWaitPidResponse response;

ExecutorAuthenticatePasswordResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

Strlcpy((char*)sessionKey.data(), response.key, sessionKey.size());

return response.status;

}

static int OutOfProcess_pamAuthenticate(

static int OutOfProcess_validateUser(

const char* username,

const char* username)

const char* password)

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_PAM_AUTHENTICATE_REQUEST;

header.code = EXECUTOR_VALIDATE_USER_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body.

// _send request body.

ExecutorPAMAuthenticateRequest request;

ExecutorValidateUserRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);

Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorPAMAuthenticateResponse response;

ExecutorValidateUserResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

return response.status;

}

static int OutOfProcess_pamValidateUser(

int OutOfProcess_challengeLocal(

const char* username)

const char* user,

char challenge[EXECUTOR_BUFFER_SIZE],

SessionKey& sessionKey)

{

AutoMutex autoMutex(_mutex);

// Send request header:

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_PAM_VALIDATE_USER_REQUEST;

header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;

if (Send(_sock, &header, sizeof(header)) != sizeof(header))

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

// Send request body.

// _send request body.

ExecutorPAMValidateUserRequest request;

ExecutorChallengeLocalRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);

Strlcpy(request.user, user, EXECUTOR_BUFFER_SIZE);

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorChallengeLocalResponse response;

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

Strlcpy((char*)sessionKey.data(), response.key, sessionKey.size());

Strlcpy(challenge, response.challenge, EXECUTOR_BUFFER_SIZE);

return response.status;

}

int OutOfProcess_authenticateLocal(

const SessionKey& sessionKey,

const char* token)

{

AutoMutex autoMutex(_mutex);

// _send request header:

ExecutorRequestHeader header;

header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;

if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))

return -1;

if (Send(_sock, &request, sizeof(request)) != sizeof(request))

// _send request body.

ExecutorAuthenticateLocalRequest request;

memset(&request, 0, sizeof(request));

Strlcpy(request.key, (char*)sessionKey.data(), EXECUTOR_BUFFER_SIZE);

Strlcpy(request.token, token, EXECUTOR_BUFFER_SIZE);

if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))

return -1;

// Receive the response

ExecutorPAMValidateUserResponse response;

ExecutorAuthenticateLocalResponse response;

if (Recv(_sock, &response, sizeof(response)) != sizeof(response))

if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))

return -1;

return response.status;

Line 890

Line 1015

////////////////////////////////////////////////////////////////////////////////

void Executor::setExecutorSocket(int sock)

void Executor::setSock(int sock)

{

_mutex.lock();

_sock = sock;

_mutex.unlock();

}

int Executor::detectExecutor()

{

if (_getSock() == -1)

return -1;

else

return 0;

}

int Executor::ping()

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_ping();

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

Line 911

Line 1046

const char* path,

int mode)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_openFile(path, mode);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_openFile(path, mode);

#else

return -1;

return NULL;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

}

Line 925

Line 1060

const char* oldPath,

const char* newPath)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_renameFile(oldPath, newPath);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

Line 938

Line 1073

int Executor::removeFile(

const char* path)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_removeFile(path);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

Line 949

Line 1084

}

int Executor::startProviderAgent(

const SessionKey& sessionKey,

const char* module,

int uid,

int gid,

Line 956

Line 1092

AnonymousPipe*& readPipe,

AnonymousPipe*& writePipe)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_startProviderAgent(

module, uid, gid, pid, readPipe, writePipe);

sessionKey, module, uid, gid, pid, readPipe, writePipe);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_startProviderAgent(

module, uid, gid, pid, readPipe, writePipe);

sessionKey, module, uid, gid, pid, readPipe, writePipe);

#else

return -1;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

Line 970

Line 1106

int Executor::daemonizeExecutor()

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_daemonizeExecutor();

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

Line 980

Line 1116

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

}

int Executor::changeOwner(

int Executor::waitPid(

const char* path,

int pid)

const char* owner)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_changeOwner(path, owner);

return InProcess_waitPid(pid);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_changeOwner(path, owner);

return OutOfProcess_waitPid(pid);

#else

return -1;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

}

int Executor::waitPid(

int Executor::authenticatePassword(

int pid)

const char* username,

const char* password,

SessionKey& sessionKey)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_waitPid(pid);

return InProcess_authenticatePassword(username, password, sessionKey);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_waitPid(pid);

return OutOfProcess_authenticatePassword(username, password, sessionKey);

#else

return -1;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

}

int Executor::pamAuthenticate(

int Executor::validateUser(

const char* username,

const char* username)

const char* password)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_pamAuthenticate(username, password);

return InProcess_validateUser(username);

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_pamAuthenticate(username, password);

return OutOfProcess_validateUser(username);

#else

return -1;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

}

int Executor::pamValidateUser(

int Executor::challengeLocal(

const char* username)

const char* user,

char path[EXECUTOR_BUFFER_SIZE],

SessionKey& sessionKey)

{

if (_getSock() == -1)

return -1;

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_challengeLocal(user, path, sessionKey);

#else

return -1;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

}

int Executor::authenticateLocal(

const SessionKey& sessionKey,

const char* challengeResponse)

{

if (_sock == -1)

if (_getSock() == -1)

return InProcess_pamValidateUser(username);

return -1;

#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)

return OutOfProcess_pamValidateUser(username);

return OutOfProcess_authenticateLocal(sessionKey, challengeResponse);

#else

return -1;

#endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

Legend:

Removed from v.1.1.2.1
changed lines
	Added in v.1.1.2.9

No CVS admin address has been configured