From ed205066e8a07540b0e670e43ef8fd005aea8d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=9C=87?= Date: Fri, 21 Jan 2022 17:25:51 +0800 Subject: [PATCH] fix auth bug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 韩震 --- common/coauth/src/coauth_funcs.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/coauth/src/coauth_funcs.c b/common/coauth/src/coauth_funcs.c index e73dd39..2b74875 100644 --- a/common/coauth/src/coauth_funcs.c +++ b/common/coauth/src/coauth_funcs.c @@ -71,12 +71,12 @@ int32_t ScheduleFinish(const Buffer *executorMsg, ScheduleTokenHal *scheduleToke return RESULT_BAD_PARAM; } scheduleToken->scheduleResult = RESULT_GENERAL_ERROR; - // ExecutorResultInfo *resultInfo = Malloc(sizeof(ExecutorResultInfo)); ExecutorResultInfo *resultInfo = GetExecutorResultInfo(executorMsg); if (resultInfo == NULL) { LOG_ERROR("tlv parse failed"); return RESULT_BAD_PARAM; } + scheduleToken->scheduleId = resultInfo->scheduleId; CoAuthSchedule coAuthSchedule; coAuthSchedule.scheduleId = resultInfo->scheduleId; int32_t ret = GetCoAuthSchedule(&coAuthSchedule); @@ -84,6 +84,10 @@ int32_t ScheduleFinish(const Buffer *executorMsg, ScheduleTokenHal *scheduleToke LOG_ERROR("get coAuth schedule failed"); goto EXIT; } + if (resultInfo->result != RESULT_SUCCESS) { + LOG_ERROR("executor result failed"); + goto EXIT; + } Buffer *publicKey = NULL; uint32_t index; @@ -104,11 +108,6 @@ int32_t ScheduleFinish(const Buffer *executorMsg, ScheduleTokenHal *scheduleToke DestoryBuffer(publicKey); goto EXIT; } - - ret = RemoveCoAuthSchedule(coAuthSchedule.scheduleId); - if (ret != RESULT_SUCCESS) { - LOG_ERROR("remove failed"); - } ret = TokenDataGetAndSign(coAuthSchedule.executors[0].authType, resultInfo, scheduleToken); DestoryBuffer(publicKey); -- Gitee