(file) Return to Executor.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

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

version 1.1.2.9, 2007/01/07 21:39:01 version 1.5, 2007/06/06 19:51:53
Line 33 
Line 33 
  
 #include <cstdio> #include <cstdio>
 #include <cstdlib> #include <cstdlib>
 #include <cstdlib>  
 #include <cstring> #include <cstring>
  
   #include <Pegasus/Common/Config.h>
   
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
 #  include <windows.h> #  include <windows.h>
 #else #else
 # include <sys/types.h>  
 # include <sys/socket.h>  
 # include <unistd.h>  
 # include <fcntl.h>  
 # include <sys/wait.h>  
 # include <unistd.h> # include <unistd.h>
   # include <sys/types.h>
 # include <sys/time.h> # include <sys/time.h>
 # include <sys/resource.h> # include <sys/resource.h>
 #endif #endif
  
 #include "Constants.h"  #if defined(PEGASUS_HAS_SIGNALS)
 #include "Executor.h"  # include <sys/wait.h>
 #include "Mutex.h"  #endif
 #include "FileSystem.h"  
 #include "String.h"  #include <Pegasus/Common/Constants.h>
   #include <Pegasus/Common/Mutex.h>
   #include <Pegasus/Common/FileSystem.h>
   #include <Pegasus/Common/String.h>
   #include <Pegasus/Common/Tracer.h>
   #include <Pegasus/Common/System.h>
   #include <Pegasus/Common/Executor.h>
   
 #include <Executor/Strlcpy.h> #include <Executor/Strlcpy.h>
 #include <Executor/Strlcat.h>  
  
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
   # include <Executor/Socket.h>
 # include <Executor/Messages.h> # include <Executor/Messages.h>
 #endif #endif
  
