浏览代码

Z991239-6365 #comment feat: 准入话术去除持久化

陈纪林80310970 3 月之前
父节点
当前提交
84f73a4bd8
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 6 6
      Module/mod_accessauth/AccessAuthFSM.cpp
  2. 1 1
      Module/mod_accessauth/mod_AccessAuth.cpp

+ 6 - 6
Module/mod_accessauth/AccessAuthFSM.cpp

@@ -418,12 +418,12 @@ struct GetTokenTask : ITaskSp
 				CSimpleStringA tmsg = CSimpleStringA::Format("{\"errcode\": \"%s\", \"message\": %s}",
 					responseStatus.errorCode.c_str(), getTokenAns.warnMessage.c_str());
 				m_entity->SetAuthErrMsg(tmsg.GetData());
-				m_fsm->GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", tmsg.GetData(), true);
+				m_fsm->GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", tmsg.GetData());
 			}
 			else
 			{
 				m_entity->SetAuthErrMsg("");
-				m_fsm->GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", "", true);
+				m_fsm->GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", "");
 			}
 
 			DWORD rc = m_fsm->HandleGetToken((BYTE*)getTokenAns.sharedKey.enToken.c_str(), (BYTE*)getTokenAns.sharedKey.sharedSK.c_str(),
@@ -527,7 +527,7 @@ void CAccessAuthFSM::doWarnMsg(int errReason, std::string errMsg, bool bNeedEven
 	{
 		auto pEntity = (CAccessAuthEntity*)m_pEntity;
 		pEntity->SetAuthErrMsg(fullErrMsg.c_str());
-		const ErrorCodeEnum ec = m_pEntity->GetFunction()->SetSysVar("AuthErrMsg", fullErrMsg.c_str(), true);
+		const ErrorCodeEnum ec = m_pEntity->GetFunction()->SetSysVar("AuthErrMsg", fullErrMsg.c_str());
 		if (ec != Error_Succeed) {
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Update SysVar failed: 0x%X", ec);
 		}
@@ -535,7 +535,7 @@ void CAccessAuthFSM::doWarnMsg(int errReason, std::string errMsg, bool bNeedEven
 		if (errReason == ERR_ACCESSAUTH_SERVICE_FAILED)
 		{
 			pEntity->SetAuthErrMsg(errMsg.c_str());
-			m_pEntity->GetFunction()->SetSysVar("AuthErrMsg", errMsg.c_str(), true);
+			m_pEntity->GetFunction()->SetSysVar("AuthErrMsg", errMsg.c_str());
 			LogEvent(Severity_Middle, ERR_ACCESSAUTH_SERVICE_FAILED, errMsg.c_str());
 		}
 		else
@@ -802,7 +802,7 @@ DWORD CAccessAuthFSM::HandleGetToken(BYTE* enToken1, BYTE* sharedKey, BYTE* enTo
 	{
 		rc = Error_Bug;
 		pEntity->SetAuthErrMsg("返回令牌校验不通过");
-		pEntity->GetFunction()->SetSysVar("AuthErrMsg", "返回令牌校验不通过", true);
+		pEntity->GetFunction()->SetSysVar("AuthErrMsg", "返回令牌校验不通过");
 		char* sm3Ret = Str2Hex((char*)sm3, 32);
 		delete sm3Ret;
 		doWarnMsg(ERR_ACCESSAUTH_TOKEN_HASH, "返回令牌校验不通过", true);
@@ -821,7 +821,7 @@ DWORD CAccessAuthFSM::HandleGetToken(BYTE* enToken1, BYTE* sharedKey, BYTE* enTo
 		if (rc != Error_Succeed) 
 		{
 			pEntity->SetAuthErrMsg("保存令牌失败");
-			pEntity->GetFunction()->SetSysVar("AuthErrMsg", "保存令牌失败", true);
+			pEntity->GetFunction()->SetSysVar("AuthErrMsg", "保存令牌失败");
 			doWarnMsg(ERR_ACCESSAUTH_SAVE_TOKEN, "保存令牌失败", true);
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA5208")(GetOutPutStr("%s%08X", "SaveTokenAndSharedSK", rc).c_str());
 		}

+ 1 - 1
Module/mod_accessauth/mod_AccessAuth.cpp

@@ -448,7 +448,7 @@ int CAccessAuthEntity::GetPinPadCapability()
 
 void CAccessAuthEntity::printPasswdError(const string& strErrMsg){
 	SetAuthErrMsg(strErrMsg.c_str());
-	GetFunction()->SetSysVar("AuthErrMsg", strErrMsg.c_str(), true);
+	GetFunction()->SetSysVar("AuthErrMsg", strErrMsg.c_str());
 	m_FSM.doWarnMsg( ERROR_ACCESSAUTH_OPENCRYPTCONTEXT, strErrMsg.c_str(),true, strErrMsg);
 	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA520C")(strErrMsg.c_str());
 }