shits bussin for real now

dependencies/vmprofiler

@@ -1 +1 @@
-Subproject commit d96f065dd3a696f0b0ef790378e287f2356ecc8d
+Subproject commit c746d04f1b0c0f8880b8fb792c7663dfafb3c980

src/main.cpp

@@ -1,12 +1,31 @@
-#include <Windows.h>
 #include <ZydisExportConfig.h>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <algorithm>
 
+#include <nt/image.hpp>
 #include <cli-parser.hpp>
 #include <vmprofiler.hpp>
 
+auto open_binary_file( const std::string &file, std::vector< uint8_t > &data ) -> bool
+{
+    std::ifstream fstr( file, std::ios::binary );
+
+    if ( !fstr.is_open() )
+        return false;
+
+    fstr.unsetf( std::ios::skipws );
+    fstr.seekg( 0, std::ios::end );
+
+    const auto file_size = fstr.tellg();
+
+    fstr.seekg( NULL, std::ios::beg );
+    data.reserve( static_cast< uint32_t >( file_size ) );
+    data.insert( data.begin(), std::istream_iterator< uint8_t >( fstr ), std::istream_iterator< uint8_t >() );
+    return true;
+}
+
 int __cdecl main( int argc, const char *argv[] )
 {
     argparse::argument_parser_t parser( "vmprofiler-cli", "virtual machine information inspector" );
@@ -31,7 +50,6 @@ int __cdecl main( int argc, const char *argv[] )
 
     parser.enable_help();
     auto err = parser.parse( argc, argv );
-    const auto umtils = xtils::um_t::get_instance();
 
     if ( err )
     {
@@ -45,7 +63,7 @@ int __cdecl main( int argc, const char *argv[] )
         return 0;
     }
 
-    if ( parser.exists( "bin" ) && parser.exists( "scanfortables" ) )
+    if ( parser.exists( "bin" ) && parser.exists( "vmentry" ) )
     {
         if ( !std::filesystem::exists( parser.get< std::string >( "bin" ) ) )
         {
@@ -53,38 +71,30 @@ int __cdecl main( int argc, const char *argv[] )
             return -1;
         }
 
-        const auto module_base = reinterpret_cast< std::uintptr_t >(
-            LoadLibraryExA( parser.get< std::string >( "bin" ).c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES ) );
-
-        auto result = vm::locate::all_handler_tables( module_base );
-        std::vector< std::uint32_t > handler_table_rvas;
-
-        std::for_each( result.begin(), result.end(), [ & ]( const vm::locate::vm_handler_table_info_t &data ) {
-            if ( std::find( handler_table_rvas.begin(), handler_table_rvas.end(), data.rva ) ==
-                 handler_table_rvas.end() )
-                handler_table_rvas.push_back( data.rva );
-        } );
-
-        std::printf( "{\n" );
-        for ( auto &table_rva : handler_table_rvas )
-            std::printf( "\t0x%x,\n", table_rva );
-        std::printf( "}\n" );
-    }
-
-    if ( parser.exists( "bin" ) && parser.exists( "vmentry" ) )
+        std::vector<std::uint8_t> module_data, tmp;
+        if(!open_binary_file(parser.get< std::string >( "bin" ), module_data))
         {
-        if ( !std::filesystem::exists( parser.get< std::string >( "bin" ) ) )
-        {
-            std::printf( "> path to protected file is invalid... check your cli args...\n" );
+            std::printf("[!] failed to open binary = %s\n", parser.get< std::string >( "bin" ).c_str());
             return -1;
         }
 
-        const auto module_base = reinterpret_cast< std::uintptr_t >(
-            LoadLibraryExA( parser.get< std::string >( "bin" ).c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES ) );
+        auto img = reinterpret_cast<win::image_t<>*>(module_data.data());
+        auto image_size = img->get_nt_headers()->optional_header.size_image;
+
+        tmp.resize(image_size);
+        std::memcpy(tmp.data(), module_data.data(), 0x1000);
+        std::for_each(img->get_nt_headers()->get_sections(), 
+            img->get_nt_headers()->get_sections() + img->get_nt_headers()->file_header.num_sections, 
+            [&](const auto& section_header)
+        {
+            std::memcpy(tmp.data() + section_header.virtual_address, 
+                module_data.data() + section_header.ptr_raw_data,
+                section_header.size_raw_data);
+        }); 
 
+        const auto module_base = reinterpret_cast<std::uintptr_t>(tmp.data());
         const auto vm_entry_rva = std::strtoull( parser.get< std::string >( "vmentry" ).c_str(), nullptr, 16 );
-        const auto image_base = umtils->image_base( parser.get< std::string >( "bin" ).c_str() );
-        const auto image_size = NT_HEADER( module_base )->OptionalHeader.SizeOfImage;
+        const auto image_base = img->get_nt_headers()->optional_header.image_base;
 
         std::printf( "> module base = 0x%p, image base = 0x%p, image size = 0x%p\n", module_base, image_base,
                      image_size );
@@ -182,7 +192,7 @@ int __cdecl main( int argc, const char *argv[] )
         return {};
 
     std::vector< std::uint8_t > vmp2file;
-    if ( !umtils->open_binary_file( parser.get< std::string >( "vmp2file" ), vmp2file ) )
+    if ( !open_binary_file( parser.get< std::string >( "vmp2file" ), vmp2file ) )
     {
         std::printf( "[!] failed to open vmp2 file...\n" );
         return -1;
@@ -243,7 +253,7 @@ int __cdecl main( int argc, const char *argv[] )
                     std::printf( "> -----------------------------------------------------------------------\n" );
 
                     auto block_vinstrs = reinterpret_cast< vm::instrs::virt_instr_t * >(
-                        reinterpret_cast< std::uintptr_t >( code_block ) + sizeof vmp2::v4::code_block_t +
+                        reinterpret_cast< std::uintptr_t >( code_block ) + sizeof(vmp2::v4::code_block_t) +
                         ( code_block->num_block_addrs * 8 ) );
 
                     for ( auto idx = 0u; idx < code_block->vinstr_count; ++idx )