(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.4.4 and 1.12.4.1

version 1.1.4.4, 2007/03/30 00:35:02 version 1.12.4.1, 2007/11/09 19:05:07
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 <Executor/Socket.h>  
 # 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/Once.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 66 
Line 70 
 # include <Executor/PAMAuth.h> # include <Executor/PAMAuth.h>
 #endif #endif
  
   #ifdef PEGASUS_OS_PASE
   # include <as400_protos.h> // For fork400()
   #endif
   
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 101 
Line 109 
  
     virtual int 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) = 0;         AnonymousPipe*& writePipe) = 0;
Line 121 
Line 129 
  
     virtual int challengeLocal(     virtual int challengeLocal(
         const char* username,         const char* username,
         char challenge[EXECUTOR_BUFFER_SIZE]) = 0;          char challengeFilePath[EXECUTOR_BUFFER_SIZE]) = 0;
  
     virtual int authenticateLocal(     virtual int authenticateLocal(
         const char* challenge,          const char* challengeFilePath,
         const char* response) = 0;         const char* response) = 0;
   
       virtual int updateLogLevel(
           const char* logLevel) = 0;
 }; };
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 191 
Line 202 
  
     virtual int 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)
     {     {
   #if !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
   
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
  
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
Line 209 
Line 222 
  
         // 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 230 
Line 243 
  
         // 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 263 
Line 270 
             &siStartInfo,  //  STARTUPINFO             &siStartInfo,  //  STARTUPINFO
             &piProcInfo))  //  PROCESS_INFORMATION             &piProcInfo))  //  PROCESS_INFORMATION
         {         {
             delete pipeToAgent;  
             delete pipeFromAgent;  
             return -1;             return -1;
         }         }
  
Line 276 
Line 281 
         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)  
   
         // ATTN: no implementation for OS400.  
         return -1;  
   
 #else /* POSIX CASE FOLLOWS */ #else /* POSIX CASE FOLLOWS */
  
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
Line 305 
Line 305 
         {         {
             // 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) && !defined(PEGASUS_OS_ZOS)
   
               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 324 
Line 341 
  
 #if defined(PEGASUS_OS_VMS) #if defined(PEGASUS_OS_VMS)
             pid = (int)vfork();             pid = (int)vfork();
   # elif defined(PEGASUS_OS_PASE)
               pid = (int)fork400("QUMEPRVAGT",0);
 #else #else
             pid = (int)fork();             pid = (int)fork();
 #endif #endif
Line 335 
Line 354 
  
             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,                 // Close unused descriptors. Leave stdin, stdout, stderr,
                 // and the child's pipe descriptors open.                 // and the child's pipe descriptors open.
Line 358 
Line 377 
  
 #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) && !defined(PEGASUS_OS_ZOS)
  
 # if !defined(PEGASUS_DISABLE_PROV_USERCTXT)                  // Set uid and gid for the new provider agent process.
  
                 if (uid != -1 && gid != -1)                  if (newUid != (PEGASUS_UID_T)-1 && newGid != (PEGASUS_GID_T)-1)
                 {  
                     if ((int)getgid() != gid)  
                     {                     {
                         // ATTN: log failure!                      if (!System::changeUserContext_SingleThreaded(
                         setgid(gid);                               userName.getCString(), newUid, newGid))
                     }  
   
                     if ((int)getuid() != uid)  
                     {                     {
                         // ATTN: log failure!                          return -1;
                         setuid(uid);  
                     }                     }
                 }                 }
  
Line 388 
Line 401 
  
                 {                 {
                     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 420 
Line 435 
  
         return 0;         return 0;
  
 #endif /* !defined(START_PROVIDER_AGENT) */  # endif /* POSIX CASE */
   
   #else /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION is defined */
   
           // Out-of-Process providers are never started by the cimserver process
           // when Privilege Separation is enabled.
           return -1;
   
   #endif
     }     }
  
     virtual int daemonizeExecutor()     virtual int daemonizeExecutor()
