Dark-Horse-Linux/dpm-core
1
0
Fork 0
Code Pull Requests Releases Activity

moving some loading functionality to dpmdk

Browse Source
This commit is contained in:
Chris Punches
2025-03-28 22:04:27 -04:00
parent 7b29824e40
commit 56e471e227
6 changed files with 384 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/verify/CMakeLists.txt
View File

@@ -10,10 +10,11 @@ else()
set(DPM_ROOT_DIR "${CMAKE_SOURCE_DIR}")
endif()
# Create shared library
# Create shared library - add CommonModuleAPI.cpp to the sources
add_library(verify MODULE
verify.cpp
src/verify_commands.cpp
${DPM_ROOT_DIR}/dpmdk/src/CommonModuleAPI.cpp # Add this line
)
# Set output properties
@@ -27,12 +28,17 @@ set_target_properties(
target_include_directories(verify PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include
${DPM_ROOT_DIR}
${DPM_ROOT_DIR}/dpmdk/include # Add this line
)
# Link with required libraries
target_link_libraries(verify dl)
# Standalone version - used for debugging
add_executable(verify_standalone
verify.cpp
src/verify_commands.cpp
${DPM_ROOT_DIR}/dpmdk/src/CommonModuleAPI.cpp # Add this line
)
# Define the BUILD_STANDALONE macro for the standalone build
@@ -42,8 +48,12 @@ target_compile_definitions(verify_standalone PRIVATE BUILD_STANDALONE)
target_include_directories(verify_standalone PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/include
${DPM_ROOT_DIR}
${DPM_ROOT_DIR}/dpmdk/include # Add this line
)
# Link with required libraries for standalone too
target_link_libraries(verify_standalone dl)
# Set the output name for the standalone executable
set_target_properties(
verify_standalone PROPERTIES

55
modules/verify/include/verify_commands.hpp
View File

@@ -42,6 +42,17 @@ enum Command {
*/
int cmd_checksum(int argc, char** argv);
/**
* @brief Handler for the checksum help command
*
* Displays help information for the checksum command.
*
* @param argc Number of arguments
* @param argv Array of arguments
* @return 0 on success
*/
int cmd_checksum_help(int argc, char** argv);
/**
* @brief Handler for the signature command
*
@@ -53,6 +64,17 @@ int cmd_checksum(int argc, char** argv);
*/
int cmd_signature(int argc, char** argv);
/**
* @brief Handler for the signature help command
*
* Displays help information for the signature command.
*
* @param argc Number of arguments
* @param argv Array of arguments
* @return 0 on success
*/
int cmd_signature_help(int argc, char** argv);
/**
* @brief Handler for the help command
*
@@ -64,6 +86,29 @@ int cmd_signature(int argc, char** argv);
*/
int cmd_help(int argc, char** argv);
/**
* @brief Handler for the check command
*
* Checks if the build module can be loaded. This validates that the integration
* between the verify module and build module is working correctly.
*
* @param argc Number of arguments
* @param argv Array of arguments
* @return 0 on success, non-zero on failure
*/
int cmd_check(int argc, char** argv);
/**
* @brief Handler for the check help command
*
* Displays help information for the check command.
*
* @param argc Number of arguments
* @param argv Array of arguments
* @return 0 on success
*/
int cmd_check_help(int argc, char** argv);
/**
* @brief Handler for unknown commands
*
@@ -88,13 +133,11 @@ int cmd_unknown(const char* command, int argc, char** argv);
Command parse_command(const char* cmd_str);
/**
* @brief Handler for the check command
* @brief Helper function to check and load the build module
*
* Checks if the build module can be loaded. This validates that the integration
* between the verify module and build module is working correctly.
* Checks if the build module exists and can be loaded.
*
* @param argc Number of arguments
* @param argv Array of arguments
* @param module_handle Reference to a void pointer that will hold the module handle
* @return 0 on success, non-zero on failure
*/
int cmd_check(int argc, char** argv);
int check_and_load_build_module(void*& module_handle);

141
modules/verify/src/verify_commands.cpp
View File

@@ -13,35 +13,36 @@
#include "verify_commands.hpp"
int check_and_load_build_module(void*& module_handle) {
// Get the module path using the new direct accessor
const char* module_path = dpm_get_module_path();
if (!module_path || strlen(module_path) == 0) {
dpm_log(LOG_ERROR, "Module path not available");
// Check if build module exists
if (!dpm_module_exists("build")) {
dpm_log(LOG_ERROR, "Build module not found");
return 1;
}
// Create a proper path object
std::filesystem::path modules_dir(module_path);
// Build path to the build module
std::filesystem::path build_module_path = modules_dir / "build.so";
// Check if the file exists
if (!std::filesystem::exists(build_module_path)) {
dpm_log(LOG_ERROR, ("Build module not found at: " + build_module_path.string()).c_str());
return 1;
// Load the build module
int result = dpm_load_module("build", &module_handle);
if (result != 0) {
dpm_log(LOG_ERROR, "Failed to load build module");
return result;
}
// Load the module
module_handle = dlopen(build_module_path.c_str(), RTLD_LAZY);
if (!module_handle) {
dpm_log(LOG_ERROR, ("Failed to load build module: " + std::string(dlerror())).c_str());
return 1;
}
// Clear any error
dlerror();
return 0;
}
int cmd_checksum_help(int argc, char** argv) {
dpm_con(LOG_INFO, "Usage: dpm verify checksum [options]");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Verifies the checksums of uninstalled packages.");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Options:");
dpm_con(LOG_INFO, " -a, --all Verify all uninstalled packages");
dpm_con(LOG_INFO, " -p, --package NAME Verify a specific package");
dpm_con(LOG_INFO, " -v, --verbose Enable verbose output");
dpm_con(LOG_INFO, " -h, --help Display this help message");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Examples:");
dpm_con(LOG_INFO, " dpm verify checksum --all");
dpm_con(LOG_INFO, " dpm verify checksum --package=mypackage");
return 0;
}
@@ -72,20 +73,7 @@ int cmd_checksum(int argc, char** argv) {
// If help was requested, show it and return
if (show_help) {
dpm_con(LOG_INFO, "Usage: dpm verify checksum [options]");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Verifies the checksums of installed packages.");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Options:");
dpm_con(LOG_INFO, " -a, --all Verify all installed packages");
dpm_con(LOG_INFO, " -p, --package NAME Verify a specific package");
dpm_con(LOG_INFO, " -v, --verbose Enable verbose output");
dpm_con(LOG_INFO, " -h, --help Display this help message");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Examples:");
dpm_con(LOG_INFO, " dpm verify checksum --all");
dpm_con(LOG_INFO, " dpm verify checksum --package=mypackage");
return 0;
return cmd_checksum_help(argc, argv);
}
// Set verbose logging if requested
@@ -117,6 +105,23 @@ int cmd_checksum(int argc, char** argv) {
return 0;
}
int cmd_signature_help(int argc, char** argv) {
dpm_con(LOG_INFO, "Usage: dpm verify signature [options]");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Verifies the signatures of installed packages.");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Options:");
dpm_con(LOG_INFO, " -a, --all Verify all installed packages");
dpm_con(LOG_INFO, " -p, --package NAME Verify a specific package");
dpm_con(LOG_INFO, " -v, --verbose Enable verbose output");
dpm_con(LOG_INFO, " -h, --help Display this help message");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Examples:");
dpm_con(LOG_INFO, " dpm verify signature --all");
dpm_con(LOG_INFO, " dpm verify signature --package=mypackage");
return 0;
}
int cmd_signature(int argc, char** argv) {
// Parse command line arguments
bool all_packages = false;
@@ -144,20 +149,7 @@ int cmd_signature(int argc, char** argv) {
// If help was requested, show it and return
if (show_help) {
dpm_con(LOG_INFO, "Usage: dpm verify signature [options]");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Verifies the signatures of installed packages.");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Options:");
dpm_con(LOG_INFO, " -a, --all Verify all installed packages");
dpm_con(LOG_INFO, " -p, --package NAME Verify a specific package");
dpm_con(LOG_INFO, " -v, --verbose Enable verbose output");
dpm_con(LOG_INFO, " -h, --help Display this help message");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Examples:");
dpm_con(LOG_INFO, " dpm verify signature --all");
dpm_con(LOG_INFO, " dpm verify signature --package=mypackage");
return 0;
return cmd_signature_help(argc, argv);
}
// Set verbose logging if requested
@@ -189,6 +181,17 @@ int cmd_signature(int argc, char** argv) {
return 0;
}
int cmd_check_help(int argc, char** argv) {
dpm_con(LOG_INFO, "Usage: dpm verify check [options]");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Checks build module integration.");
dpm_con(LOG_INFO, "");
dpm_con(LOG_INFO, "Options:");
dpm_con(LOG_INFO, " -v, --verbose Enable verbose output");
dpm_con(LOG_INFO, " -h, --help Display this help message");
return 0;
}
int cmd_help(int argc, char** argv) {
dpm_con(LOG_INFO, "DPM Verify Module - Verifies the integrity and signatures of installed packages.");
dpm_con(LOG_INFO, "");
@@ -236,6 +239,31 @@ Command parse_command(const char* cmd_str) {
}
int cmd_check(int argc, char** argv) {
// Parse command line arguments
bool verbose = false;
bool show_help = false;
// Process command-line arguments
for (int i = 1; i < argc; i++) {
std::string arg = argv[i];
if (arg == "-v" || arg == "--verbose") {
verbose = true;
} else if (arg == "-h" || arg == "--help" || arg == "help") {
show_help = true;
}
}
// If help was requested, show it and return
if (show_help) {
return cmd_check_help(argc, argv);
}
// Set verbose logging if requested
if (verbose) {
dpm_set_logging_level(LOG_DEBUG);
}
dpm_log(LOG_INFO, "Checking build module integration...");
void* module_handle = nullptr;
@@ -248,9 +276,18 @@ int cmd_check(int argc, char** argv) {
dpm_log(LOG_INFO, "Successfully loaded build module.");
// Check if the dpm_module_execute symbol exists
if (!dpm_symbol_exists(module_handle, "dpm_module_execute")) {
dpm_log(LOG_ERROR, "Symbol 'dpm_module_execute' not found in build module.");
dpm_unload_module(module_handle);
return 1;
}
dpm_log(LOG_INFO, "Symbol 'dpm_module_execute' found in build module.");
// Clean up
if (module_handle) {
dlclose(module_handle);
dpm_unload_module(module_handle);
}
return 0;