Ver código fonte

HPCC-9757 ConfigMgr needs to add "Location" tag to ESP Authenticate section

Removed some unnecessary assertex calls, and renamed the authentication map
from "localsecurity" to "htpasswdsecurity"

Signed-off-by: William Whitehead <william.whitehead@lexisnexis.com>
William Whitehead 12 anos atrás
pai
commit
284adb21bd

+ 0 - 3
esp/services/ws_account/ws_accountService.cpp

@@ -157,10 +157,7 @@ bool Cws_accountEx::onMyAccount(IEspContext &context, IEspMyAccountRequest &req,
             user->getPasswordExpiration(dt);
             StringBuffer sb;
             if (dt.isNull())
-            {
-                assertex(user->getPasswordDaysRemaining() == -2);//-1 if expired, -2 if never expires
                 sb.append("Never");
-            }
             else
             {
                 dt.getString(sb);

+ 1 - 1
system/security/htpasswdSecurity/htpasswdSecurity.cpp

@@ -66,7 +66,7 @@ public:
 					ISecResourceList* rlist = authmap->queryResourceList(pathstr.str());
 					if(rlist == NULL)
 					{
-						rlist = createResourceList("localsecurity");
+						rlist = createResourceList("htpasswdsecurity");
 						authmap->add(pathstr.str(), rlist);
 					}
 					ISecResource* rs = rlist->addResource(rstr.str());

+ 3 - 3
system/security/shared/SecureUser.hpp

@@ -198,9 +198,9 @@ public:
         return m_userID;
     }
 
-    virtual CDateTime & getPasswordExpiration(CDateTime& expirationDate){ assertex(false); return expirationDate; }
-    virtual bool setPasswordExpiration(CDateTime& expirationDate) { assertex(false);return true; }
-    virtual int getPasswordDaysRemaining() {assertex(false);return -1;}
+    virtual CDateTime & getPasswordExpiration(CDateTime& expirationDate){ return expirationDate; }
+    virtual bool setPasswordExpiration(CDateTime& expirationDate) { return true; }
+    virtual int getPasswordDaysRemaining() {return -1;}
     virtual authStatus getAuthenticateStatus() {return m_authenticateStatus;}
     virtual void setAuthenticateStatus(authStatus status){m_authenticateStatus = status;}