diff --git a/interfaces/innerkits/nativetoken/include/nativetoken.h b/interfaces/innerkits/nativetoken/include/nativetoken.h index d256589538076de295231ed900d9fa5403b88064..6532aa7e523a4b77c367dcd1bbb61ece5c6ca429 100644 --- a/interfaces/innerkits/nativetoken/include/nativetoken.h +++ b/interfaces/innerkits/nativetoken/include/nativetoken.h @@ -86,7 +86,7 @@ typedef struct TokenList { struct TokenList *next; } NativeTokenList; -extern int32_t GetFileBuff(const char *cfg, char **retBuff); +extern int32_t GetFileBuff(char **retBuff); #ifdef __cplusplus } #endif diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c index 7ce4c8b8212dadea90b71adea9b49dab37a1c87e..afe1d476355f0adb44fbb3f271ed99130d80a5ca 100644 --- a/interfaces/innerkits/nativetoken/src/nativetoken.c +++ b/interfaces/innerkits/nativetoken/src/nativetoken.c @@ -18,22 +18,16 @@ NativeTokenList *g_tokenListHead; int32_t g_isNativeTokenInited = 0; -int32_t GetFileBuff(const char *cfg, char **retBuff) +int32_t GetFileBuff(char **retBuff) { struct stat fileStat; - char filePath[PATH_MAX_LEN + 1] = {0}; - if (realpath(cfg, filePath) == NULL) { + if (stat(TOKEN_ID_CFG_FILE_PATH, &fileStat) != 0) { if (errno == ENOENT) { /* file doesn't exist */ *retBuff = NULL; return ATRET_SUCCESS; } - ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:invalid filePath.", __func__); - return ATRET_FAILED; - } - - if (stat(filePath, &fileStat) != 0) { ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:stat file failed.", __func__); return ATRET_FAILED; } @@ -50,7 +44,7 @@ int32_t GetFileBuff(const char *cfg, char **retBuff) size_t fileSize = (unsigned)fileStat.st_size; - FILE *cfgFd = fopen(filePath, "r"); + FILE *cfgFd = fopen(TOKEN_ID_CFG_FILE_PATH, "r"); if (cfgFd == NULL) { ACCESSTOKEN_LOG_ERROR("[ATLIB-%s]:fopen file failed.", __func__); return ATRET_FAILED; @@ -216,7 +210,7 @@ static int32_t ParseTokenInfo(void) cJSON *record = NULL; int32_t ret; - ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + ret = GetFileBuff(&fileBuff); if (ret != ATRET_SUCCESS) { return ret; } @@ -478,7 +472,7 @@ static void SaveTokenIdToCfg(const NativeTokenList *curr) cJSON *record = NULL; int32_t ret; - ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + ret = GetFileBuff(&fileBuff); if (ret != ATRET_SUCCESS) { return; } @@ -685,7 +679,7 @@ static uint32_t UpdateTokenInfoInCfgFile(NativeTokenList *tokenNode) char *fileBuff = NULL; uint32_t ret; - if (GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff) != ATRET_SUCCESS) { + if (GetFileBuff(&fileBuff) != ATRET_SUCCESS) { return ATRET_FAILED; } diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp index 44eb5cc82026b8a0cba97c77314b22dae4cea7ad..f84953ce45fd967b2f4bd65e6b7895762d540403 100644 --- a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp +++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp @@ -23,7 +23,7 @@ using namespace OHOS::Security; extern NativeTokenList *g_tokenListHead; extern int32_t g_isNativeTokenInited; -extern int32_t GetFileBuff(const char *cfg, char **retBuff); +extern int32_t GetFileBuff(char **retBuff); void TokenLibKitTest::SetUpTestCase() {} @@ -224,7 +224,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId006, TestSize.Level1) ASSERT_NE(tokenID, 0); char *fileBuff = nullptr; - int ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + int ret = GetFileBuff(&fileBuff); ASSERT_EQ(ret, ATRET_SUCCESS); string s = "GetAccessTokenId006"; char *pos = strstr(fileBuff, s.c_str()); @@ -249,7 +249,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId007, TestSize.Level1) ASSERT_NE(tokenId, 0); } char *fileBuff = nullptr; - int ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + int ret = GetFileBuff(&fileBuff); ASSERT_EQ(ret, 0); for (int32_t i = 0; i < 200; i++) { char *pos = strstr(fileBuff, processName[i]); @@ -284,7 +284,7 @@ HWTEST_F(TokenLibKitTest, GetAccessTokenId008, TestSize.Level1) Start("process19"); char *fileBuff = nullptr; - int ret = GetFileBuff(TOKEN_ID_CFG_FILE_PATH, &fileBuff); + int ret = GetFileBuff(&fileBuff); ASSERT_EQ(ret, 0); char *pos = strstr(fileBuff, "process1"); ASSERT_NE(pos, nullptr);