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

Diff for /pegasus/src/Pegasus/Security/Authentication/LocalAuthenticationHandler.cpp between version 1.17.4.3 and 1.18

version 1.17.4.3, 2007/06/11 09:20:14 version 1.18, 2007/03/02 19:00:44
Line 74 
Line 74 
     PEG_METHOD_ENTER(TRC_AUTHENTICATION,     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
         "LocalAuthenticationHandler::authenticate()");         "LocalAuthenticationHandler::authenticate()");
  
       Boolean authenticated   = false;
   
     // Look for ':' seperator     // Look for ':' seperator
     Uint32 colon1 = authHeader.find(':');     Uint32 colon1 = authHeader.find(':');
  
     if ( colon1 == PEG_NOT_FOUND )     if ( colon1 == PEG_NOT_FOUND )
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return false;          return ( authenticated );
     }     }
  
     String userName = authHeader.subString(0, colon1);     String userName = authHeader.subString(0, colon1);
Line 106 
Line 108 
     }     }
  
     //     //
     // Check if the authentication information is present  
     //  
     if (secretReceived.size() == 0 || userName.size() == 0)  
     {  
         PEG_METHOD_EXIT();  
         return false;  
     }  
   
     String authenticatedUsername = authInfo->getAuthenticatedUser();  
   
     //  
     // If this connection has been previously authenticated then ensure  
     // the username passed with the current request matches the  
     // username previously authenticated.  
     //  
     if (authenticatedUsername.size() != 0 &&  
         userName != authenticatedUsername)  
     {  
         PEG_METHOD_EXIT();  
         return false;  
     }  
   
     //  
     // Check if the user is a valid system user     // Check if the user is a valid system user
     //     //
     if ( !System::isSystemUser( userName.getCString() ) )     if ( !System::isSystemUser( userName.getCString() ) )
     {     {
         PEG_METHOD_EXIT();         PEG_METHOD_EXIT();
         return false;          return (authenticated);
     }     }
  
     // Check if the user is authorized to CIMSERV     // Check if the user is authorized to CIMSERV
 #ifdef PEGASUS_ZOS_SECURITY #ifdef PEGASUS_ZOS_SECURITY
     if ( !CheckProfileCIMSERVclassWBEM(userName, __READ_RESOURCE) )     if ( !CheckProfileCIMSERVclassWBEM(userName, __READ_RESOURCE) )
     {     {
         Logger::put_l(Logger::STANDARD_LOG, ZOS_SECURITY_NAME, Logger::WARNING,          Logger::put_l(Logger::TRACE_LOG, ZOS_SECURITY_NAME, Logger::WARNING,
             "Security.Authentication.LocalAuthenticationHandler"             "Security.Authentication.LocalAuthenticationHandler"
             ".NOREAD_CIMSERV_ACCESS.PEGASUS_OS_ZOS",             ".NOREAD_CIMSERV_ACCESS.PEGASUS_OS_ZOS",
             "Request UserID $0 doesn't have READ permission"              "Request UserID $0 doesn't have READ permission to profile CIMSERV CL(WBEM).",
             " to profile CIMSERV CL(WBEM).",  
             userName);             userName);
         return false;          return (authenticated);
     }     }
 #endif #endif
  
Line 155 
Line 133 
     // set the flag to "check done"     // set the flag to "check done"
     authInfo->setRemotePrivilegedUserAccessChecked();     authInfo->setRemotePrivilegedUserAccessChecked();
  
     Boolean authenticated = _localAuthenticator->authenticate(filePath,      authenticated = _localAuthenticator->authenticate(filePath,
         secretReceived, authInfo->getAuthChallenge());          secretReceived, authInfo->getLocalAuthSecret());
  
     PEG_AUDIT_LOG(logLocalAuthentication(     PEG_AUDIT_LOG(logLocalAuthentication(
                      userName,                      userName,
Line 166 
Line 144 
     {     {
         authInfo->setAuthenticatedUser(userName);         authInfo->setAuthenticatedUser(userName);
     }     }
     else  
     {  
         // log a failed authentication  
         Logger::put_l(Logger::STANDARD_LOG,  
                       System::CIMSERVER,  
                       Logger::INFORMATION,  
                       "Security.Authentication.LocalAuthenticationHandler."  
                           "LOCAL_AUTHENTICATION_FAILED",  
                       "Local Authentication failed for user $0.",  
                       userName);  
     }  
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  
Line 196 
Line 163 
     PEG_METHOD_ENTER(TRC_AUTHENTICATION,     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
         "LocalAuthenticationHandler::getAuthResponseHeader()");         "LocalAuthenticationHandler::getAuthResponseHeader()");
  
     String challenge = String::EMPTY;      String secret;
     String authResp = String::EMPTY;      String authResp;
  
     //     //
     // Check if the user is a valid system user     // Check if the user is a valid system user
Line 208 
Line 175 
         return ( authResp );         return ( authResp );
     }     }
  
     authResp = _localAuthenticator->getAuthResponseHeader(authType, userName, challenge);      authResp = _localAuthenticator->getAuthResponseHeader(authType, userName, secret);
  
     authInfo->setAuthChallenge(challenge);      authInfo->setLocalAuthSecret(secret);
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
  

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