Clean up password service.

* 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

diff --git a/src/server/common/protocols.cpp b/src/server/common/protocols.cpp
index 8118e2e..1d4a615 100644 (file)
--- a/src/server/common/protocols.cpp
+++ b/src/server/common/protocols.cpp
@@ -59,7 +59,6 @@ const size_t COOKIE_SIZE = 20;
 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;
 

diff --git a/src/server/common/protocols.h b/src/server/common/protocols.h
index 1b73c4a..eeb8721 100644 (file)
--- a/src/server/common/protocols.h
+++ b/src/server/common/protocols.h
@@ -86,7 +86,6 @@ enum class PasswordHdrs
 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;
 

diff --git a/src/server/service/password-file.cpp b/src/server/service/password-file.cpp
index bb918d8..a7c279c 100644 (file)
--- a/src/server/service/password-file.cpp
+++ b/src/server/service/password-file.cpp
@@ -27,10 +27,14 @@
 
 #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>
 
@@ -39,10 +43,6 @@
 #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";
@@ -51,10 +51,12 @@ namespace {
     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:
@@ -453,7 +455,7 @@ namespace SecurityServer
         return m_passwordCurrent->match(password);
     }
 
-    void PasswordFile::setExpireTime(int expireTime)
+    void PasswordFile::setExpireTime(time_t expireTime)
     {
         if(isPasswordActive())
             m_expireTime = expireTime;

diff --git a/src/server/service/password-file.h b/src/server/service/password-file.h
index 59839cb..19143d8 100644 (file)
--- a/src/server/service/password-file.h
+++ b/src/server/service/password-file.h
@@ -38,6 +38,8 @@
 
 namespace SecurityServer
 {
+    extern const time_t PASSWORD_INFINITE_EXPIRATION_TIME;
+
     struct IPassword: public ISerializable
     {
         typedef std::vector<unsigned char> RawHash;
@@ -72,7 +74,7 @@ namespace SecurityServer
         unsigned int getMaxHistorySize() const;
 
         unsigned int getExpireTimeLeft() const;
-        void setExpireTime(int expireTime);
+        void setExpireTime(time_t expireTime);
 
         //attempt manipulating functions
         unsigned int getAttempt() const;

diff --git a/src/server/service/password-manager.cpp b/src/server/service/password-manager.cpp
index 55a9b2b..dd3ad1b 100644 (file)
--- a/src/server/service/password-manager.cpp
+++ b/src/server/service/password-manager.cpp
@@ -38,7 +38,7 @@
 #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;
 
@@ -128,7 +128,7 @@ namespace SecurityServer
         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.");
@@ -205,7 +205,7 @@ namespace SecurityServer
 
     int PasswordManager::setPasswordValidity(const unsigned int receivedDays)
     {
-        unsigned int valid_secs = 0;
+        time_t valid_secs = 0;
 
         LogSecureDebug("received_days: " << receivedDays);
 
@@ -227,7 +227,7 @@ namespace SecurityServer
                                        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;