v0.9.0: no-MAC device tracking, IP-change dashboard, extended search

2026-07-02 20:37:57 +02:00
parent 9fa20af87a
commit 85118c5bcc
23 changed files with 1703 additions and 48 deletions
@@ -4,26 +4,53 @@ namespace App\Http\Controllers;

 use App\Models\NetworkDevice;
 use App\Models\NetworkDeviceEvent;
+use App\Models\NetworkHost;
 use App\Models\NetworkScan;
 use App\Models\NetworkSegment;
 use App\Services\NetworkScanImporter;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\View\View;

 class NetworkController extends Controller
 {
+    // --- Subnetz-Erkennung aus vorhandenen IP-Daten ---
+    public function detectSubnets(): JsonResponse
+    {
+        $subnets = DB::table('network_hosts')
+            ->whereNotNull('ip_address')
+            ->select(DB::raw("CONCAT(SUBSTRING_INDEX(ip_address, '.', 3), '.0/24') as subnet"))
+            ->distinct()
+            ->orderBy('subnet')
+            ->pluck('subnet')
+            ->toArray();
+
+        return response()->json($subnets);
+    }
+
    // --- Dashboard ---
    public function dashboard(): View
    {
        $segments = NetworkSegment::withCount('scans')->orderBy('name')->get();
        $totalDevices  = NetworkDevice::count();
        $onlineDevices = NetworkDevice::where('status', 'online')->count();
-        $recentEvents  = NetworkDeviceEvent::with('device')
+
+        // IP-Wechsel separat → prominenter Block oben
+        $ipChangeEvents = NetworkDeviceEvent::with('device')
            ->where('documented', false)
+            ->where('event_type', 'ip_changed')
            ->latest()
-            ->take(10)
+            ->get();
+
+        // Alle anderen undokumentierten Ereignisse
+        $recentEvents = NetworkDeviceEvent::with('device')
+            ->where('documented', false)
+            ->where('event_type', '!=', 'ip_changed')
+            ->latest()
+            ->take(15)
            ->get();

        // Letzten Scan pro Segment
@@ -33,31 +60,113 @@ class NetworkController extends Controller
            ->groupBy('segment_id');

        return view('network.dashboard', compact(
-            'segments', 'totalDevices', 'onlineDevices', 'recentEvents', 'latestScans'
+            'segments', 'totalDevices', 'onlineDevices',
+            'recentEvents', 'ipChangeEvents', 'latestScans'
        ));
    }

+    // --- Chronologischer IP-Verlauf ---
+    public function history(Request $request): View
+    {
+        $query = \App\Models\NetworkHost::query()
+            ->join('network_scans', 'network_scans.id', '=', 'network_hosts.scan_id')
+            ->leftJoin('network_segments', 'network_segments.id', '=', 'network_scans.segment_id')
+            ->leftJoin('network_devices', 'network_devices.id', '=', 'network_hosts.device_id')
+            ->select([
+                'network_hosts.*',
+                'network_scans.created_at as scan_time',
+                'network_scans.segment_id',
+                'network_scans.scanner',
+                'network_segments.name as segment_name',
+                'network_devices.label as device_label',
+            ]);
+
+        if ($request->filled('ip')) {
+            $query->where('network_hosts.ip_address', 'like', '%' . $request->ip . '%');
+        }
+        if ($request->filled('mac')) {
+            $query->where('network_hosts.mac_address', 'like', '%' . $request->mac . '%');
+        }
+        if ($request->filled('hostname')) {
+            $query->where(function ($q) use ($request) {
+                $q->where('network_hosts.hostname', 'like', '%' . $request->hostname . '%')
+                  ->orWhere('network_devices.label', 'like', '%' . $request->hostname . '%');
+            });
+        }
+        if ($request->filled('segment')) {
+            $query->where('network_scans.segment_id', $request->segment);
+        }
+        if ($request->filled('status')) {
+            $query->where('network_hosts.status', $request->status);
+        }
+        if ($request->filled('from')) {
+            $query->where('network_scans.created_at', '>=', $request->from . ' 00:00:00');
+        }
+        if ($request->filled('to')) {
+            $query->where('network_scans.created_at', '<=', $request->to . ' 23:59:59');
+        }
+
+        $entries  = $query->orderByDesc('network_scans.created_at')
+                          ->orderByRaw('INET_ATON(network_hosts.ip_address)')
+                          ->paginate(100)
+                          ->withQueryString();
+
+        $segments = \App\Models\NetworkSegment::orderBy('name')->get();
+
+        return view('network.history', compact('entries', 'segments'));
+    }
+
    // --- Globale Suche ---
    public function search(Request $request): View
    {
        $q       = trim($request->get('q', ''));
        $devices = collect();
+        $hostResults = collect();

        if (strlen($q) >= 2) {
+            // Suche in network_devices (MAC-basiert / bereits getracked)
            $devices = NetworkDevice::with('events')
                ->where(function ($query) use ($q) {
-                    $query->where('current_ip',   'like', "%{$q}%")
+                    $query->where('current_ip',    'like', "%{$q}%")
                          ->orWhere('mac_address', 'like', "%{$q}%")
                          ->orWhere('hostname',    'like', "%{$q}%")
+                          ->orWhere('netbios_name','like', "%{$q}%")
                          ->orWhere('label',       'like', "%{$q}%")
                          ->orWhere('mac_vendor',  'like', "%{$q}%");
                })
                ->orderBy('current_ip')
                ->paginate(50)
                ->withQueryString();
+
+            // Zusätzlich: direkte Suche in network_hosts (auch ohne Device-Eintrag)
+            // Zeigt IPs/Hosts die in Scans gefunden wurden, aber noch kein Device-Record haben
+            $hostResults = NetworkHost::query()
+                ->join('network_scans', 'network_scans.id', '=', 'network_hosts.scan_id')
+                ->leftJoin('network_segments', 'network_segments.id', '=', 'network_scans.segment_id')
+                ->whereNull('network_hosts.device_id')
+                ->where(function ($query) use ($q) {
+                    $query->where('network_hosts.ip_address', 'like', "%{$q}%")
+                          ->orWhere('network_hosts.mac_address', 'like', "%{$q}%")
+                          ->orWhere('network_hosts.hostname',   'like', "%{$q}%");
+                })
+                ->select([
+                    'network_hosts.ip_address',
+                    'network_hosts.mac_address',
+                    'network_hosts.hostname',
+                    'network_hosts.mac_vendor',
+                    'network_hosts.status',
+                    'network_hosts.ping_ms',
+                    'network_scans.created_at as scan_time',
+                    'network_segments.name as segment_name',
+                    DB::raw('network_scans.id as scan_id'),
+                ])
+                ->orderByDesc('network_scans.created_at')
+                ->limit(50)
+                ->get()
+                ->unique('ip_address'); // Jede IP nur einmal (neuester Fund)
        }

-        return view('network.search', compact('q', 'devices'));
+        return view('network.search', compact('q', 'devices', 'hostResults'));
    }

    // --- Alte index-Route umleiten ---
@@ -203,6 +312,12 @@ class NetworkController extends Controller
            ->orderByRaw("INET_ATON(ip_address)")
            ->get();

-        return view('network.scan', compact('scan', 'hosts'));
+        $notes = collect();
+        if ($scan->segment_id) {
+            $notes = \App\Models\NetworkIpNote::where('segment_id', $scan->segment_id)
+                ->pluck('note', 'ip_address');
+        }
+
+        return view('network.scan', compact('scan', 'hosts', 'notes'));
    }
 }