Line 431 
Line 454 
     virtual int reapProviderAgent(     virtual int reapProviderAgent(
         int pid)         int pid)
     {     {
         int status;  #if !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
  
           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;
   
   #else /* PEGASUS_ENABLE_PRIVILEGE_SEPARATION is defined */
   
           // Out-of-Process providers are never started by the cimserver process
           // when Privilege Separation is enabled.
           return -1;
   
   #endif
     }     }
  
     virtual int authenticatePassword(     virtual int authenticatePassword(
Line 464 
Line 499 
  
     virtual int challengeLocal(     virtual int challengeLocal(
         const char* username,         const char* username,
         char challenge[EXECUTOR_BUFFER_SIZE])          char challengeFilePath[EXECUTOR_BUFFER_SIZE])
     {     {
         // ATTN: not handled so don't call in this case.         // ATTN: not handled so don't call in this case.
         return -1;         return -1;
     }     }
  
     virtual int authenticateLocal(     virtual int authenticateLocal(
         const char* challenge,          const char* challengeFilePath,
         const char* response)         const char* response)
     {     {
         // ATTN: not handled so don't call in this case.         // ATTN: not handled so don't call in this case.
         return -1;         return -1;
     }     }
  
 private:      virtual int updateLogLevel(
           const char* logLevel)
     static int _getProviderAgentPath(String& path)  
     {     {
         path = PEGASUS_PROVIDER_AGENT_PROC_NAME;          // If Privilege Separation is not enabled, we don't need to update
           // the log level in the Executor.
         if (path[0] != '/')  
         {  
             const char* env = getenv("PEGASUS_HOME");  
   
             if (!env)  
                 return -1;  
   
             path = String(env) + String("/") + path;  
         }  
   
         return 0;         return 0;
     }     }
  
   private:
   
     Mutex _mutex;     Mutex _mutex;
 }; };
  
Line 531 
Line 557 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_PING_MESSAGE;         header.code = EXECUTOR_PING_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         ExecutorPingResponse response;         ExecutorPingResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         if (response.magic == EXECUTOR_PING_MAGIC)         if (response.magic == EXECUTOR_PING_MAGIC)
Line 559 
Line 585 
         if (mode != 'r' && mode != 'w' && mode != 'a')         if (mode != 'r' && mode != 'w' && mode != 'a')
             return NULL;             return NULL;
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_OPEN_FILE_MESSAGE;         header.code = EXECUTOR_OPEN_FILE_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return NULL;             return NULL;
  
         // _send request body.          // Send request body.
  
         ExecutorOpenFileRequest request;         ExecutorOpenFileRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);
         request.mode = mode;         request.mode = mode;
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return NULL;             return NULL;
  
         // Receive the response         // Receive the response
  
         ExecutorOpenFileResponse response;         ExecutorOpenFileResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return NULL;             return NULL;
  
         // Receive descriptor (if response successful).         // Receive descriptor (if response successful).