Line 67 
Line 71 
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 static int _sock = -1;  ////////////////////////////////////////////////////////////////////////////////
 static Mutex _mutex;  //
   //
   // class ExecutorImpl
   //
   //
   ////////////////////////////////////////////////////////////////////////////////
  
 static int _getSock()  class ExecutorImpl
   {
   public:
   
       virtual ~ExecutorImpl()
 { {
     int sock;  
     _mutex.lock();  
     sock = _sock;  
     _mutex.unlock();  
     return sock;  
 } }
  
       virtual int detectExecutor() = 0;
   
       virtual int ping() = 0;
   
       virtual FILE* openFile(
           const char* path,
           int mode) = 0;
   
       virtual int renameFile(
           const char* oldPath,
           const char* newPath) = 0;
   
       virtual int removeFile(
           const char* path) = 0;
   
       virtual int startProviderAgent(
           const char* module,
           const String& pegasusHome,
           const String& userName,
           int& pid,
           AnonymousPipe*& readPipe,
           AnonymousPipe*& writePipe) = 0;
   
       virtual int daemonizeExecutor() = 0;
   
       virtual int reapProviderAgent(
           int pid) = 0;
   
       virtual int authenticatePassword(
           const char* username,
           const char* password) = 0;
   
       virtual int validateUser(
           const char* username) = 0;
   
       virtual int challengeLocal(
           const char* username,
           char challengeFilePath[EXECUTOR_BUFFER_SIZE]) = 0;
   
       virtual int authenticateLocal(
           const char* challengeFilePath,
           const char* response) = 0;
   };
   
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////  //
 ////  //
 //// InProcess stubs:  // class ExecutorLoopbackImpl
 ////  //
 ////////////////////////////////////////////////////////////////////////////////  //
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
 static int InProcess_ping()  class ExecutorLoopbackImpl : public ExecutorImpl
   {
   public:
   
       virtual ~ExecutorLoopbackImpl()
 { {
     // Nothing to do.  
     return 0;  
 } }
  
 FILE* InProcess_openFile(      virtual int detectExecutor()
       {
           return -1;
       }
   
       virtual int ping()
       {
           return -1;
       }
   
       virtual FILE* openFile(
     const char* path,     const char* path,
     int mode)     int mode)
 { {
Line 113 
Line 177 
     }     }
 } }
  
 static int InProcess_renameFile(      virtual int renameFile(
     const char* oldPath,     const char* oldPath,
     const char* newPath)     const char* newPath)
 { {
     return FileSystem::renameFile(oldPath, newPath) ? 0 : -1;     return FileSystem::renameFile(oldPath, newPath) ? 0 : -1;
 } }
  
 static int InProcess_removeFile(  
       virtual int removeFile(
     const char* path)     const char* path)
 { {
     return FileSystem::removeFile(path) ? 0 : -1;     return FileSystem::removeFile(path) ? 0 : -1;
 } }
  
 static int _getProviderAgentPath(String& path)  
 {  
     // ATTN: is this really a sufficient replacement for getHomedPath().  
     // Does getHomedPath() use the configuration file?  
   
     path = PEGASUS_PROVIDER_AGENT_PROC_NAME;  
   
     if (path[0] != '/')  
     {  
         const char* env = getenv("PEGASUS_HOME");  
   
         if (!env)  
             return -1;  
   
         path = String(env) + String("/") + path;  
     }  
   
     return 0;  
 }  
   
 #if defined(PEGASUS_OS_TYPE_WINDOWS)  
  
 static int InProcess_startProviderAgent(      virtual int startProviderAgent(
     const char* module,     const char* module,
     int uid,          const String& pegasusHome,
     int gid,          const String& userName,
     int& pid,     int& pid,
     AnonymousPipe*& readPipe,     AnonymousPipe*& readPipe,
     AnonymousPipe*& writePipe)     AnonymousPipe*& writePipe)
 { {
           // Add logging here.
   
   #if defined(PEGASUS_OS_TYPE_WINDOWS)
   
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
     // Set output parameters in case of failure.     // Set output parameters in case of failure.
Line 166 
Line 214 
  
     // Create pipes. Export handles to string.     // Create pipes. Export handles to string.
  
     AnonymousPipe* pipeFromAgent = new AnonymousPipe();          AutoPtr<AnonymousPipe> pipeFromAgent(new AnonymousPipe());
     AnonymousPipe* pipeToAgent = new AnonymousPipe();          AutoPtr<AnonymousPipe> pipeToAgent(new AnonymousPipe());
  
     char readHandle[32];     char readHandle[32];
     char writeHandle[32];     char writeHandle[32];
Line 187 
Line 235 
  
     // Build full path of "cimprovagt" program.     // Build full path of "cimprovagt" program.
  
     String path;          String path = FileSystem::getAbsolutePath(
               pegasusHome.getCString(), PEGASUS_PROVIDER_AGENT_PROC_NAME);
     if (_getProviderAgentPath(path) != 0)  
     {  
         delete pipeToAgent;  
         delete pipeFromAgent;  
         return -1;  
     }  
  
     // Format command line.     // Format command line.
  
Line 220 
Line 262 
         &siStartInfo,  //  STARTUPINFO         &siStartInfo,  //  STARTUPINFO
         &piProcInfo))  //  PROCESS_INFORMATION         &piProcInfo))  //  PROCESS_INFORMATION
     {     {
         delete pipeToAgent;  
         delete pipeFromAgent;  
         return -1;         return -1;
     }     }
  