@@ -2,9 +2,13 @@

 namespace App\Http\Controllers;

+use App\Models\NetworkIpNote;
 use App\Models\NetworkSegment;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\DB;
 use Illuminate\View\View;

 class NetworkSegmentController extends Controller
@@ -80,4 +84,96 @@ class NetworkSegmentController extends Controller
        return redirect()->route('network.segments.index')
            ->with('success', "Segment \"{$name}\" gelöscht.");
    }
+
+    public function triggerScan(NetworkSegment $segment): RedirectResponse
+    {
+        if (!$segment->active) {
+            return back()->with('error', 'Segment ist inaktiv.');
+        }
+
+        // Scan im Hintergrund starten (non-blocking)
+        $projectPath = base_path();
+        $phpBinary   = PHP_BINARY;
+        $cmd = "cd {$projectPath} && {$phpBinary} artisan network:scan {$segment->id} --force > /dev/null 2>&1 &";
+        exec($cmd);
+
+        return redirect()->route('network.segments.show', $segment)
+            ->with('success', "Scan für \"{$segment->name}\" wurde gestartet. Ergebnisse erscheinen in Kürze.");
+    }
+
+    // --- IP-Notiz speichern (Upsert per Segment + IP) ---
+    public function saveIpNote(Request $request, NetworkSegment $segment): JsonResponse
+    {
+        $request->validate([
+            'ip_address' => ['required', 'ip'],
+            'note'       => ['nullable', 'string', 'max:500'],
+        ]);
+
+        NetworkIpNote::updateOrCreate(
+            ['segment_id' => $segment->id, 'ip_address' => $request->ip_address],
+            [
+                'note'       => $request->note,
+                'updated_by' => auth()->id(),
+                'created_by' => auth()->id(),
+            ]
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    // --- Export: Excel (OpenSpout – kein ext-gd, PHP 8.5 kompatibel) ---
+    public function exportXlsx(NetworkSegment $segment)
+    {
+        $hosts = $this->getLatestScanHosts($segment);
+        $notes = NetworkIpNote::where('segment_id', $segment->id)
+            ->pluck('note', 'ip_address');
+
+        $filename = 'Segment_' . preg_replace('/[^a-zA-Z0-9_-]/', '_', $segment->name)
+            . '_' . now()->format('Ymd_Hi') . '.xlsx';
+        $tempFile = tempnam(sys_get_temp_dir(), 'net_export_') . '.xlsx';
+
+        $writer = new \OpenSpout\Writer\XLSX\Writer();
+        $writer->openToFile($tempFile);
+
+        $writer->addRow(\OpenSpout\Common\Entity\Row::fromValues([
+            'IP-Adresse', 'Status', 'Hostname', 'MAC-Adresse', 'Hersteller', 'Ping (ms)', 'Bemerkung',
+        ]));
+
+        foreach ($hosts as $host) {
+            $writer->addRow(\OpenSpout\Common\Entity\Row::fromValues([
+                $host->ip_address,
+                $host->status,
+                $host->hostname ?? '',
+                $host->mac_address ?? '',
+                $host->mac_vendor ?? '',
+                $host->ping_ms !== null ? (string) $host->ping_ms : '',
+                $notes[$host->ip_address] ?? '',
+            ]));
+        }
+
+        $writer->close();
+
+        return response()->download($tempFile, $filename, [
+            'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        ])->deleteFileAfterSend(true);
+    }
+
+    // --- Export: PDF (Browser-Print-View – kein PHP-PDF-Package nötig) ---
+    public function exportPdf(NetworkSegment $segment)
+    {
+        $hosts = $this->getLatestScanHosts($segment);
+        $notes = NetworkIpNote::where('segment_id', $segment->id)
+            ->pluck('note', 'ip_address');
+
+        return view('network.segments.export-pdf', compact('segment', 'hosts', 'notes'));
+    }
+
+    private function getLatestScanHosts(NetworkSegment $segment)
+    {
+        $latestScan = $segment->scans()->latest()->first();
+        if (!$latestScan) {
+            return collect();
+        }
+        return $latestScan->hosts()->orderByRaw('INET_ATON(ip_address)')->get();
+    }
 }