Line 613 
Line 639 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_RENAME_FILE_MESSAGE;         header.code = EXECUTOR_RENAME_FILE_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorRenameFileRequest request;         ExecutorRenameFileRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         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(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorRenameFileResponse response;         ExecutorRenameFileResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 646 
Line 672 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_REMOVE_FILE_MESSAGE;         header.code = EXECUTOR_REMOVE_FILE_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorRemoveFileRequest request;         ExecutorRemoveFileRequest request;
         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(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorRemoveFileResponse response;         ExecutorRemoveFileResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 675 
Line 701 
  
     virtual int 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)
Line 688 
Line 714 
  
         // 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;             return -1;
  
         // _send request header:          CString userNameCString = userName.getCString();
           size_t userNameLength = strlen(userNameCString);
   
           if (userNameLength >= EXECUTOR_BUFFER_SIZE)
               return -1;
   
           // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;         header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_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));
         memcpy(request.module, module, n);          memcpy(request.module, module, moduleNameLength);
         request.uid = uid;          memcpy(request.userName, userNameCString, userNameLength);
         request.gid = gid;  
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorStartProviderAgentResponse response;         ExecutorStartProviderAgentResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         // Check response status and pid.         // Check response status and pid.
Line 757 
Line 788 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;         header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorDaemonizeExecutorResponse response;         ExecutorDaemonizeExecutorResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 778 
Line 809 
     virtual int reapProviderAgent(     virtual int reapProviderAgent(
         int pid)         int pid)
     {     {
         AutoMutex autoMutex(_mutex);          // The Executor process automatically cleans up all its child
           // processes, so it does not need to explicitly harvest the
         // _send request header:          // exit status of the cimprovagt processes it starts.
   
         ExecutorRequestHeader header;  
         header.code = EXECUTOR_REAP_PROVIDER_AGENT;  
   
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))  
             return -1;  
  
         // _send request body:          return 0;
   
         ExecutorReapProviderAgentRequest request;  
         memset(&request, 0, sizeof(request));  
         request.pid = pid;  
   
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))  
             return -1;  
   
         // Receive the response  
   
         ExecutorReapProviderAgentResponse response;  
   
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))  
             return -1;  
   
         return response.status;  
     }     }
  
     virtual int authenticatePassword(     virtual int authenticatePassword(
Line 813 
Line 822 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;         header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorAuthenticatePasswordRequest request;         ExecutorAuthenticatePasswordRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         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(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorAuthenticatePasswordResponse response;         ExecutorAuthenticatePasswordResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 846 
Line 855 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_VALIDATE_USER_MESSAGE;         header.code = EXECUTOR_VALIDATE_USER_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorValidateUserRequest request;         ExecutorValidateUserRequest request;
         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(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorValidateUserResponse response;         ExecutorValidateUserResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 875 
Line 884 
  
     virtual int challengeLocal(     virtual int challengeLocal(
         const char* username,         const char* username,
         char challenge[EXECUTOR_BUFFER_SIZE])          char challengeFilePath[EXECUTOR_BUFFER_SIZE])
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;         header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_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, username, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.user, username, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorChallengeLocalResponse response;         ExecutorChallengeLocalResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         Strlcpy(challenge, response.challenge, EXECUTOR_BUFFER_SIZE);          Strlcpy(challengeFilePath, response.challenge, EXECUTOR_BUFFER_SIZE);
  
         return response.status;         return response.status;
     }     }
  
     virtual int authenticateLocal(     virtual int authenticateLocal(
         const char* challenge,          const char* challengeFilePath,
         const char* response)         const char* response)
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;         header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_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.challenge, challenge, EXECUTOR_BUFFER_SIZE);          Strlcpy(request.challenge, challengeFilePath, EXECUTOR_BUFFER_SIZE);
         Strlcpy(request.response, response, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.response, response, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorAuthenticateLocalResponse response_;         ExecutorAuthenticateLocalResponse response_;
  
         if (_recv(_sock, &response_, sizeof(response_)) != sizeof(response_))          if (RecvBlock(_sock, &response_, sizeof(response_)) !=
                   sizeof(response_))
           {
             return -1;             return -1;
           }
  
         return response_.status;         return response_.status;
     }     }
  
 private:      virtual int updateLogLevel(
           const char* logLevel)
     static ssize_t _recv(int sock, void* buffer, size_t size)  
     {     {
         size_t r = size;          AutoMutex autoMutex(_mutex);
         char* p = (char*)buffer;  
   
         if (size == 0)  
             return -1;  
  
         while (r)          // Send request header:
         {  
             ssize_t n;  
  
             EXECUTOR_RESTART(read(sock, p, r), n);          ExecutorRequestHeader header;
           header.code = EXECUTOR_UPDATE_LOG_LEVEL_MESSAGE;
  
             if (n == -1)          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
                 return -1;                 return -1;
             else if (n == 0)  
                 return size - r;  
  
             r -= n;          // Send request body:
             p += n;  
         }  
  
         return size - r;          ExecutorUpdateLogLevelRequest request;
     }          memset(&request, 0, sizeof(request));
           Strlcpy(request.logLevel, logLevel, EXECUTOR_BUFFER_SIZE);
  
     static ssize_t _send(int sock, void* buffer, size_t size)          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
     {              return -1;
         size_t r = size;  
         char* p = (char*)buffer;  
  
         while (r)          // Receive the response
         {  
             ssize_t n;          ExecutorUpdateLogLevelResponse response;
             EXECUTOR_RESTART(write(sock, p, r), n);  
  
             if (n == -1)          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
                 return -1;                 return -1;
             else if (n == 0)  
                 return size - r;  
  
             r -= n;          return response.status;
             p += n;  
         }         }
  
         return size - r;  private:
     }  
  
     int _sock;     int _sock;
     Mutex _mutex;     Mutex _mutex;
