pegasus/src/Pegasus/Security/UserManager/PasswordFile.cpp - diff

Return to PasswordFile.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Security / UserManager

Diff for /pegasus/src/Pegasus/Security/UserManager/PasswordFile.cpp between version 1.31 and 1.34

version 1.31, 2008/08/14 17:30:45

version 1.34, 2009/01/27 18:28:33

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// 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

// 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

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a

// 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 50

Line 48

const char COLON = ':';

////////////////////////////////////////////////////////////////////////////////

// PasswordFile Class

Line 171

Line 168

// Skip leading whitespace

const Char16* p = line.getChar16Data();

const Char16* pLine = line.getChar16Data();

const Char16* pUserNameStart;

const Char16* pUserNameEnd;

const Char16* pColon;

const Char16* pPassword;

while (*p && isspace(*p))

while (*pLine && isspace(*pLine))

{

p++;

pLine++;

}

if (!*p)

if (!*pLine)

{

continue;

}

Line 186

Line 187

// Get the userName

String userName;

pUserNameStart = pLine;

userName.append(*p++);

while (isalnum(*p))

// Look for the password

pColon = pLine;

while (*pColon && (*pColon != COLON))

{

userName.append(*p++);

*pColon++;

}

// Skip whitespace after user name

// Expect a colon sign

while (*p && isspace(*p))

if (*pColon != COLON)

{

p++;

// Did not find Colon, log a message and skip entry

Logger::put_l(

Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,

MessageLoaderParms(

"Security.UserManager.PasswordFile.PWD_ENTRY_SYNTAX_ERROR",

"Syntax error in password entry at line : $0.",

lineNumber));

continue;

}

// Expect a colon sign

// Skip whitespace after user name

if (*p != COLON)

pUserNameEnd = pColon - 1;

while ((pUserNameEnd >= pUserNameStart) && isspace(*pUserNameEnd))

{

// Did not find Colon, log a message and skip entry

pUserNameEnd--;

}

pUserNameEnd++; // Point to one past the username

if (pUserNameStart == pUserNameEnd)

{

// Did not find a user name, log a message and skip entry

Logger::put_l(

Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,

MessageLoaderParms(

"Security.UserManager.PasswordFile.ERROR_READING_PWD_ENTRY",

"Security.UserManager.PasswordFile.ERROR_READING_USR_ENTRY",

"Error in reading password entry for : $0.",

"User name not found in entry at line : $0.",

userName));

lineNumber));

continue;

}

p++;

String userName(pUserNameStart, pUserNameEnd - pUserNameStart);

// Skip whitespace after : sign

while (*p && isspace(*p))

pPassword = pColon + 1;

while (*pPassword && isspace(*pPassword))

{

p++;

pPassword++;

}

if (!*pPassword)

{

// Did not find a password, log a message and skip entry

Logger::put_l(

Logger::ERROR_LOG, System::CIMSERVER, Logger::INFORMATION,

MessageLoaderParms(

"Security.UserManager.PasswordFile.ERROR_READING_PWD_ENTRY",

"Error reading the password entry for user : $0.",

userName));

continue;

}

// Get the password

String password;

String password(pPassword);

while (*p)

{

password.append(*p++);

}

// Store the user name and password in the table

Legend:

Removed from v.1.31
changed lines
	Added in v.1.34

No CVS admin address has been configured