Modify default api version

Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/IB20GL Signed-off-by: huyunhui1 <huyunhui1@huawei.com> Change-Id: If8e469ce0585c5fc4b577e14f1608869dfcd7f01
2024-11-27 00:41:14 +00:00 · 2024-11-04 20:13:55 +08:00 · 2024-11-04 20:13:55 +08:00 · 7d5a576b40
commit 7d5a576b40
parent 9f42f91525
4 changed files with 42 additions and 24 deletions
--- a/libabckit/tests/ut/metadata_core/inspect_api/files/files_test.cpp
+++ b/libabckit/tests/ut/metadata_core/inspect_api/files/files_test.cpp
@ -57,7 +57,7 @@ TEST_F(LibAbcKitInspectApiFilesTest, DynamicFileGetVersion)

    AbckitFileVersion version = g_implI->fileGetVersion(file);
    // NOLINTNEXTLINE(readability-magic-numbers)
-    std::array<uint8_t, ABCKIT_VERSION_SIZE> expectedVersion = {13, 0, 0, 0};
+    std::array<uint8_t, ABCKIT_VERSION_SIZE> expectedVersion = {12, 0, 6, 0};
    const auto versionsEquality = std::memcmp(expectedVersion.data(), version, sizeof(uint8_t) * ABCKIT_VERSION_SIZE);
    ASSERT_EQ(versionsEquality, 0);

--- a/verifier/tests/BUILD.gn
+++ b/verifier/tests/BUILD.gn
@ -48,6 +48,8 @@ foreach(file, verifier_test_js_files) {
    src_js = rebase_path(test_js)
    dst_file = rebase_path(test_abc)

+    extra_args = [ "--source-file=${file}" ]
+
    in_puts = [ test_js ]
    out_puts = [ test_abc ]
  }
@ -61,6 +63,8 @@ foreach(file, verifier_test_ts_files) {
    src_js = rebase_path(test_ts)
    dst_file = rebase_path(test_abc)

+    extra_args = [ "--source-file=${file}" ]
+
    in_puts = [ test_ts ]
    out_puts = [ test_abc ]
  }
--- a/verifier/tests/verify_constant_pool_tests.cpp
+++ b/verifier/tests/verify_constant_pool_tests.cpp
@ -41,6 +41,21 @@ public:
    std::vector<uint8_t> literal_id_in_test_constant_pool = {0x0f, 0x00};
    // The known jump instruction in the abc file
    std::vector<uint8_t> jump_ins_id_in_test_constant_pool = {0x4f, 0x0c};
