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

Diff for /pegasus/src/Pegasus/Security/UserManager/UserManager.cpp between version 1.10 and 1.25

version 1.10, 2002/09/13 21:40:42 version 1.25, 2008/12/02 09:02:14
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Licensed to The Open Group (TOG) under one or more contributor license
 // The Open Group, Tivoli Systems  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
   // this work for additional information regarding copyright ownership.
   // Each contributor licenses this file to you under the OpenPegasus Open
   // Source License; you may not use this file except in compliance with the
   // License.
   //
   // Permission is hereby granted, free of charge, to any person obtaining a
   // copy of this software and associated documentation files (the "Software"),
   // to deal in the Software without restriction, including without limitation
   // the rights to use, copy, modify, merge, publish, distribute, sublicense,
   // and/or sell copies of the Software, and to permit persons to whom the
   // Software is furnished to do so, subject to the following conditions:
   //
   // The above copyright notice and this permission notice shall be included
   // in all copies or substantial portions of the Software.
   //
   // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy  //////////////////////////////////////////////////////////////////////////
 // of this software and associated documentation files (the "Software"), to  
 // deal in the Software without restriction, including without limitation the  
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  
 // sell copies of the Software, and to permit persons to whom the Software is  
 // furnished to do so, subject to the following conditions:  
 //  
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 //  
 //==============================================================================  
 //  
 // Author: Sushma Fernandes, Hewlett Packard Company (sushma_fernandes@hp.com)  
 //  
 // Modified By: Nag Boranna, Hewlett Packard Company (nagaraja_boranna@hp.com)  
 //              Carol Ann Krug Graves, Hewlett-Packard Company  
 //                (carolann_graves@hp.com)  
 // //
 //%//////////////////////////////////////////////////////////////////////////// //%////////////////////////////////////////////////////////////////////////////
  
Line 36 
Line 36 
 // //
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
  
 #include <Pegasus/Common/Destroyer.h>  
 #include <Pegasus/Common/System.h> #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/PegasusVersion.h> #include <Pegasus/Common/PegasusVersion.h>
Line 53 
Line 52 
 Initialize UserManager instance Initialize UserManager instance
 */ */
 UserManager* UserManager::_instance = 0; UserManager* UserManager::_instance = 0;
   Mutex UserManager::_userManagerMutex;
  
 // //
 // Constructor // Constructor
Line 61 
Line 61 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::UserManager");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::UserManager");
  
     try  
     {  
         _userFileHandler = 0;  
   
 #ifndef PEGASUS_NO_PASSWORDFILE #ifndef PEGASUS_NO_PASSWORDFILE
         _userFileHandler = new UserFileHandler();      _userFileHandler.reset(new UserFileHandler());
 #endif #endif
         _authHandler = 0;      _authHandler.reset(new AuthorizationHandler(repository));
         _authHandler = new AuthorizationHandler(repository);  
     }  
     catch (Exception& e)  
     {  
         if (_userFileHandler)  
         {  
             delete _userFileHandler;  
         }  
         if (_authHandler)  
         {  
             delete _authHandler;  
         }  
   
         PEG_METHOD_EXIT();  
         throw e;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 96 
Line 76 
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::~UserManager");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::~UserManager");
  
     if (_userFileHandler)      PEG_METHOD_EXIT();
     {  
         delete _userFileHandler;  
     }  
     if (_authHandler)  
     {  
         delete _authHandler;  
     }     }
  
     PEG_METHOD_EXIT();  //
   // Terminates the usermanager;
   //
   void UserManager::destroy()
   {
       delete _instance;
       _instance = 0;
 } }
  
 // //
Line 124 
Line 104 
  
     if (!_instance)     if (!_instance)
     {     {
           AutoMutex lock(_userManagerMutex);
           if (!_instance)
           {
         _instance = new UserManager(repository);         _instance = new UserManager(repository);
     }     }
       }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  
