Fixed security button and powershell command, fixed search bar (problem with unexpected details popup's)

MrSnou · MrSnou · commit d9694b700090 · 2025-11-21T17:35:05.000+01:00
diff --git a/HowToRun.md b/HowToRun.md
@@ -0,0 +1,40 @@
+## 🖥️ Installation (2 clicks — for recruiters)
+
+The application is distributed as a **standalone EXE** built with `jpackage`.
+
+### ✔ Requirements
+Nothing except:
+- Windows 10/11
+- Local user profile
+- Windows PowerShell (built-in on Windows 10/11)
+
+> **Java is bundled inside the EXE**.  
+> You do NOT need to install Java.
+
+### ✔ Running the app
+1. Download `SystemLogAnalyzer.rar`
+2. unpack it with winrar anywhere.
+3. Double-click on SystemLogAnalyzer.exe
+4. (Optional) If Security logs are selected → confirm Windows UAC popup 
+
+That's all.
+
+## 📦 How it works
+
+### 1. Choose:
+- directory for storing exported CSVs
+- directory for saving reports
+- log types (Application / System / Security)
+
+### 2. The app:
+- runs PowerShell → exports CSV
+- parses records
+- loads them into a JavaFX table
+
+### 3. You can:
+- filter
+- search
+- inspect details
+- refresh logs anytime
+
+All without touching Event Viewer manually.
diff --git a/HowToRun_PL.md b/HowToRun_PL.md
@@ -0,0 +1,40 @@
+## 🖥️ Instalacja (2 kliknięcia — dla rekruterów)
+
+Aplikacja jest dystrybuowana jako **samodzielny plik EXE** zbudowany przy użyciu `jpackage`.
+
+### ✔ Wymagania
+Nic poza:
+- Windows 10/11
+- Lokalnym profilem użytkownika
+- Windows PowerShell (built-in on Windows 10/11)
+
+> **Java jest dołączona do pliku EXE**.
+> NIE musisz instalować Javy.
+
+### ✔ Uruchamianie aplikacji
+1. Pobierz `SystemLogAnalyzer.exe`
+2. Wypakuj program w dowolne miejsce
+3. Kliknij go dwukrotnie na SystemLogAnalyzer.exe
+4. (Opcjonalnie) Jeśli wybrano dzienniki zabezpieczeń → potwierdź wyskakujące okienko UAC systemu Windows
+
+To wszystko.
+
+## 📦 Jak to działa
+
+### 1. Wybierz:
+- katalog do przechowywania wyeksportowanych plików CSV
+- katalog do zapisywania raportów
+- typy logów (Aplikacja/System/Zabezpieczenia)
+
+### 2. Aplikacja:
+- uruchamia program PowerShell → eksportuje plik CSV
+- analizuje rekordy
+- ładuje je do tabeli JavaFX
+
+### 3. Możesz:
+- filtrować
+- wyszukiwać
+- sprawdzać szczegóły
+- odświeżać logi w dowolnym momencie
+
+Wszystko to bez ręcznego uruchamiania Podglądu zdarzeń.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <dependencies>
 
-        <!-- CZYSTY SPRING (bez Boot) -->
+        <!-- Clear Spring -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
@@ -46,12 +46,19 @@
             <version>25-ea+1</version>
         </dependency>
 
+        <!-- JNA core + platform for elevating app to admin permissions -->
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.13.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
 
-            <!-- Kompilator Javy -->
+            <!-- Java compilator -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -71,7 +78,7 @@
                 </configuration>
             </plugin>
 
-            <!-- Wyłącz testy przy build -->
+            <!-- mvn skip tests (because there is none . . . yet!)-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/main/java/com/project/system_log_analyzer/SystemLogAnalyzerApp.java b/src/main/java/com/project/system_log_analyzer/SystemLogAnalyzerApp.java
@@ -1,29 +1,63 @@
 package com.project.system_log_analyzer;
 
 import com.project.system_log_analyzer.config.SpringConfig;
+import com.project.system_log_analyzer.system.WindowsElevationManager;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+
 public class SystemLogAnalyzerApp extends Application {
 
     private AnnotationConfigApplicationContext springContext;
 
+    private static Boolean elevatedFlag = false; // Admin permissions
+
     @Override
     public void init() {
         springContext = new AnnotationConfigApplicationContext(SpringConfig.class);
+
+        // debug
+        PrintStream out = null;
+        try {
+            out = new PrintStream(new FileOutputStream("app.log", true), true);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        System.setOut(out);
+        System.setErr(out);
     }
 
     @Override
     public void start(Stage primaryStage) throws Exception {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/WelcomeView.fxml"));
         loader.setControllerFactory(springContext::getBean);
 
-        Parent root = loader.load();
+        boolean elevated = getParameters().getRaw().contains("--elevated");
+        elevatedFlag = elevated;          // Admin profile checker
+
+        System.out.println("ARGS = " + getParameters().getRaw()); // Admin permission check to debug file
+
+        com.project.system_log_analyzer.config.appConfig cfg = springContext.getBean(com.project.system_log_analyzer.config.appConfig.class);
 
+        if (elevated) {
+            cfg.setCsvSecurity(true);
+        }
+
+        try {
+            cfg.setCsvSecurity(elevated);
+            IO.println("Elevated mode: " + elevated);
+        } catch (Exception e) {
+            System.err.println("Could not set elevated flag in appConfig: " + e.getMessage());
+        }
+
+        Parent root = loader.load();
         SpringConfig.APP_READY = true;
 
         Scene scene = new Scene(root);
@@ -37,6 +71,10 @@ public void stop() {
         springContext.close();
     }
 
+    public static boolean isElevated() {
+        return Boolean.TRUE.equals(elevatedFlag);
+    }
+
     public static void main(String[] args) {
         launch(args);
     }
diff --git a/src/main/java/com/project/system_log_analyzer/controller/MainWindowFXController.java b/src/main/java/com/project/system_log_analyzer/controller/MainWindowFXController.java
@@ -175,6 +175,9 @@ public void onRefreshClick() {
         refreshButton.setDisable(true);
         logTable.setDisable(true);
         loadingLabel.setText("Refreshing logs… Please wait. (Time of loading depends on number of logs)");
+        logTable.getSelectionModel().clearSelection();
+        logTable.getFocusModel().focus(-1);             // Details unexpected pop-up || Fixed
+        onClearFilters();                                  // Clear all filters
 
         Task<List<LogEvent>> task = new Task<List<LogEvent>>() {
             @Override
@@ -222,6 +225,8 @@ protected List<LogEvent> call() throws Exception {
     }
     @FXML
     public void onSearchChanged() {
+        logTable.getSelectionModel().clearSelection();
+        logTable.getFocusModel().focus(-1);             // Details unexpected pop-up || Fixed
         applyFilters();
     }
 
diff --git a/src/main/java/com/project/system_log_analyzer/controller/WelcomeViewFXController.java b/src/main/java/com/project/system_log_analyzer/controller/WelcomeViewFXController.java
@@ -1,7 +1,10 @@
 package com.project.system_log_analyzer.controller;
 
+import com.project.system_log_analyzer.SystemLogAnalyzerApp;
 import com.project.system_log_analyzer.config.ApplicationContextProvider;
 import com.project.system_log_analyzer.config.appConfig;
+import com.project.system_log_analyzer.system.WindowsElevationManager;
+import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -34,6 +37,11 @@ public class WelcomeViewFXController {
     @FXML
     public void initialize() {
         System.out.println("Controller initialized, appConfig = " + appConfig);
+
+        if (appConfig.isCsvSecurity()) {
+            securityButton.setSelected(true);
+            securityLabel.setText("Admin permission granted!");
+        }
     }
 
 
@@ -57,7 +65,7 @@ private void scan(ActionEvent event) throws IOException {
         ApplicationContext springContext = ApplicationContextProvider.getApplicationContext();
 
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/LoadingScreen.fxml"));
-        loader.setControllerFactory(springContext::getBean); // Spring Boot starter by JavaFX !!IMPORTANT!!
+        loader.setControllerFactory(springContext::getBean); // Spring starter by JavaFX !!IMPORTANT!!
         Parent root = loader.load();
 
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
@@ -103,17 +111,26 @@ private void systemButtonON(ActionEvent event) throws IOException {
 
     @FXML
     private void securityButtonON(ActionEvent event) throws IOException {
+
+        if (SystemLogAnalyzerApp.isElevated()) { // Admin ckeck for Security Logs
+            securityLabel.setText("Admin permission granted!");
+            appConfig.setCsvSecurity(securityButton.isSelected());
+            return;
+        }
+
         if (securityButton.isSelected()) {
             boolean proceed = askForSecurityPermission();
             if (!proceed) {
                 securityButton.setSelected(false);
-                securityLabel.setText("Admin permission required!");
                 appConfig.setCsvSecurity(false);
+                securityLabel.setText("Admin permission required!");
                 return;
-            } else {
-                securityLabel.setText("Admin permission granted!");
-                appConfig.setCsvSecurity(true);
             }
+
+            boolean relaunchStarted = WindowsElevationManager.relaunchAsAdmin("--elevated");
+
+            if (relaunchStarted) Platform.exit();
+
         } else {
             appConfig.setCsvSecurity(false);
             securityLabel.setText("(Requires Admin Permission)");
diff --git a/src/main/java/com/project/system_log_analyzer/io/WindowsEventExporter.java b/src/main/java/com/project/system_log_analyzer/io/WindowsEventExporter.java
@@ -78,7 +78,7 @@ public Path exportToCsv(LogType type) { // Method responsible for exporting logs
         }
     }
 
-    public Path exportSecurityLogsAsAdmin() {  // Method responsible for exporting Security logs with admin permissions
+    public Path exportSecurityLogsAsAdmin() {
         try {
             String baseDir = config.getLogsDir() != null && !config.getLogsDir().isEmpty()
                     ? config.getLogsDir() : "logs/exported";
@@ -89,15 +89,30 @@ public Path exportSecurityLogsAsAdmin() {  // Method responsible for exporting S
             String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss"));
             Path outputFile = Path.of(dir.getAbsolutePath(), "Security_" + timestamp + ".csv");
 
-            String powershellCommand =
-                    "Start-Process powershell -Verb RunAs -ArgumentList " +
-                            "\"Get-WinEvent -LogName Security | " +
+            String ps =
+                    "Get-WinEvent -LogName Security -MaxEvents 15000 | " +
                             "Select-Object TimeCreated, Id, LevelDisplayName, ProviderName, Message | " +
-                            "Export-Csv -Path '" + outputFile.toAbsolutePath() + "' -NoTypeInformation -Encoding UTF8\"";
+                            "Export-Csv -Path '" + outputFile.toAbsolutePath() +
+                            "' -NoTypeInformation -Encoding UTF8";
 
-            ProcessBuilder pb = new ProcessBuilder("Powershell.exe", "-Command", powershellCommand);
+
+
+            List<String> cmd = new ArrayList<>();
+            cmd.add("powershell.exe");
+            cmd.add("-NoProfile");
+            cmd.add("-ExecutionPolicy");
+            cmd.add("Bypass");
+            cmd.add("-Command");
+            cmd.add(ps);
+
+            ProcessBuilder pb = new ProcessBuilder(cmd);
+            pb.redirectErrorStream(true);
             Process process = pb.start();
 
+            try (BufferedReader out = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+                out.lines().forEach(System.out::println);
+            }
+
             int exit = process.waitFor();
 
             if (exit == 0) {
@@ -114,6 +129,7 @@ public Path exportSecurityLogsAsAdmin() {  // Method responsible for exporting S
         return null;
     }
 
+
     public List<Path> exportSelected() {
         List<Path> paths = new ArrayList<>();
 
diff --git a/src/main/java/com/project/system_log_analyzer/system/WindowsElevationManager.java b/src/main/java/com/project/system_log_analyzer/system/WindowsElevationManager.java
@@ -0,0 +1,56 @@
+package com.project.system_log_analyzer.system;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.WString;
+import com.sun.jna.win32.W32APIOptions;
+
+import java.io.File;
+
+public class WindowsElevationManager {
+
+    public interface Shell32 extends com.sun.jna.Library {
+        Shell32 INSTANCE = Native.load("shell32", Shell32.class, W32APIOptions.DEFAULT_OPTIONS);
+
+        Pointer ShellExecuteW(
+                Pointer hwnd,
+                WString lpOperation,
+                WString lpFile,
+                WString lpParameters,
+                WString lpDirectory,
+                int nShowCmd
+        );
+    }
+
+    public static boolean relaunchAsAdmin(String params) {
+        try {
+            String exePath = new File(System.getProperty("user.dir"),
+                    "System_Log_Analyzer.exe").getAbsolutePath();
+
+            Pointer p = Shell32.INSTANCE.ShellExecuteW(
+                    null,
+                    new WString("runas"),
+                    new WString(exePath),
+                    params == null ? null : new WString(params),
+                    null,
+                    1
+            );
+
+            long result = Pointer.nativeValue(p);
+            return result > 32;
+
+        } catch (Throwable t) {
+            t.printStackTrace();
+            return false;
+        }
+    }
+
+    public static boolean isCurrentUserAdmin() {
+        try {
+            new java.io.File("C:\\Windows\\System32\\config\\systemprofile").list();
+            return true;
+        } catch (Throwable e) {
+            return false;
+        }
+    }
+}
