(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.12 and 1.12.4.4

version 1.1.4.12, 2007/05/24 19:34:56 version 1.12.4.4, 2009/02/02 17:20:05
Line 41 
Line 41 
 # include <windows.h> # include <windows.h>
 #else #else
 # include <unistd.h> # include <unistd.h>
   # include <errno.h>
 # include <sys/types.h> # include <sys/types.h>
 # include <sys/time.h> # include <sys/time.h>
 # include <sys/resource.h> # include <sys/resource.h>
Line 52 
Line 53 
  
 #include <Pegasus/Common/Constants.h> #include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/Mutex.h> #include <Pegasus/Common/Mutex.h>
   #include <Pegasus/Common/Once.h>
 #include <Pegasus/Common/FileSystem.h> #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/String.h> #include <Pegasus/Common/String.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
   #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/Executor.h> #include <Pegasus/Common/Executor.h>
  
 #include <Executor/Strlcpy.h> #include <Executor/Strlcpy.h>
Line 68 
Line 71 
 # include <Executor/PAMAuth.h> # include <Executor/PAMAuth.h>
 #endif #endif
  
   #ifdef PEGASUS_OS_PASE
   # include <as400_protos.h> // For fork400()
   #endif
   
   #ifdef PEGASUS_OS_ZOS
   # include <spawn.h>
   #endif
   
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 105 
Line 116 
         const char* module,         const char* module,
         const String& pegasusHome,         const String& pegasusHome,
         const String& userName,         const String& userName,
         int uid,  
         int gid,  
         int& pid,         int& pid,
         AnonymousPipe*& readPipe,         AnonymousPipe*& readPipe,
         AnonymousPipe*& writePipe) = 0;         AnonymousPipe*& writePipe) = 0;
Line 130 
Line 139 
     virtual int authenticateLocal(     virtual int authenticateLocal(
         const char* challengeFilePath,         const char* challengeFilePath,
         const char* response) = 0;         const char* response) = 0;
   
       virtual int updateLogLevel(
           const char* logLevel) = 0;
 }; };
  
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Line 165 
Line 177 
         switch (mode)         switch (mode)
         {         {
             case 'r':             case 'r':
                 return fopen(path, "rb");                  return fopen(path, "r");
  
             case 'w':             case 'w':
                 return fopen(path, "wb");                  return fopen(path, "w");
  
             case 'a':             case 'a':
                 return fopen(path, "a+");                 return fopen(path, "a+");
Line 197 
Line 209 
         const char* module,         const char* module,
         const String& pegasusHome,         const String& pegasusHome,
         const String& userName,         const String& userName,
         int uid,  
         int gid,  
         int& pid,         int& pid,
         AnonymousPipe*& readPipe,         AnonymousPipe*& readPipe,
         AnonymousPipe*& writePipe)         AnonymousPipe*& writePipe)
     {     {
         // Add logging here.          PEG_METHOD_ENTER(TRC_SERVER,"ExecutorLoopbackImpl::startProviderAgent");
   #if !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
  
Line 245 
Line 256 
  
         char cmdLine[2048];         char cmdLine[2048];
  
         sprintf(cmdLine, "\"%s\" %s %s \"%s\"",          sprintf(cmdLine, "\"%s\" %s %s %s \"%s\" \"%s\"",
             (const char*)path.getCString(),             (const char*)path.getCString(),
               "0",    // Do not set user context in cimprovagt
             readHandle,             readHandle,
             writeHandle,             writeHandle,
               (const char*)userName.getCString(),
             module);             module);
  
         //  Create provider agent proess.         //  Create provider agent proess.
Line 265 
Line 278 
             &siStartInfo,  //  STARTUPINFO             &siStartInfo,  //  STARTUPINFO
             &piProcInfo))  //  PROCESS_INFORMATION             &piProcInfo))  //  PROCESS_INFORMATION
         {         {
               PEG_METHOD_EXIT();
             return -1;             return -1;
         }         }
  
Line 279 
Line 293 
         readPipe = pipeFromAgent.release();         readPipe = pipeFromAgent.release();
         writePipe = pipeToAgent.release();         writePipe = pipeToAgent.release();
  
           PEG_METHOD_EXIT();
         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 301 
