Added better tests and secure logging

Author: bram

.github/workflows/build-and-release.yml

@@ -364,17 +364,19 @@ jobs:
           xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" cmake --build build --target all
           cd build
           mkdir -p Testing/Temporary
-          echo "Running tests with minimal output..."
-          xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./OpenCryptUITest -v2 | tee Testing/Temporary/LastTest.log
+          chmod +x run_tests.sh
+          echo "Running tests with filtered output..."
+          xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./run_tests.sh -v2 | tee Testing/Temporary/LastTest.log
 
       - name: Run tests (macOS)
         if: matrix.os == 'macos-latest'
         run: |
           cmake --build build --target all
           cd build
           mkdir -p Testing/Temporary
-          echo "Running tests with minimal output..."
-          ./OpenCryptUITest -v2 | tee Testing/Temporary/LastTest.log
+          chmod +x run_tests.sh
+          echo "Running tests with filtered output..."
+          ./run_tests.sh -v2 | tee Testing/Temporary/LastTest.log
 
       - name: Run tests (Windows)
         if: matrix.os == 'windows-latest'
@@ -383,13 +385,25 @@ jobs:
           cmake --build build --target all
           cd build
           mkdir -p Testing/Temporary
-          echo "Running tests with minimal output..."
+          echo "Running tests with filtered output..."
           export QT_QPA_PLATFORM=minimal
           
           if [ -f "./OpenCryptUITest.exe" ]; then
             chmod +x ./OpenCryptUITest.exe
-            # Use -v2 instead of -v4, as -v4 is not a valid option for QtTest
-            ./OpenCryptUITest.exe -v2 | tee Testing/Temporary/LastTest.log
+            # Create a Windows-specific run_tests.bat script
+            cat > run_tests.bat << EOF
+@echo off
+:: Set Qt logging rules to disable Qt internal categories
+set QT_LOGGING_RULES=qt.*=false
+set QT_MESSAGE_PATTERN=[%{type}] %{message}
+
+:: Run the test with filtering
+.\OpenCryptUITest.exe %*
+EOF
+            chmod +x run_tests.bat
+            
+            # Run the tests using our script
+            ./run_tests.bat -v2 | tee Testing/Temporary/LastTest.log
           else
             echo "ERROR: OpenCryptUITest.exe not found!" | tee Testing/Temporary/LastTest.log
             echo "Directory contents: $(ls -la)" | tee -a Testing/Temporary/LastTest.log

CMakeLists.txt