Line 233 
Line 273 
     pipeToAgent->closeReadHandle();     pipeToAgent->closeReadHandle();
     pipeFromAgent->closeWriteHandle();     pipeFromAgent->closeWriteHandle();
  
     readPipe = pipeFromAgent;          readPipe = pipeFromAgent.release();
     writePipe = pipeToAgent;          writePipe = pipeToAgent.release();
  
     return 0;     return 0;
 }  
   
 #elif defined(PEGASUS_OS_OS400)  
   
 static int InProcess_startProviderAgent(  
     const char* module,  
     int uid,  
     int gid,  
     int& pid,  
     AnonymousPipe*& readPipe,  
     AnonymousPipe*& writePipe)  
 {  
     // ATTN: no implementation for OS400.  
     return -1;  
 }  
  
 #else /* POSIX CASE FOLLOWS */ #else /* POSIX CASE FOLLOWS */
  
 static int InProcess_startProviderAgent(  
     const SessionKey& sessionKey,  
     const char* module,  
     int uid,  
     int gid,  
     int& pid,  
     AnonymousPipe*& readPipe,  
     AnonymousPipe*& writePipe)  
 {  
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
     // Initialize output parameters in case of error.     // Initialize output parameters in case of error.
Line 281 
Line 297 
     {     {
         // Resolve full path of "cimprovagt".         // Resolve full path of "cimprovagt".
  
         String path;              String path = FileSystem::getAbsolutePath(
                   pegasusHome.getCString(), PEGASUS_PROVIDER_AGENT_PROC_NAME);
  
         if (_getProviderAgentPath(path) != 0)  # if !defined(PEGASUS_DISABLE_PROV_USERCTXT)
   
               PEGASUS_UID_T newUid = (PEGASUS_UID_T)-1;
               PEGASUS_GID_T newGid = (PEGASUS_GID_T)-1;
   
               if (userName != System::getEffectiveUserName())
               {
                   if (!System::lookupUserId(
                            userName.getCString(), newUid, newGid))
                   {
                       PEG_TRACE((TRC_DISCARDED_DATA, Tracer::LEVEL2,
                           "System::lookupUserId(%s) failed.",
                           (const char*)userName.getCString()));
             return -1;             return -1;
                   }
               }
   
   # endif /* !defined(PEGASUS_DISABLE_PROV_USERCTXT) */
  
         // Create "to-agent" pipe:         // Create "to-agent" pipe:
  
Line 298 
Line 331 
  
         // Fork process:         // Fork process:
  
 #if !defined(PEGASUS_OS_VMS)  # if defined(PEGASUS_OS_VMS)
         pid = (int)vfork();         pid = (int)vfork();
 #else #else
         pid = (int)fork();         pid = (int)fork();
Line 311 
Line 344 
  
         if (pid == 0)         if (pid == 0)
         {         {
   # if !defined(PEGASUS_OS_VMS)
             // Close unused pipe descriptors:             // Close unused pipe descriptors:
  
             close(to[1]);             close(to[1]);
             close(from[0]);             close(from[0]);
  
 #if !defined(PEGASUS_OS_VMS)  
  
             // Close unused descriptors. Leave stdin, stdout, stderr, and the                  // Close unused descriptors. Leave stdin, stdout, stderr,
             // child's pipe descriptors open.                  // and the child's pipe descriptors open.
  
             struct rlimit rlim;             struct rlimit rlim;
  
Line 334 
Line 367 
  
 #endif /* !defined(PEGASUS_OS_VMS) */ #endif /* !defined(PEGASUS_OS_VMS) */
  
             // Set uid and gid for the new provider agent process.  
   
 # if !defined(PEGASUS_DISABLE_PROV_USERCTXT) # if !defined(PEGASUS_DISABLE_PROV_USERCTXT)
  
             if (uid != -1 && gid != -1)                  // Set uid and gid for the new provider agent process.
             {  
                 if ((int)getgid() != gid)  
                 {  
                     // ATTN: log failure!  
                     setgid(gid);  
                 }  
  
                 if ((int)getuid() != uid)                  if (newUid != (PEGASUS_UID_T)-1 && newGid != (PEGASUS_GID_T)-1)
                 {                 {
                     // ATTN: log failure!                      if (!System::changeUserContext_SingleThreaded(
                     setuid(uid);                               userName.getCString(), newUid, newGid))
                       {
                           return -1;
                 }                 }
             }             }
  
Line 364 
Line 391 
  
             {             {
                 CString cstr = path.getCString();                 CString cstr = path.getCString();
                 execl(cstr, cstr, arg1, arg2, module, (char*)0);                      if (execl(cstr, cstr, arg1, arg2, module, (char*)0) == -1)
                       {
                           PEG_TRACE((TRC_DISCARDED_DATA, Tracer::LEVEL2,
                               "execl() failed.  errno = %d.", errno));
                 _exit(1);                 _exit(1);
             }             }
                   }
             // ATTN: log failure!  
         }         }
     }     }
     while (0);     while (0);