+
+    void TestVerifierWithAbcVersionTampered(const std::string &file_name,
+                                            std::array<uint8_t, panda_file::File::VERSION_SIZE> &original_version)
+    {
+        panda::verifier::Verifier ver {file_name};
+
+        ver.CollectIdInfos();
+        if (panda_file::IsVersionLessOrEqual(original_version, panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION)) {
+            EXPECT_TRUE(ver.VerifyConstantPoolIndex());
+            EXPECT_TRUE(ver.VerifyConstantPool());
+        } else {
+            EXPECT_TRUE(ver.VerifyConstantPoolIndex());
+            EXPECT_TRUE(ver.VerifyConstantPool());
+        }
+    }
 };

 /**
@ -105,6 +120,8 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_002, TestSize.Level1)
    std::ifstream base_file_02(base_file_name, std::ios::binary);
    EXPECT_TRUE(base_file_02.is_open());
    std::vector<unsigned char> buffer_0(std::istreambuf_iterator<char>(base_file_02), {});
+    std::array<uint8_t, panda_file::File::VERSION_SIZE> version {buffer_0[12], buffer_0[13],
+                                                                 buffer_0[14], buffer_0[15]};
    buffer_0[12] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[0]);
    buffer_0[13] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[1]);
    buffer_0[14] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[2]);
@ -113,12 +130,7 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_002, TestSize.Level1)
    GenerateModifiedAbc(buffer_0, target_file_name_02);
    base_file_02.close();

-    {
-        panda::verifier::Verifier ver {target_file_name_02};
-        ver.CollectIdInfos();
-        EXPECT_FALSE(ver.VerifyConstantPoolIndex());
-        EXPECT_FALSE(ver.VerifyConstantPool());
-    }
+    TestVerifierWithAbcVersionTampered(target_file_name_02, version);
 }

 /**
@ -168,6 +180,8 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_003, TestSize.Level1)
    std::ifstream base_file_02(base_file_name, std::ios::binary);
    EXPECT_TRUE(base_file_02.is_open());
    std::vector<unsigned char> buffer_0(std::istreambuf_iterator<char>(base_file_02), {});
+    std::array<uint8_t, panda_file::File::VERSION_SIZE> version {buffer_0[12], buffer_0[13],
+                                                                 buffer_0[14], buffer_0[15]};
    buffer_0[12] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[0]);
    buffer_0[13] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[1]);
    buffer_0[14] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[2]);
@ -176,11 +190,7 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_003, TestSize.Level1)
    GenerateModifiedAbc(buffer_0, target_file_name_02);
    base_file_02.close();

-    {
-        panda::verifier::Verifier ver {target_file_name_02};
-        ver.CollectIdInfos();
-        EXPECT_FALSE(ver.VerifyConstantPoolIndex());
-    }
+    TestVerifierWithAbcVersionTampered(target_file_name_02, version);
 }

 /**
@ -230,6 +240,8 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_004, TestSize.Level1)
    std::ifstream base_file_02(base_file_name, std::ios::binary);
    EXPECT_TRUE(base_file_02.is_open());
    std::vector<unsigned char> buffer_0(std::istreambuf_iterator<char>(base_file_02), {});
+    std::array<uint8_t, panda_file::File::VERSION_SIZE> version {buffer_0[12], buffer_0[13],
+                                                                 buffer_0[14], buffer_0[15]};
    buffer_0[12] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[0]);
    buffer_0[13] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[1]);
    buffer_0[14] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[2]);
@ -238,11 +250,7 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_004, TestSize.Level1)
    GenerateModifiedAbc(buffer_0, target_file_name_02);
    base_file_02.close();

-    {
-        panda::verifier::Verifier ver {target_file_name_02};
-        ver.CollectIdInfos();
-        EXPECT_FALSE(ver.VerifyConstantPoolIndex());
-    }
+    TestVerifierWithAbcVersionTampered(target_file_name_02, version);
 }

 /**
@ -291,6 +299,8 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_006, TestSize.Level1)
    std::ifstream base_file_02(base_file_name, std::ios::binary);
    EXPECT_TRUE(base_file_02.is_open());
    std::vector<unsigned char> buffer_0(std::istreambuf_iterator<char>(base_file_02), {});
+    std::array<uint8_t, panda_file::File::VERSION_SIZE> version {buffer_0[12], buffer_0[13],
+                                                                 buffer_0[14], buffer_0[15]};
    buffer_0[12] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[0]);
    buffer_0[13] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[1]);
    buffer_0[14] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[2]);
@ -299,11 +309,7 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_006, TestSize.Level1)
    GenerateModifiedAbc(buffer_0, target_file_name_02);
    base_file_02.close();

-    {
-        panda::verifier::Verifier ver {target_file_name_02};
-        ver.CollectIdInfos();
-        EXPECT_FALSE(ver.VerifyConstantPoolIndex());
-    }
+    TestVerifierWithAbcVersionTampered(target_file_name_02, version);
 }

 /**
@ -390,6 +396,8 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_008, TestSize.Level1)
    std::ifstream base_file_02(base_file_name, std::ios::binary);
    EXPECT_TRUE(base_file_02.is_open());
    std::vector<unsigned char> buffer_0(std::istreambuf_iterator<char>(base_file_02), {});
+    std::array<uint8_t, panda_file::File::VERSION_SIZE> version {buffer_0[12], buffer_0[13],
+                                                                 buffer_0[14], buffer_0[15]};
    buffer_0[12] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[0]);
    buffer_0[13] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[1]);
    buffer_0[14] = static_cast<unsigned char>(panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION[2]);
@ -401,7 +409,11 @@ HWTEST_F(VerifierConstantPool, verifier_constant_pool_008, TestSize.Level1)
    {
        panda::verifier::Verifier ver {target_file_name_02};
        ver.CollectIdInfos();
-        EXPECT_FALSE(ver.VerifyConstantPoolIndex());
+        if (panda_file::IsVersionLessOrEqual(version, panda_file::LAST_CONTAINS_LITERAL_IN_HEADER_VERSION)) {
+            EXPECT_TRUE(ver.VerifyConstantPoolIndex());
+        } else {
+            EXPECT_FALSE(ver.VerifyConstantPoolIndex());
+        }
    }
 }

--- a/verifier/verifier.cpp
+++ b/verifier/verifier.cpp
@ -225,7 +225,9 @@ bool Verifier::CheckConstantPoolActions(const verifier::ActionType type, panda_f
 bool Verifier::CollectIdInInstructions(const panda_file::File::EntityId &method_id)
 {
    panda_file::MethodDataAccessor method_accessor(*file_, method_id);
-    ASSERT(method_accessor.GetCodeId().has_value());
+    if (!method_accessor.GetCodeId().has_value()) {
+        return false;
+    }
    panda_file::CodeDataAccessor code_accessor(*file_, method_accessor.GetCodeId().value());
    const auto ins_size = code_accessor.GetCodeSize();
    const auto ins_arr = code_accessor.GetInstructions();