@@ -143,6 +143,11 @@ set_target_properties(OpenCryptUI PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 target_compile_options(OpenCryptUI PRIVATE -fPIC)
 
+# Disable logging for main application
+target_compile_definitions(OpenCryptUI PRIVATE
+    -DNO_LOGGING
+)
+
 target_include_directories(OpenCryptUI PRIVATE 
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/src
@@ -189,6 +194,12 @@ set_target_properties(OpenCryptUITest PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 target_compile_options(OpenCryptUITest PRIVATE -fPIC)
 
+# Always enable logging for tests
+target_compile_definitions(OpenCryptUITest PRIVATE
+    -DTEST_MODE
+    -DENABLE_LOGGING
+)
+
 target_include_directories(OpenCryptUITest PRIVATE 
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/src
@@ -217,6 +228,16 @@ target_link_libraries(OpenCryptUITest PRIVATE
 enable_testing()
 add_test(NAME OpenCryptUITest COMMAND OpenCryptUITest)
 
+# Copy test runner script
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/run_tests.sh
+    ${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh
+    COPYONLY
+)
+# Make the script executable
+file(CHMOD ${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh 
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
 # Print paths for debugging
 message(STATUS "Qt5_DIR: ${Qt5_DIR}")
 message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")

include/logging/secure_logger.h

@@ -53,28 +53,39 @@ class SecureLogger {
 #include <QProcessEnvironment>
 #include <QCoreApplication>
 
-// Check if we're in release mode (compiled with NDEBUG and not in CI/test)
+// Check if we're in release mode (no logging mode)
 inline bool isReleaseMode() {
     static bool checked = false;
     static bool inRelease = false;
     if (!checked) {
-        // Release mode if:
+        // Release mode (no logging) if:
         // 1. NO_LOGGING environment var exists OR
-        // 2. App was compiled with NDEBUG and we're NOT in CI environment
+        // 2. NO_LOGGING defined at compile time
+        // 3. App was compiled with NDEBUG and we're NOT in CI environment
+        // 4. NOT explicitly ENABLE_LOGGING defined (for tests)
         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
         bool isCI = env.contains("CI") || env.contains("GITHUB_ACTIONS") || 
                    env.contains("GITLAB_CI") || env.contains("TRAVIS");
 
-        // Explicitly disabled or release build outside CI
-        inRelease = env.contains("NO_LOGGING") || 
-                   (
-                    #ifdef NDEBUG
-                    true &&
-                    #else
-                    false &&
-                    #endif
-                    !isCI
-                   );
+        // Check if logging is explicitly enabled for tests
+        #ifdef ENABLE_LOGGING
+            inRelease = false;
+        #else
+            // Explicitly disabled or release build outside CI
+            #ifdef NO_LOGGING
+                inRelease = true;
+            #else
+                inRelease = env.contains("NO_LOGGING") || 
+                           (
+                            #ifdef NDEBUG
+                                true &&
+                            #else
+                                false &&
+                            #endif
+                            !isCI
+                           );
+            #endif
+        #endif
         checked = true;
     }
     return inRelease;

include/mainwindow.h

@@ -76,7 +76,7 @@ private slots:
     void on_actionAboutKDFs_triggered();
     void on_actionAboutIterations_triggered();  
     void applyTheme(const QString &theme);
-    void on_cryptoProviderComboBox_currentIndexChanged(const QString &providerName);
+    void on_m_cryptoProviderComboBox_currentIndexChanged(const QString &providerName);
     void showProviderCapabilities();
 
     // Password security and security UI

scripts/run_tests.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Run tests with suppressed Qt warnings
+# This script completely filters out Qt's internal debug logs
+# while preserving the actual test results
+
+# Suppress all Qt internal categories
+export QT_LOGGING_RULES="qt.*=false"
+
+# Simplify output pattern
+export QT_MESSAGE_PATTERN="[%{type}] %{message}"
+
+# Run the tests and filter output
+./OpenCryptUITest "$@" 2>&1 | grep -v "^QDEBUG : TestOpenCryptUI::initTestCase() \[debug\] qt\." | grep -v "^QDEBUG : TestOpenCryptUI::initTestCase() \[debug\] QFont::"

src/encryptionworker.cpp

@@ -276,8 +276,8 @@ void EncryptionWorker::process()
         double mbps = fileSizeMB / seconds;
 
         SECURE_LOG(INFO, "EncryptionWorker", 
-            QString("Operation completed successfully in %.2f seconds (%.2f MB/s)")
-            .arg(seconds).arg(mbps));
+            QString("Operation completed successfully in %1 seconds (%2 MB/s)")
+            .arg(seconds, 0, 'f', 2).arg(mbps, 0, 'f', 2));
 
         emit finished(true, QString());
         emit benchmarkResultReady(iterations, mbps, seconds * 1000, algorithm, kdf);

src/main.cpp

@@ -1,5 +1,6 @@
 #include "mainwindow.h"
 #include <QApplication>
+#include <QLoggingCategory>
 #include <openssl/crypto.h>
 #include "version.h"
 #include "logging/secure_logger.h"
@@ -16,10 +17,20 @@ int main(int argc, char *argv[])
     // Configure logging - simplified approach
     SecureLogger& logger = SecureLogger::getInstance();
 
+    // Configure Qt logging rules to disable internal Qt logs
+    QLoggingCategory::setFilterRules(
+        "qt.*.debug=false\n"
+        "qt.*.info=false\n"
+        "qt.*.warning=false"
+    );
+    
     // No logging in the main application (OpenCryptUI)
     // All logging is done in the test version (OpenCryptUITest)
     logger.setLogLevel(SecureLogger::LogLevel::ERROR_LEVEL);
     logger.setLogToFile(false);
+    
+    // This is a test log message to verify logging configuration
+    SECURE_LOG(INFO, "MainApplication", "Application starting - this should only appear in test mode");
 
     QApplication app(argc, argv);