Line 395 
Line 424 
     writePipe = new AnonymousPipe(0, writeFdStr);     writePipe = new AnonymousPipe(0, writeFdStr);
  
     return 0;     return 0;
 }  
  
 #endif /* !defined(START_PROVIDER_AGENT) */ #endif /* !defined(START_PROVIDER_AGENT) */
   
 static int InProcess_daemonizeExecutor()  
 {  
     // Nothing to do.  
     return 0;  
 } }
  
 static int InProcess_changeOwner(      virtual int daemonizeExecutor()
     const char* path,  
     const char* owner)  
 { {
     return FileSystem::changeFileOwner(path, owner) ? 0 : -1;          return -1;
 } }
  
 static int InProcess_waitPid(      virtual int reapProviderAgent(
     int pid)     int pid)
 { {
     int status;          int status = 0;
  
   #if defined(PEGASUS_HAS_SIGNALS)
     while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)     while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)
         ;         ;
   #endif
  
     return status;     return status;
 } }
  
 static int InProcess_authenticatePassword(      virtual int authenticatePassword(
     const char* username,     const char* username,
     const char* password,          const char* password)
     SessionKey& sessionKey)  
 { {
     sessionKey.clear();  
   
 #if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
     return PAMAuthenticate(username, password);     return PAMAuthenticate(username, password);
 #else #else
           // ATTN: not handled so don't call in this case.
     return -1;     return -1;
 #endif #endif
 } }
  
 static int InProcess_validateUser(      virtual int validateUser(
     const char* username)     const char* username)
 { {
 #if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
     return PAMValidateUser(username);     return PAMValidateUser(username);
 #else #else
           // ATTN: not handled so don't call in this case.
     return -1;     return -1;
 #endif #endif
 } }
  
 ////////////////////////////////////////////////////////////////////////////////      virtual int challengeLocal(
 ////////////////////////////////////////////////////////////////////////////////          const char* username,
 ////          char challengeFilePath[EXECUTOR_BUFFER_SIZE])
 //// Out-of-process stubs.  
 ////  
 ////////////////////////////////////////////////////////////////////////////////  
 ////////////////////////////////////////////////////////////////////////////////  
   
 #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;          // ATTN: not handled so don't call in this case.
     char* p = (char*)buffer;  
   
     if (size == 0)  
         return -1;         return -1;
       }
  
     while (r)      virtual int authenticateLocal(
           const char* challengeFilePath,
           const char* response)
     {     {
         ssize_t n;          // ATTN: not handled so don't call in this case.
   
         EXECUTOR_RESTART(read(sock, p, r), n);  
   
         if (n == -1)  
             return -1;             return -1;
         else if (n == 0)  
             return size - r;  
   
         r -= n;  
         p += n;  
     }     }
  
     return size - r;  private:
 }  
       Mutex _mutex;
   };
  
 //==============================================================================  ////////////////////////////////////////////////////////////////////////////////
   //
 // //
 // _send()  // class ExecutorSocketImpl : public ExecutorImpl
 // //
 //     Sends *size* bytes on the given socket.  
 // //
 //==============================================================================  ////////////////////////////////////////////////////////////////////////////////
  
 static ssize_t _send(int sock, void* buffer, size_t size)  #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
 {  
     size_t r = size;  
     char* p = (char*)buffer;  
  
     while (r)  class ExecutorSocketImpl : public ExecutorImpl
     {     {
         ssize_t n;  public:
         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;      ExecutorSocketImpl(int sock) : _sock(sock)
 }  
   
 static int _receiveDescriptorArray(int sock, int descriptors[], size_t count)  
 { {
     // This control data begins with a cmsghdr struct followed by the data      }
     // (a descriptor in this case). The union ensures that the data is aligned  
     // suitably for the leading cmsghdr struct. The descriptor itself is  
     // properly aligned since the cmsghdr ends on a boundary that is suitably  
     // aligned for any type (including int).  
     //  
     //     ControlData = [ cmsghdr | int ]  
   
     size_t size = CMSG_SPACE(sizeof(int) * count);  
     char* data = (char*)malloc(size);  
   
     // Define a msghdr that refers to the control data, which is filled in  
     // by calling recvmsg() below.  
   
     msghdr mh;  
     memset(&mh, 0, sizeof(mh));  
     mh.msg_control = data;  
     mh.msg_controllen = size;  
   
     // The other process sends a single-byte message. This byte is not  
     // used since we only need the control data (the descriptor) but we  
     // must request at least one byte from recvmsg().  
   
     struct iovec iov[1];  
     memset(iov, 0, sizeof(iov));  
   
     char dummy;  
     iov[0].iov_base = &dummy;  
     iov[0].iov_len = 1;  
     mh.msg_iov = iov;  
     mh.msg_iovlen = 1;  
   
     // Receive the message from the other process.  
   
     ssize_t n = recvmsg(sock, &mh, 0);  
   
     if (n <= 0)  
         return -1;  
   
     // Get a pointer to control message. Return if the header is null or does  
     // not contain what we expect.  
   
     cmsghdr* cmh = CMSG_FIRSTHDR(&mh);  
  
     if (!cmh ||      virtual ~ExecutorSocketImpl()
         cmh->cmsg_len != CMSG_LEN(sizeof(int) * count) ||  
         cmh->cmsg_level != SOL_SOCKET ||  
         cmh->cmsg_type != SCM_RIGHTS)  
     {     {
         return -1;  
     }     }
  
     // Copy the data:      virtual int detectExecutor()
       {
     memcpy(descriptors, CMSG_DATA(cmh), sizeof(int) * count);  
   
     return 0;     return 0;
 } }
  
 static int OutOfProcess_ping()      virtual int ping()
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
Line 591 
Line 526 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_PING_MESSAGE;     header.code = EXECUTOR_PING_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     ExecutorPingResponse response;     ExecutorPingResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     if (response.magic == EXECUTOR_PING_MAGIC)     if (response.magic == EXECUTOR_PING_MAGIC)
Line 605 
Line 540 
     return -1;     return -1;
 } }
  
 FILE* OutOfProcess_openFile(      virtual FILE* openFile(
     const char* path,     const char* path,
     int mode)     int mode)
 { {
Line 619 
Line 554 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_OPEN_FILE_MESSAGE;     header.code = EXECUTOR_OPEN_FILE_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return NULL;         return NULL;
  
     // _send request body.     // _send request body.
Line 629 
Line 564 
     Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);
     request.mode = mode;     request.mode = mode;
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return NULL;         return NULL;
  
     // Receive the response     // Receive the response
  
     ExecutorOpenFileResponse response;     ExecutorOpenFileResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return NULL;         return NULL;
  
     // Receive descriptor (if response successful).     // Receive descriptor (if response successful).
Line 645 
Line 580 
     {     {
         int fds[1];         int fds[1];
  
         if (_receiveDescriptorArray(_getSock(), fds, 1) != 0)              if (RecvDescriptorArray(_sock, fds, 1) != 0)
             return NULL;             return NULL;
  
         if (fds[0] == -1)         if (fds[0] == -1)
Line 662 
Line 597 
     return NULL;     return NULL;
 } }
  
 static int OutOfProcess_renameFile(      virtual int renameFile(
     const char* oldPath,     const char* oldPath,
     const char* newPath)     const char* newPath)
 { {
Line 673 
Line 608 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_RENAME_FILE_MESSAGE;     header.code = EXECUTOR_RENAME_FILE_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
Line 683 
Line 618 
     Strlcpy(request.oldPath, oldPath, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.oldPath, oldPath, EXECUTOR_BUFFER_SIZE);
     Strlcpy(request.newPath, newPath, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.newPath, newPath, EXECUTOR_BUFFER_SIZE);
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorRenameFileResponse response;     ExecutorRenameFileResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     return response.status;     return response.status;
 } }
  
 static int OutOfProcess_removeFile(      virtual int removeFile(
     const char* path)     const char* path)
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
Line 706 
Line 641 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_REMOVE_FILE_MESSAGE;     header.code = EXECUTOR_REMOVE_FILE_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
Line 715 
Line 650 
     memset(&request, 0, sizeof(request));     memset(&request, 0, sizeof(request));
     Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorRemoveFileResponse response;     ExecutorRemoveFileResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     return response.status;     return response.status;
 } }
  
 static int OutOfProcess_startProviderAgent(      virtual int startProviderAgent(
     const SessionKey& sessionKey,  
     const char* module,     const char* module,
     int uid,          const String& pegasusHome,
     int gid,          const String& userName,
     int& pid,     int& pid,
     AnonymousPipe*& readPipe,     AnonymousPipe*& readPipe,
     AnonymousPipe*& writePipe)     AnonymousPipe*& writePipe)
