(file) Return to UserFileHandler.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Security / UserManager

Diff for /pegasus/src/Pegasus/Security/UserManager/UserFileHandler.cpp between version 1.21.14.2 and 1.28.2.1

version 1.21.14.2, 2006/07/28 23:52:21 version 1.28.2.1, 2008/08/20 23:05:57
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Sushma Fernandes, Hewlett Packard Company (sushma_fernandes@hp.com)  
 //  
 // Modified By:  
 //              Amit K Arora, IBM (amita@in.ibm.com) for PEP#101  
 //              Josephine Eskaline Joyce (jojustin@in.ibm.com) for PEP#101  
 //              Josephine Eskaline Joyce (jojustin@in.ibm.com) for Bug#2486  
 //              David Dillard, VERITAS Software Corp.  
 //                  (david.dillard@veritas.com)  
 //  
 //%//////////////////////////////////////////////////////////////////////////// //%////////////////////////////////////////////////////////////////////////////
  
  
Line 51 
Line 42 
 #include <Pegasus/Common/Logger.h> #include <Pegasus/Common/Logger.h>
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
   #include <Pegasus/Common/IPCExceptions.h>
  
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
  
 #include <Pegasus/Security/UserManager/UserFileHandler.h> #include <Pegasus/Security/UserManager/UserFileHandler.h>
 #include <Pegasus/Security/UserManager/UserExceptions.h> #include <Pegasus/Security/UserManager/UserExceptions.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n  #include <Pegasus/Common/MessageLoader.h>
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
Line 136 
Line 128 
     //     //
     // Load the user information in to the cache.     // Load the user information in to the cache.
     //     //
     try  
     {  
         _loadAllUsers();         _loadAllUsers();
     }  
     catch  (const Exception&)  
     {  
         throw;  
     }  
  
     //     //
     // Initialize the mutex, mutex lock needs to be held for any updates     // Initialize the mutex, mutex lock needs to be held for any updates
Line 201 
Line 186 
  
     try     try
     {     {
         _mutex->timed_lock(_MUTEX_TIMEOUT);          if (!_mutex->timed_lock(_MUTEX_TIMEOUT))
     }  
     catch (TimeOut&)  
     {     {
         //l10n              throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,
         //throw PEGASUS_CIM_EXCEPTION( CIM_ERR_FAILED,                  MessageLoaderParms(
         //"Timed out trying to perform requested operation."                      "Security.UserManager.UserFileHandler.TIMEOUT",
         //"Please re-try the operation again.");                      "Timed out while attempting to perform the requested "
         throw PEGASUS_CIM_EXCEPTION_L( CIM_ERR_FAILED, MessageLoaderParms("Security.UserManager.UserFileHandler.TIMEOUT",                          "operation. Try the operation again."));
                                                                         "Timed out trying to perform requested operation.Please re-try the operation again."));          }
     }     }
     catch (WaitFailed&)     catch (WaitFailed&)
     {     {
     //l10n          // ATTN: This is an error case, not a timeout scenario
         //throw PEGASUS_CIM_EXCEPTION( CIM_ERR_FAILED,          throw PEGASUS_CIM_EXCEPTION_L(CIM_ERR_FAILED,
         //"Timed out trying to perform requested operation."              MessageLoaderParms(
         //"Please re-try the operation again.");                  "Security.UserManager.UserFileHandler.TIMEOUT",
         throw PEGASUS_CIM_EXCEPTION_L( CIM_ERR_FAILED, MessageLoaderParms("Security.UserManager.UserFileHandler.TIMEOUT",                  "Timed out while attempting to perform the requested "
                                                                         "Timed out trying to perform requested operation.Please re-try the operation again."));                      "operation. Try the operation again."));
     }  
     catch (Deadlock&)  
     {  
     //l10n  
         //throw PEGASUS_CIM_EXCEPTION( CIM_ERR_FAILED,  
         //"Deak lock encountered trying to perform requested operation."  
         //"Please re-try the operation again.");  
         throw PEGASUS_CIM_EXCEPTION_L( CIM_ERR_FAILED, MessageLoaderParms("Security.UserManager.UserFileHandler.DEADLOCK",  
                                                 "Deak lock encountered trying to perform requested operation.Please re-try the operation again."));  
     }     }
  
     switch (operation)     switch (operation)
Line 252 
Line 226 
                 if (!_passwordTable.insert(userName,password))                 if (!_passwordTable.insert(userName,password))
                 {                 {
                     _mutex->unlock();                     _mutex->unlock();
                     //l10n                      Logger::put_l(
                     //Logger::put(Logger::ERROR_LOG, System::CIMSERVER,                          Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
                                         //Logger::SEVERE,                          MessageLoaderParms(
                                         //"Error updating user information for : $0.",userName);                              "Security.UserManager.UserFileHandler."
                                         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER,Logger::SEVERE,                                  "ERROR_UPDATING_USER_INFO",
                                                 "Security.UserManager.UserFileHandler.ERROR_UPDATING_USER_INFO",                              "Error updating the user information for user $0.",
                                                 "Error updating user information for : $0.",userName);                              userName));
                     PEG_METHOD_EXIT();                     PEG_METHOD_EXIT();
                     throw PasswordCacheError();                     throw PasswordCacheError();
                 }                 }
Line 315 
Line 289 
                             const String& password)                             const String& password)
 { {
     char        salt[3];     char        salt[3];
     String      encryptedPassword = String::EMPTY;      String encryptedPassword;
  
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::addUserEntry");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::addUserEntry");
  
Line 346 
Line 320 
              const String& newPassword )              const String& newPassword )
 { {
     char        salt[3];     char        salt[3];
     String      encryptedPassword = String::EMPTY;      String encryptedPassword;
  
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::modifyUserEntry");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserFileHandler::modifyUserEntry");
  
     //     //
     // Check if the given password matches the passwd in the file     // Check if the given password matches the passwd in the file
     //     //
     try  
     {  
         if ( !verifyCIMUserPassword (userName,password) )         if ( !verifyCIMUserPassword (userName,password) )
         {         {
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             throw PasswordMismatch(userName);             throw PasswordMismatch(userName);
         }         }
     }  
     catch (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
  
     // encrypt new password     // encrypt new password
     _GetSalt(salt);     _GetSalt(salt);
Line 427 
Line 393 
                      "UserFileHandler::verifyCIMUserPassword");                      "UserFileHandler::verifyCIMUserPassword");
  
     // Check if the user's password mathches the specified password     // Check if the user's password mathches the specified password
     String curPassword          = String::EMPTY;      String curPassword;
     String encryptedPassword    = String::EMPTY;      String encryptedPassword;
     String saltStr              = String::EMPTY;      String saltStr;
  
     // Check if the user exists in the password table     // Check if the user exists in the password table
     if ( !_passwordTable.lookup(userName,curPassword) )     if ( !_passwordTable.lookup(userName,curPassword) )

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