Line 311 
         int to[2];         int to[2];
         int from[2];         int from[2];
  
   #  if defined(PEGASUS_OS_ZOS)
           // zOS is using __spawn2() instead of frok()
           struct __inheritance inherit;
           const char *c_argv[5];
           char arg1[32];
           char arg2[32];
   
   #  endif
   
         do         do
         {         {
             // Resolve full path of "cimprovagt".             // Resolve full path of "cimprovagt".
Line 318 
Line 337 
             if (pipe(from) != 0)             if (pipe(from) != 0)
                 return -1;                 return -1;
  
             // Fork process:              // Start provider agent:
   
   #  if defined(PEGASUS_OS_ZOS)
               // zOS is using __spawn2() to start provider agent
               sprintf(arg1, "%d", to[0]);
               sprintf(arg2, "%d", from[1]);
  
 #if defined(PEGASUS_OS_VMS)              CString program_name = path.getCString();
   
               c_argv[0] = program_name;
               c_argv[1] = arg1;
               c_argv[2] = arg2;
               c_argv[3] = module;
               c_argv[4] = NULL;
   
               // reset the inherit structure
               memset(&inherit,0,sizeof(inherit));
   
               // The provider agent should get a defined JobName.
               inherit.flags=SPAWN_SETJOBNAME;
               memcpy( inherit.jobname,"CFZOOPA ",
                       sizeof(inherit.jobname));
   
               CString program = path.getCString();
   
               PEG_TRACE((TRC_SERVER, Tracer::LEVEL4,
                          "Starting provider agent: %s %s %s %s %s",
                          program,program_name,arg1,arg2,module));
   
               pid = __spawn2(program,0,NULL,&inherit,
                              c_argv,(const char **)environ);
   
               if (pid < 0)
               {
                   PEG_TRACE((TRC_SERVER, Tracer::LEVEL4,
                       "Spawn of provider agent fails:%s "
                           "( errno %d , reason code %08X )",
                       strerror(errno) ,errno,__errno2()));
                   PEG_METHOD_EXIT();
                   return -1;
               }
   #   elif 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
  
   #  if !defined(PEGASUS_OS_ZOS)
   
             if (pid < 0)             if (pid < 0)
                 return -1;                 return -1;
  
Line 356 
Line 418 
  
 #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 (uid != -1 && gid != -1)  
                 {  
                     PEG_TRACE((TRC_OS_ABSTRACTION, Tracer::LEVEL4,  
                         "Changing user context to: userName=%s uid=%d, gid=%d",  
                         (const char*)userName.getCString(), uid, gid));  
   
                     if (setgid(gid) != 0)  
                     {  
                         PEG_TRACE_STRING(TRC_OS_ABSTRACTION, Tracer::LEVEL2,  
                           String("setgid failed: ") + String(strerror(errno)));  
                         return -1;  
                     }  
   
                     if (setuid(uid) != 0)  
                     {  
                         PEG_TRACE_STRING(TRC_OS_ABSTRACTION, Tracer::LEVEL2,  
                           String("setuid failed: ") + String(strerror(errno)));  
                         return -1;  
                     }  
                 }  
   
 # endif /* !defined(PEGASUS_DISABLE_PROV_USERCTXT) */  
   
                 // Exec the cimprovagt program.                 // Exec the cimprovagt program.
  
                 char arg1[32];                  char toPipeArg[32];
                 char arg2[32];                  char fromPipeArg[32];
                 sprintf(arg1, "%d", to[0]);                  sprintf(toPipeArg, "%d", to[0]);
                 sprintf(arg2, "%d", from[1]);                  sprintf(fromPipeArg, "%d", from[1]);
  
                 {                 {
                     CString cstr = path.getCString();                     CString cstr = path.getCString();
                     if (execl(cstr, cstr, arg1, arg2, module, (char*)0) == -1)                      if (execl(
                               cstr,
                               cstr,
   #   if !defined(PEGASUS_DISABLE_PROV_USERCTXT)
                               "1",    // Set user context in cimprovagt
   #   else
                               "0",    // Do not set user context in cimprovagt
   #   endif
                               toPipeArg,
                               fromPipeArg,
                               (const char*)userName.getCString(),
                               module,
                               (char*)0) == -1)
                     {                     {
                         PEG_TRACE((TRC_DISCARDED_DATA, Tracer::LEVEL2,                         PEG_TRACE((TRC_DISCARDED_DATA, Tracer::LEVEL2,
                             "execl() failed.  errno = %d.", errno));                             "execl() failed.  errno = %d.", errno));
Line 400 
Line 447 
                     }                     }
                 }                 }
             }             }
   #  else  /* PEGASUS_OS_ZOS */
               if (pid > 0)
               {
                   PEG_TRACE((TRC_SERVER, Tracer::LEVEL4,
                        "Provider agent started suggessfully: Pid(%d).",pid));
                   break;
               }
   #  endif /* PEGASUS_OS_ZOS */
   
         }         }
         while (0);         while (0);
  
Line 424 
Line 480 
         readPipe = new AnonymousPipe(readFdStr, 0);         readPipe = new AnonymousPipe(readFdStr, 0);
         writePipe = new AnonymousPipe(0, writeFdStr);         writePipe = new AnonymousPipe(0, writeFdStr);
  
   #  if defined(PEGASUS_HAS_SIGNALS)
   #   if !defined(PEGASUS_DISABLE_PROV_USERCTXT) && !defined(PEGASUS_OS_ZOS)
           // The cimprovagt forks and returns right away.  Clean up the zombie
           // process now instead of in reapProviderAgent().
           int status = 0;
           while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)
               ;
   #   endif
   #  endif
   
         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 437 