Line 744 
Line 678 
  
     // Reject strings longer than EXECUTOR_BUFFER_SIZE.     // Reject strings longer than EXECUTOR_BUFFER_SIZE.
  
     size_t n = strlen(module);          size_t moduleNameLength = strlen(module);
  
     if (n >= EXECUTOR_BUFFER_SIZE)          if (moduleNameLength >= EXECUTOR_BUFFER_SIZE)
               return -1;
   
           CString userNameCString = userName.getCString();
           size_t userNameLength = strlen(userNameCString);
   
           if (userNameLength >= EXECUTOR_BUFFER_SIZE)
         return -1;         return -1;
  
     // _send request header:     // _send request header:
Line 754 
Line 694 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;     header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
  
     ExecutorStartProviderAgentRequest request;     ExecutorStartProviderAgentRequest request;
     memset(&request, 0, sizeof(request));     memset(&request, 0, sizeof(request));
     Strlcpy(request.key, sessionKey.data(), sizeof(request.key));          memcpy(request.module, module, moduleNameLength);
     memcpy(request.module, module, n);          memcpy(request.userName, userNameCString, userNameLength);
     request.uid = uid;  
     request.gid = gid;  
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorStartProviderAgentResponse response;     ExecutorStartProviderAgentResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     // Check response status and pid.     // Check response status and pid.
Line 788 
Line 726 
     // Receive descriptors.     // Receive descriptors.
  
     int descriptors[2];     int descriptors[2];
     int result = _receiveDescriptorArray(_getSock(), descriptors, 2);          int result = RecvDescriptorArray(_sock, descriptors, 2);
  
     if (result == 0)     if (result == 0)
     {     {
         int readFd = descriptors[0];         int readFd = descriptors[0];
         int writeFd = descriptors[1];         int writeFd = descriptors[1];
  
         // Create to and from AnonymousPipe instances to correspond to the pipe              // Create to and from AnonymousPipe instances to correspond to
         // descriptors created above.              // the pipe descriptors created above.
  
         char readFdStr[32];         char readFdStr[32];
         char writeFdStr[32];         char writeFdStr[32];
Line 810 
Line 748 
     return result;     return result;
 } }
  
 static int OutOfProcess_daemonizeExecutor()      virtual int daemonizeExecutor()
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
Line 819 
Line 757 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;     header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorDaemonizeExecutorResponse response;     ExecutorDaemonizeExecutorResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     return response.status;     return response.status;
 } }
  
 static int OutOfProcess_waitPid(      virtual int reapProviderAgent(
     int pid)     int pid)
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
Line 840 
Line 778 
     // _send request header:     // _send request header:
  
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_WAIT_PID_MESSAGE;          header.code = EXECUTOR_REAP_PROVIDER_AGENT;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body:     // _send request body:
  
     ExecutorWaitPidRequest request;          ExecutorReapProviderAgentRequest request;
           memset(&request, 0, sizeof(request));
     request.pid = pid;     request.pid = pid;
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorWaitPidResponse response;          ExecutorReapProviderAgentResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     return response.status;     return response.status;
 } }
  
 static int OutOfProcess_authenticatePassword(      virtual int authenticatePassword(
     const char* username,     const char* username,
     const char* password,          const char* password)
     SessionKey& sessionKey)  
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
     sessionKey.clear();  
   
     // _send request header:     // _send request header:
  
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;     header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
Line 887 
Line 823 
     Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);
     Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorAuthenticatePasswordResponse response;     ExecutorAuthenticatePasswordResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     Strlcpy((char*)sessionKey.data(), response.key, sessionKey.size());  
   
     return response.status;     return response.status;
 } }
  
 static int OutOfProcess_validateUser(      virtual int validateUser(
     const char* username)     const char* username)
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
Line 912 
Line 846 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_VALIDATE_USER_MESSAGE;     header.code = EXECUTOR_VALIDATE_USER_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
Line 921 
Line 855 
     memset(&request, 0, sizeof(request));     memset(&request, 0, sizeof(request));
     Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);     Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorValidateUserResponse response;     ExecutorValidateUserResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     return response.status;     return response.status;
 } }
  
 int OutOfProcess_challengeLocal(      virtual int challengeLocal(
     const char* user,          const char* username,
     char challenge[EXECUTOR_BUFFER_SIZE],          char challengeFilePath[EXECUTOR_BUFFER_SIZE])
     SessionKey& sessionKey)  
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
Line 946 
Line 879 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;     header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
  
     ExecutorChallengeLocalRequest request;     ExecutorChallengeLocalRequest request;
     memset(&request, 0, sizeof(request));     memset(&request, 0, sizeof(request));
     Strlcpy(request.user, user, EXECUTOR_BUFFER_SIZE);          Strlcpy(request.user, username, EXECUTOR_BUFFER_SIZE);
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorChallengeLocalResponse response;     ExecutorChallengeLocalResponse response;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response, sizeof(response)) != sizeof(response))
         return -1;         return -1;
  
     Strlcpy((char*)sessionKey.data(), response.key, sessionKey.size());          Strlcpy(challengeFilePath, response.challenge, EXECUTOR_BUFFER_SIZE);
     Strlcpy(challenge, response.challenge, EXECUTOR_BUFFER_SIZE);  
  
     return response.status;     return response.status;
 } }
  
 int OutOfProcess_authenticateLocal(      virtual int authenticateLocal(
     const SessionKey& sessionKey,          const char* challengeFilePath,
     const char* token)          const char* response)
 { {
     AutoMutex autoMutex(_mutex);     AutoMutex autoMutex(_mutex);
  
Line 982 
Line 914 
     ExecutorRequestHeader header;     ExecutorRequestHeader header;
     header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;     header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;
  
     if (_send(_getSock(), &header, sizeof(header)) != sizeof(header))          if (_send(_sock, &header, sizeof(header)) != sizeof(header))
         return -1;         return -1;
  
     // _send request body.     // _send request body.
  
     ExecutorAuthenticateLocalRequest request;     ExecutorAuthenticateLocalRequest request;
     memset(&request, 0, sizeof(request));     memset(&request, 0, sizeof(request));
     Strlcpy(request.key, (char*)sessionKey.data(), EXECUTOR_BUFFER_SIZE);          Strlcpy(request.challenge, challengeFilePath, EXECUTOR_BUFFER_SIZE);
     Strlcpy(request.token, token, EXECUTOR_BUFFER_SIZE);          Strlcpy(request.response, response, EXECUTOR_BUFFER_SIZE);
  
     if (_send(_getSock(), &request, sizeof(request)) != sizeof(request))          if (_send(_sock, &request, sizeof(request)) != sizeof(request))
         return -1;         return -1;
  
     // Receive the response     // Receive the response
  
     ExecutorAuthenticateLocalResponse response;          ExecutorAuthenticateLocalResponse response_;
  
     if (_recv(_getSock(), &response, sizeof(response)) != sizeof(response))          if (_recv(_sock, &response_, sizeof(response_)) != sizeof(response_))
         return -1;         return -1;
  
     return response.status;          return response_.status;
       }
   
   private:
   
       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;
       }
   
       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;
 } }
  
       int _sock;
       Mutex _mutex;
   };
   
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */ #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
   //
   //
   // class Executor
   //
   //
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
 ////  
 //// Executor Methods:  static int _executorSock = -1;
 ////  static AutoPtr<ExecutorImpl> _executorImpl;
 ////////////////////////////////////////////////////////////////////////////////  static Mutex _executorMutex;
 ////////////////////////////////////////////////////////////////////////////////  
   static ExecutorImpl* _getImpl()
   {
       // Use the double-checked locking technique to avoid the overhead of a lock
       // on every call.
   
       if (_executorImpl.get() == 0)
       {
           AutoMutex autoMutex(_executorMutex);
   
           if (_executorImpl.get() == 0)
           {
   #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
               if (_executorSock == -1)
                   _executorImpl.reset(new ExecutorLoopbackImpl());
               else
                   _executorImpl.reset(new ExecutorSocketImpl(_executorSock));
   #else
               _executorImpl.reset(new ExecutorLoopbackImpl());
   #endif
           }
       }
   
       return _executorImpl.get();
   }
  
 void Executor::setSock(int sock) void Executor::setSock(int sock)
 { {
     _mutex.lock();      AutoMutex autoMutex(_executorMutex);
     _sock = sock;      _executorSock = sock;
     _mutex.unlock();  
 } }
  
 int Executor::detectExecutor() int Executor::detectExecutor()
 { {
     if (_getSock() == -1)      return _getImpl()->detectExecutor();
         return -1;  
     else  
         return 0;  
 } }
  
 int Executor::ping() int Executor::ping()
 { {
     if (_getSock() == -1)      return _getImpl()->ping();
         return InProcess_ping();  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_ping();  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 FILE* Executor::openFile( FILE* Executor::openFile(
     const char* path,     const char* path,
     int mode)     int mode)
 { {
     if (_getSock() == -1)      return _getImpl()->openFile(path, mode);
         return InProcess_openFile(path, mode);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_openFile(path, mode);  
 #else  
     return NULL;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::renameFile( int Executor::renameFile(
     const char* oldPath,     const char* oldPath,
     const char* newPath)     const char* newPath)
 { {
     if (_getSock() == -1)      return _getImpl()->renameFile(oldPath, newPath);
         return InProcess_renameFile(oldPath, newPath);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_renameFile(oldPath, newPath);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::removeFile( int Executor::removeFile(
     const char* path)     const char* path)
 { {
     if (_getSock() == -1)      return _getImpl()->removeFile(path);
         return InProcess_removeFile(path);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_removeFile(path);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::startProviderAgent( int Executor::startProviderAgent(
     const SessionKey& sessionKey,  
     const char* module,     const char* module,
     int uid,      const String& pegasusHome,
     int gid,      const String& userName,
     int& pid,     int& pid,
     AnonymousPipe*& readPipe,     AnonymousPipe*& readPipe,
     AnonymousPipe*& writePipe)     AnonymousPipe*& writePipe)
 { {
     if (_getSock() == -1)      return _getImpl()->startProviderAgent(
         return InProcess_startProviderAgent(          module, pegasusHome, userName, pid, readPipe, writePipe);
             sessionKey, module, uid, gid, pid, readPipe, writePipe);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_startProviderAgent(  
         sessionKey, module, uid, gid, pid, readPipe, writePipe);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::daemonizeExecutor() int Executor::daemonizeExecutor()
 { {
     if (_getSock() == -1)      return _getImpl()->daemonizeExecutor();
         return InProcess_daemonizeExecutor();  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_daemonizeExecutor();  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::waitPid(  int Executor::reapProviderAgent(
     int pid)     int pid)
 { {
     if (_getSock() == -1)      return _getImpl()->reapProviderAgent(pid);
         return InProcess_waitPid(pid);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_waitPid(pid);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::authenticatePassword( int Executor::authenticatePassword(
     const char* username,     const char* username,
     const char* password,      const char* password)
     SessionKey& sessionKey)  
 { {
     if (_getSock() == -1)      return _getImpl()->authenticatePassword(username, password);
         return InProcess_authenticatePassword(username, password, sessionKey);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_authenticatePassword(username, password, sessionKey);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::validateUser( int Executor::validateUser(
     const char* username)     const char* username)
 { {
     if (_getSock() == -1)      return _getImpl()->validateUser(username);
         return InProcess_validateUser(username);  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_validateUser(username);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 int Executor::challengeLocal( int Executor::challengeLocal(
     const char* user,     const char* user,
     char path[EXECUTOR_BUFFER_SIZE],      char challengeFilePath[EXECUTOR_BUFFER_SIZE])
     SessionKey& sessionKey)  
 { {
     if (_getSock() == -1)      return _getImpl()->challengeLocal(user, challengeFilePath);
         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( int Executor::authenticateLocal(
     const SessionKey& sessionKey,      const char* challengeFilePath,
     const char* challengeResponse)      const char* response)
 { {
     if (_getSock() == -1)      return _getImpl()->authenticateLocal(challengeFilePath, response);
         return -1;  
   
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)  
     return OutOfProcess_authenticateLocal(sessionKey, challengeResponse);  
 #else  
     return -1;  
 #endif /* defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */  
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

Legend:
Removed from v.1.1.2.9  
changed lines
  Added in v.1.5
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2