Line 1006 
Line 1002 
 // //
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
 static int _sock = -1;  static int _executorSock = -1;
 static ExecutorImpl* _impl = 0;  static AutoPtr<ExecutorImpl> _executorImpl;
 static Mutex _mutex;  static Once _executorImplOnce = PEGASUS_ONCE_INITIALIZER;
   
 static ExecutorImpl* _getImpl()  
 {  
     // Use the double-checked locking technique to avoid the overhead of a lock  
     // on every call.  
   
     if (_impl == 0)  
     {  
         _mutex.lock();  
  
         if (_impl == 0)  static void _initExecutorImpl()
         {         {
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
             if (_sock == -1)      if (_executorSock == -1)
                 _impl = new ExecutorLoopbackImpl();          _executorImpl.reset(new ExecutorLoopbackImpl());
             else             else
                 _impl = new ExecutorSocketImpl(_sock);          _executorImpl.reset(new ExecutorSocketImpl(_executorSock));
 #else #else
             _impl = new ExecutorLoopbackImpl();      _executorImpl.reset(new ExecutorLoopbackImpl());
 #endif #endif
         }         }
  
         _mutex.unlock();  
     }  
   
     return _impl;  
 }  
   
 void Executor::setSock(int sock) void Executor::setSock(int sock)
 { {
     _mutex.lock();      _executorSock = sock;
     _sock = sock;  
     _mutex.unlock();  
 } }
  
 int Executor::detectExecutor() int Executor::detectExecutor()
 { {
     return _getImpl()->detectExecutor();      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->detectExecutor();
 } }
  
 int Executor::ping() int Executor::ping()
 { {
     return _getImpl()->ping();      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->ping();
 } }
  
 FILE* Executor::openFile( FILE* Executor::openFile(
     const char* path,     const char* path,
     int mode)     int mode)
 { {
     return _getImpl()->openFile(path, mode);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->openFile(path, mode);
 } }
  
 int Executor::renameFile( int Executor::renameFile(
     const char* oldPath,     const char* oldPath,
     const char* newPath)     const char* newPath)
 { {
     return _getImpl()->renameFile(oldPath, newPath);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->renameFile(oldPath, newPath);
 } }
  
 int Executor::removeFile( int Executor::removeFile(
     const char* path)     const char* path)
 { {
     return _getImpl()->removeFile(path);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->removeFile(path);
 } }
  
 int Executor::startProviderAgent( int Executor::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)
 { {
     return _getImpl()->startProviderAgent(module,      once(&_executorImplOnce, _initExecutorImpl);
         uid, gid, pid, readPipe, writePipe);      return _executorImpl->startProviderAgent(
           module, pegasusHome, userName, pid, readPipe, writePipe);
 } }
  
 int Executor::daemonizeExecutor() int Executor::daemonizeExecutor()
 { {
     return _getImpl()->daemonizeExecutor();      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->daemonizeExecutor();
 } }
  
 int Executor::reapProviderAgent( int Executor::reapProviderAgent(
     int pid)     int pid)
 { {
     return _getImpl()->reapProviderAgent(pid);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->reapProviderAgent(pid);
 } }
  
 int Executor::authenticatePassword( int Executor::authenticatePassword(
     const char* username,     const char* username,
     const char* password)     const char* password)
 { {
     return _getImpl()->authenticatePassword(username, password);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->authenticatePassword(username, password);
 } }
  
 int Executor::validateUser( int Executor::validateUser(
     const char* username)     const char* username)
 { {
     return _getImpl()->validateUser(username);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->validateUser(username);
 } }
  
 int Executor::challengeLocal( int Executor::challengeLocal(
     const char* user,     const char* user,
     char challenge[EXECUTOR_BUFFER_SIZE])      char challengeFilePath[EXECUTOR_BUFFER_SIZE])
 { {
     return _getImpl()->challengeLocal(user, challenge);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->challengeLocal(user, challengeFilePath);
 } }
  
 int Executor::authenticateLocal( int Executor::authenticateLocal(
     const char* challenge,      const char* challengeFilePath,
     const char* response)     const char* response)
 { {
     return _getImpl()->authenticateLocal(challenge, response);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->authenticateLocal(challengeFilePath, response);
   }
   
   int Executor::updateLogLevel(
       const char* logLevel)
   {
       once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->updateLogLevel(logLevel);
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

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