(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.21 and 1.25

version 1.21, 2007/04/03 18:50:58 version 1.25, 2008/12/02 09:02:14
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  //
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  // Permission is hereby granted, free of charge, to any person obtaining a
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  // copy of this software and associated documentation files (the "Software"),
 // EMC Corporation; Symantec Corporation; The Open Group.  // to deal in the Software without restriction, including without limitation
 //  // the rights to use, copy, modify, merge, publish, distribute, sublicense,
 // Permission is hereby granted, free of charge, to any person obtaining a copy  // and/or sell copies of the Software, and to permit persons to whom the
 // of this software and associated documentation files (the "Software"), to  // Software is furnished to do so, subject to the following conditions:
 // deal in the Software without restriction, including without limitation the  //
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  // The above copyright notice and this permission notice shall be included
 // sell copies of the Software, and to permit persons to whom the Software is  // in all copies or substantial portions of the Software.
 // furnished to do so, subject to the following conditions:  //
 //  // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // 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.  
 // //
 //==============================================================================  //////////////////////////////////////////////////////////////////////////
 // //
 //%//////////////////////////////////////////////////////////////////////////// //%////////////////////////////////////////////////////////////////////////////
  
Line 84 
Line 82 
 // //
 // Terminates the usermanager; // Terminates the usermanager;
 // //
 void  void UserManager::destroy()
 UserManager::destroy(void)  
 { {
     delete _instance;     delete _instance;
     _instance = 0;     _instance = 0;
 } }
   
 // //
 // Construct the singleton instance of the UserManager and return a // Construct the singleton instance of the UserManager and return a
 // pointer to that instance. // pointer to that instance.
Line 121 
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 138 
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 (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 163 
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 (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 185 
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 (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 208 
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 (const Exception&)  
     {  
         throw;  
     }  
 #endif #endif
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
Line 230 
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 (const InvalidUser&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
     catch (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 #else  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return false;     return false;
 #endif  
 } }
  
 // //
Line 269 
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 (const InvalidUser&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
     catch (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 #else  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
     return false;     return false;
 #endif  
 } }
  
 // //
Line 305 
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 318 
Line 248 
             return false;             return false;
         }         }
     }     }
     catch (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 }  
  
 // //
 // Verify whether the specified operation has authorization // Verify whether the specified operation has authorization
Line 336 
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 350 
Line 272 
             return false;             return false;
         }         }
     }     }
     catch (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
 }  
  
 // //
 // Set the authorizations // Set the authorizations
Line 367 
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 (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 389 
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 (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 412 
Line 312 
 { {
     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::getAuthorization");     PEG_METHOD_ENTER(TRC_AUTHORIZATION, "UserManager::getAuthorization");
  
     String auth;      String auth = _authHandler->getAuthorization(userName, myNamespace);
   
     try  
     {  
         auth = _authHandler->getAuthorization( userName, myNamespace);  
     }  
     catch (const Exception&)  
     {  
         PEG_METHOD_EXIT();  
         throw;  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  
Line 430 
Line 320 
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
   
   

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