* Remove PASSWORD_INFINITE_EXPIRATION_TIME from protocol* files.
* Add anonymous namespace in password-file.cpp
* Change PASSWORD_INFINITE_EXPIRATION_TIME value from -1 to max time_t.
* Remove cast between int/unsigned int/time_t in the code.
[Issue#] N/A
[Bug] N/A
[Cause] N/A
[Problem] N/A
[Solution] N/A
[Verifcation] Build, run tests.
Change-Id: If41b690a7f4ac882281fc17bcdb79d20bfa9cb8d
const size_t MAX_PASSWORD_LEN = 32;
const unsigned int MAX_PASSWORD_HISTORY = 50;
const unsigned int PASSWORD_INFINITE_EXPIRATION_DAYS = 0;
-const time_t PASSWORD_INFINITE_EXPIRATION_TIME = 0xFFFFFFFF;
const unsigned int PASSWORD_INFINITE_ATTEMPT_COUNT = 0;
const unsigned int PASSWORD_API_NO_EXPIRATION = 0xFFFFFFFF;
extern const size_t MAX_PASSWORD_LEN;
extern const unsigned int MAX_PASSWORD_HISTORY;
extern const unsigned int PASSWORD_INFINITE_EXPIRATION_DAYS;
-extern const time_t PASSWORD_INFINITE_EXPIRATION_TIME;
extern const unsigned int PASSWORD_INFINITE_ATTEMPT_COUNT;
extern const unsigned int PASSWORD_API_NO_EXPIRATION;
#include <fstream>
#include <algorithm>
+#include <limits>
-#include <openssl/sha.h>
-
+#include <fcntl.h>
+#include <string.h>
#include <sys/stat.h>
+#include <unistd.h>
+
+#include <openssl/sha.h>
#include <dpl/log/log.h>
#include <password-exception.h>
#include <password-file-buffer.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-
namespace {
const std::string DATA_DIR = "/opt/data/security-server";
const std::string PASSWORD_FILE = DATA_DIR + "/password";
const double RETRY_TIMEOUT = 0.5;
const mode_t FILE_MODE = S_IRUSR | S_IWUSR;
const unsigned int CURRENT_FILE_VERSION = 3;
-}
+} // namespace anonymous
namespace SecurityServer
{
+ const time_t PASSWORD_INFINITE_EXPIRATION_TIME = std::numeric_limits<time_t>::max();
+
class NoPassword: public IPassword
{
public:
return m_passwordCurrent->match(password);
}
- void PasswordFile::setExpireTime(int expireTime)
+ void PasswordFile::setExpireTime(time_t expireTime)
{
if(isPasswordActive())
m_expireTime = expireTime;
namespace SecurityServer
{
+ extern const time_t PASSWORD_INFINITE_EXPIRATION_TIME;
+
struct IPassword: public ISerializable
{
typedef std::vector<unsigned char> RawHash;
unsigned int getMaxHistorySize() const;
unsigned int getExpireTimeLeft() const;
- void setExpireTime(int expireTime);
+ void setExpireTime(time_t expireTime);
//attempt manipulating functions
unsigned int getAttempt() const;
#include <security-server.h>
namespace {
- bool calculateExpiredTime(unsigned int receivedDays, unsigned int &validSecs)
+ bool calculateExpiredTime(unsigned int receivedDays, time_t &validSecs)
{
validSecs = SecurityServer::PASSWORD_INFINITE_EXPIRATION_TIME;
LogSecureDebug("Curpwd = " << currentPassword << ", newpwd = " << newPassword <<
", recatt = " << receivedAttempts << ", recdays = " << receivedDays);
- unsigned int valid_secs = 0;
+ time_t valid_secs = 0;
if (m_pwdFile.isIgnorePeriod()) {
LogError("Retry timeout occured.");
int PasswordManager::setPasswordValidity(const unsigned int receivedDays)
{
- unsigned int valid_secs = 0;
+ time_t valid_secs = 0;
LogSecureDebug("received_days: " << receivedDays);
const unsigned int receivedAttempts,
const unsigned int receivedDays)
{
- unsigned int valid_secs = 0;
+ time_t valid_secs = 0;
if(!calculateExpiredTime(receivedDays, valid_secs))
return SECURITY_SERVER_API_ERROR_INPUT_PARAM;