openharmony/ace_napi
1
0
Fork 0
mirror of https://github.com/openharmony/ace_napi.git synced 2026-07-21 16:55:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Strengthen plugin name verification

Browse Source 
Signed-off-by: huzeqi <huzeqi@huawei.com>
Change-Id: I63a14e0a6b70e9ad1bfac2bea48983e3e89f424f
This commit is contained in:
huzeqi
2022-03-09 10:52:58 +08:00
parent 85003e4182
commit 52304ab682
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module_manager/native_module_manager.cpp
+21 -12
View File
@@ -170,12 +170,6 @@ bool NativeModuleManager::GetNativeModulePath(
const char* sysPrefix = "/system/lib/module";
const char* zfix = ".z";
#endif
const char* prefix = nullptr;
if (isAppModule && appLibPath_) {
prefix = appLibPath_;
} else {
prefix = sysPrefix;
}
int32_t lengthOfModuleName = strlen(moduleName);
char dupModuleName[NAPI_PATH_MAX] = { 0 };
if (strcpy_s(dupModuleName, NAPI_PATH_MAX, moduleName) != 0) {
@@ -183,8 +177,14 @@ bool NativeModuleManager::GetNativeModulePath(
return false;
}
for (int32_t i = 0; i < lengthOfModuleName; i++) {
dupModuleName[i] = tolower(dupModuleName[i]);
const char* prefix = nullptr;
if (isAppModule && appLibPath_) {
prefix = appLibPath_;
} else {
prefix = sysPrefix;
for (int32_t i = 0; i < lengthOfModuleName; i++) {
dupModuleName[i] = tolower(dupModuleName[i]);
}
}
int32_t lengthOfPostfix = strlen(soPostfix);
@@ -198,7 +198,7 @@ bool NativeModuleManager::GetNativeModulePath(
char* lastDot = strrchr(dupModuleName, '.');
if (lastDot == nullptr) {
if (strcmp(prefix, sysPrefix) == 0) {
if (!isAppModule || !appLibPath_) {
if (sprintf_s(nativeModulePath[0], pathLength, "%s/lib%s%s%s",
prefix, dupModuleName, zfix, soPostfix) == -1) {
return false;
@@ -225,7 +225,7 @@ bool NativeModuleManager::GetNativeModulePath(
*(dupModuleName + i) = '/';
}
}
if (strcmp(prefix, sysPrefix) == 0) {
if (!isAppModule || !appLibPath_) {
if (sprintf_s(nativeModulePath[0], pathLength, "%s/%s/lib%s%s%s",
prefix, dupModuleName, afterDot, zfix, soPostfix) == -1) {
return false;
@@ -275,8 +275,8 @@ LIBHANDLE NativeModuleManager::LoadModuleLibrary(const char* path, const bool is
}
using NAPIGetJSCode = void (*)(const char** buf, int* bufLen);
NativeModule* NativeModuleManager::FindNativeModuleByDisk(const char* moduleName, bool internal, const bool isAppModule,
bool isArk)
NativeModule* NativeModuleManager::FindNativeModuleByDisk(
const char* moduleName, bool internal, const bool isAppModule, bool isArk)
{
char nativeModulePath[NATIVE_PATH_NUMBER][NAPI_PATH_MAX];
nativeModulePath[0][0] = 0;
@@ -300,6 +300,11 @@ NativeModule* NativeModuleManager::FindNativeModuleByDisk(const char* moduleName
}
}
if (strcmp(lastNativeModule_->name, moduleName)) {
HILOG_WARN("moduleName '%{public}s' does not match plugin's name '%{public}s'",
moduleName, lastNativeModule_->name);
}
if (!internal) {
char symbol[NAPI_PATH_MAX] = { 0 };
if (!isArk) {
@@ -343,6 +348,10 @@ NativeModule* NativeModuleManager::FindNativeModuleByCache(const char* moduleNam
NativeModule* result = nullptr;
for (NativeModule* temp = firstNativeModule_; temp != nullptr; temp = temp->next) {
if (!strcasecmp(temp->name, moduleName)) {
if (strcmp(temp->name, moduleName)) {
HILOG_WARN("moduleName '%{public}s' does not match plugin's name '%{public}s'",
moduleName, temp->name);
}
result = temp;
break;
}