Line 135 
Line 119 
 // //
 // Add a user // Add a user
 // //
 void UserManager::addUser(const String& userName, const String& password)  void UserManager::addUser(
       const String& userName,
       const String& password)
 { {
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::addUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::addUser");
  
Line 152 
Line 138 
     //     //
     // Add the user to the password file     // Add the user to the password file
     //     //
     try  
     {  
         _userFileHandler->addUserEntry(userName,password);         _userFileHandler->addUserEntry(userName,password);
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 177 
Line 155 
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::modifyUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::modifyUser");
  
 #ifndef PEGASUS_NO_PASSWORDFILE #ifndef PEGASUS_NO_PASSWORDFILE
     try  
     {  
         _userFileHandler->modifyUserEntry(userName, password, newPassword);         _userFileHandler->modifyUserEntry(userName, password, newPassword);
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 199 
Line 169 
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::removeUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::removeUser");
  
 #ifndef PEGASUS_NO_PASSWORDFILE #ifndef PEGASUS_NO_PASSWORDFILE
     try  
     {  
         _userFileHandler->removeUserEntry(userName);         _userFileHandler->removeUserEntry(userName);
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 222 
Line 184 
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::getAllUserNames");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::getAllUserNames");
  
 #ifndef PEGASUS_NO_PASSWORDFILE #ifndef PEGASUS_NO_PASSWORDFILE
     try  
     {  
         _userFileHandler->getAllUserNames( userNames );         _userFileHandler->getAllUserNames( userNames );
         PEG_METHOD_EXIT();  
     }  
     catch (Exception& e)  
     {  
         throw e;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 244 
Line 198 
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUser");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUser");
  
 #ifndef PEGASUS_NO_PASSWORDFILE #ifndef PEGASUS_NO_PASSWORDFILE
     try  
     {  
         if ( _userFileHandler->verifyCIMUser( userName ))         if ( _userFileHandler->verifyCIMUser( userName ))
         {         {
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             return true;             return true;
         }         }
         else  #endif
         {  
             PEG_METHOD_EXIT();  
             return false;  
         }  
     }  
     catch (InvalidUser& iu)  
     {  
         PEG_METHOD_EXIT();  
         throw iu;  
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 #else  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return false;     return false;
 #endif  
 } }
  
 // //
Line 283 
Line 219 
     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUserPassword");     PEG_METHOD_ENTER(TRC_USER_MANAGER, "UserManager::verifyCIMUserPassword");
  
 #ifndef PEGASUS_NO_PASSWORDFILE #ifndef PEGASUS_NO_PASSWORDFILE
     try  
     {  
         if ( _userFileHandler->verifyCIMUserPassword( userName, password ))         if ( _userFileHandler->verifyCIMUserPassword( userName, password ))
         {         {
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
             return true;             return true;
         }         }
         else  #endif
         {  
             PEG_METHOD_EXIT();  
             return false;  
         }  
     }  
     catch (InvalidUser& iu)  
     {  
         PEG_METHOD_EXIT();  
         throw iu;  
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 #else  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return false;     return false;
 #endif  
 } }
  
 // //
Line 319 
Line 237 
 { {
     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::verifyNamespace");     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::verifyNamespace");
  
     try  
     {  
         if ( _authHandler->verifyNamespace( myNamespace ))         if ( _authHandler->verifyNamespace( myNamespace ))
         {         {
             PEG_METHOD_EXIT();             PEG_METHOD_EXIT();
Line 332 
Line 248 
             return false;             return false;
         }         }
     }     }
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 }  
  
 // //
 // Verify whether the specified operation has authorization // Verify whether the specified operation has authorization
Line 350 
Line 260 
 { {
     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::verifyAuthorization");     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::verifyAuthorization");
  
     try  
     {  
         if ( _authHandler->verifyAuthorization(         if ( _authHandler->verifyAuthorization(
             userName, nameSpace, cimMethodName ) )             userName, nameSpace, cimMethodName ) )
         {         {
Line 364 
Line 272 
             return false;             return false;
         }         }
     }     }
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
 }  
  
 // //
 // Set the authorizations // Set the authorizations
Line 381 
Line 283 
 { {
     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::setAuthorization");     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::setAuthorization");
  
     try  
     {  
         _authHandler->setAuthorization( userName, myNamespace, auth );         _authHandler->setAuthorization( userName, myNamespace, auth );
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 403 
Line 297 
 { {
     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::removeAuthorization");     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::removeAuthorization");
  
     try  
     {  
         _authHandler->removeAuthorization( userName, myNamespace);         _authHandler->removeAuthorization( userName, myNamespace);
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 426 
Line 312 
 { {
     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::getAuthorization");     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::getAuthorization");
  
     String auth = String::EMPTY;      String auth = _authHandler->getAuthorization(userName, myNamespace);
   
     try  
     {  
         auth = _authHandler->getAuthorization( userName, myNamespace);  
     }  
     catch (Exception& e)  
     {  
         PEG_METHOD_EXIT();  
         throw e;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  
Line 444 
Line 320 
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
   
   


Legend:
Removed from v.1.10  
changed lines
  Added in v.1.25

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2