Line 511 
     virtual int reapProviderAgent(     virtual int reapProviderAgent(
         int pid)         int pid)
     {     {
   #if !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
   
         int status = 0;         int status = 0;
  
 #if defined(PEGASUS_HAS_SIGNALS) #if defined(PEGASUS_HAS_SIGNALS)
   #  if defined(PEGASUS_DISABLE_PROV_USERCTXT) || defined(PEGASUS_OS_ZOS)
           // When provider user context is enabled, this is done in
           // startProviderAgent().
         while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)         while ((status = waitpid(pid, 0, 0)) == -1 && errno == EINTR)
             ;             ;
 #endif #endif
   # 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 486 
Line 574 
         return -1;         return -1;
     }     }
  
       virtual int updateLogLevel(
           const char* logLevel)
       {
           // If Privilege Separation is not enabled, we don't need to update
           // the log level in the Executor.
           return 0;
       }
   
 private: private:
  
     Mutex _mutex;     Mutex _mutex;
Line 522 
Line 618 
     {     {
         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 550 
Line 646 
         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 604 
Line 700 
     {     {
         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 637 
Line 733 
     {     {
         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 668 
Line 764 
         const char* module,         const char* module,
         const String& pegasusHome,         const String& pegasusHome,
         const String& userName,         const String& userName,
         int uid,  
         int gid,  
         int& pid,         int& pid,
         AnonymousPipe*& readPipe,         AnonymousPipe*& readPipe,
         AnonymousPipe*& writePipe)         AnonymousPipe*& writePipe)
Line 681 
Line 775 
  
         // 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 (moduleNameLength >= EXECUTOR_BUFFER_SIZE)
               return -1;
   
           CString userNameCString = userName.getCString();
           size_t userNameLength = strlen(userNameCString);
  
         if (n >= EXECUTOR_BUFFER_SIZE)          if (userNameLength >= EXECUTOR_BUFFER_SIZE)
             return -1;             return -1;
  
         // _send request header:          // 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 750 
Line 849 
     {     {
         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 771 
Line 870 
     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
           // exit status of the cimprovagt processes it starts.
  
         // _send request header:          return 0;
   
         ExecutorRequestHeader header;  
         header.code = EXECUTOR_REAP_PROVIDER_AGENT;  
   
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))  
             return -1;  
   
         // _send request body:  
   
         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 806 
Line 883 
     {     {
         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 839 
Line 916 
     {     {
         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 872 
Line 949 
     {     {
         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(challengeFilePath, response.challenge, EXECUTOR_BUFFER_SIZE);         Strlcpy(challengeFilePath, response.challenge, EXECUTOR_BUFFER_SIZE);
Line 907 
Line 984 
     {     {
         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, challengeFilePath, 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 1000 
Line 1064 
 //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
  
 static int _executorSock = -1; static int _executorSock = -1;
 static ExecutorImpl* _executorImpl = 0;  static AutoPtr<ExecutorImpl> _executorImpl;
 static Mutex _executorMutex;  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 (_executorImpl == 0)  static void _initExecutorImpl()
     {  
         AutoMutex autoMutex(_executorMutex);  
   
         if (_executorImpl == 0)  
         {         {
 #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) #if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION)
             if (_executorSock == -1)             if (_executorSock == -1)
                 _executorImpl = new ExecutorLoopbackImpl();          _executorImpl.reset(new ExecutorLoopbackImpl());
             else             else
                 _executorImpl = new ExecutorSocketImpl(_executorSock);          _executorImpl.reset(new ExecutorSocketImpl(_executorSock));
 #else #else
             _executorImpl = new ExecutorLoopbackImpl();      _executorImpl.reset(new ExecutorLoopbackImpl());
 #endif #endif
         }         }
     }  
   
     return _executorImpl;  
 }  
  
 void Executor::setSock(int sock) void Executor::setSock(int sock)
 { {
     AutoMutex autoMutex(_executorMutex);  
     _executorSock = sock;     _executorSock = sock;
 } }
  
 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,
     const String& pegasusHome,     const String& pegasusHome,
     const String& userName,     const String& userName,
     int uid,  
     int gid,  
     int& pid,     int& pid,
     AnonymousPipe*& readPipe,     AnonymousPipe*& readPipe,
     AnonymousPipe*& writePipe)     AnonymousPipe*& writePipe)
 { {
     return _getImpl()->startProviderAgent(module, pegasusHome,      once(&_executorImplOnce, _initExecutorImpl);
         userName, 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 challengeFilePath[EXECUTOR_BUFFER_SIZE])     char challengeFilePath[EXECUTOR_BUFFER_SIZE])
 { {
     return _getImpl()->challengeLocal(user, challengeFilePath);      once(&_executorImplOnce, _initExecutorImpl);
       return _executorImpl->challengeLocal(user, challengeFilePath);
 } }
  
 int Executor::authenticateLocal( int Executor::authenticateLocal(
     const char* challengeFilePath,     const char* challengeFilePath,
     const char* response)     const char* response)
 { {
     return _getImpl()->authenticateLocal(challengeFilePath, 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.12  
changed lines
  Added in v.1.12.4.4
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2