gitea-mms/Network-MGMT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Netzwerk-Segmentverwaltung, Dashboard, globale Suche v0.6.0

Browse Source
This commit is contained in:
Andreas Rudolph
2026-07-01 18:46:49 +02:00
parent 402537805d
commit 9fa20af87a
17 changed files with 1006 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/NetworkController.php
+55 -13
View File
@@ -5,31 +5,67 @@ namespace App\Http\Controllers;
use App\Models\NetworkDevice;
use App\Models\NetworkDeviceEvent;
use App\Models\NetworkScan;
use App\Models\NetworkSegment;
use App\Services\NetworkScanImporter;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Illuminate\View\View;
class NetworkController extends Controller
{
// --- Übersicht ---
public function index(): View
// --- Dashboard ---
public function dashboard(): View
{
$latestScan = NetworkScan::latest()->first();
$totalDevices = NetworkDevice::count();
$segments = NetworkSegment::withCount('scans')->orderBy('name')->get();
$totalDevices = NetworkDevice::count();
$onlineDevices = NetworkDevice::where('status', 'online')->count();
$recentEvents = NetworkDeviceEvent::with('device')
$recentEvents = NetworkDeviceEvent::with('device')
->where('documented', false)
->latest()
->take(10)
->get();
$scans = NetworkScan::latest()->take(10)->get();
return view('network.index', compact(
'latestScan', 'totalDevices', 'onlineDevices', 'recentEvents', 'scans'
// Letzten Scan pro Segment
$latestScans = NetworkScan::select('network_scans.*')
->orderByDesc('created_at')
->get()
->groupBy('segment_id');
return view('network.dashboard', compact(
'segments', 'totalDevices', 'onlineDevices', 'recentEvents', 'latestScans'
));
}
// --- Globale Suche ---
public function search(Request $request): View
{
$q = trim($request->get('q', ''));
$devices = collect();
if (strlen($q) >= 2) {
$devices = NetworkDevice::with('events')
->where(function ($query) use ($q) {
$query->where('current_ip', 'like', "%{$q}%")
->orWhere('mac_address', 'like', "%{$q}%")
->orWhere('hostname', 'like', "%{$q}%")
->orWhere('label', 'like', "%{$q}%")
->orWhere('mac_vendor', 'like', "%{$q}%");
})
->orderBy('current_ip')
->paginate(50)
->withQueryString();
}
return view('network.search', compact('q', 'devices'));
}
// --- Alte index-Route umleiten ---
public function index(): \Illuminate\Http\RedirectResponse
{
return redirect()->route('network.dashboard');
}
// --- Alle Geräte ---
public function devices(Request $request): View
{
@@ -136,19 +172,25 @@ class NetworkController extends Controller
// --- Import ---
public function showImport(): View
{
return view('network.import');
$segments = NetworkSegment::where('active', true)->orderBy('name')->get();
return view('network.import', compact('segments'));
}
public function import(Request $request, NetworkScanImporter $importer): RedirectResponse
{
$request->validate([
'scan_file' => ['required', 'file', 'mimes:txt,csv', 'max:5120'],
'segment_id' => ['nullable', 'exists:network_segments,id'],
'scan_file' => ['required', 'file', 'mimes:txt,csv', 'max:10240'],
]);
$path = $request->file('scan_file')->store('imports', 'local');
$fullPath = storage_path('app/' . $path);
$path = $request->file('scan_file')->store('imports', 'local');
$fullPath = Storage::disk('local')->path($path);
$scan = $importer->importAngryIpScannerFile($fullPath, auth()->id());
$scan = $importer->importAngryIpScannerFile(
$fullPath,
auth()->id(),
$request->input('segment_id')
);
return redirect()->route('network.scan', $scan)
->with('success', "Import abgeschlossen: {$scan->online_hosts} online, {$scan->new_devices} neue Geräte.");
app/Http/Controllers/NetworkSegmentController.php
+83
View File
@@ -0,0 +1,83 @@
<?php
namespace App\Http\Controllers;
use App\Models\NetworkSegment;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
class NetworkSegmentController extends Controller
{
public function index(): View
{
$segments = NetworkSegment::withCount('scans')
->orderBy('name')
->get();
return view('network.segments.index', compact('segments'));
}
public function create(): View
{
return view('network.segments.create');
}
public function store(Request $request): RedirectResponse
{
$validated = $request->validate([
'name' => ['required', 'string', 'max:100'],
'subnet' => ['required', 'string', 'max:50'],
'vlan_id' => ['nullable', 'integer', 'min:1', 'max:4094'],
'active' => ['boolean'],
'description' => ['nullable', 'string', 'max:500'],
]);
$validated['active'] = $request->boolean('active', true);
$validated['created_by'] = auth()->id();
NetworkSegment::create($validated);
return redirect()->route('network.segments.index')
->with('success', "Segment \"{$validated['name']}\" angelegt.");
}
public function show(NetworkSegment $segment): View
{
$scans = $segment->scans()->latest()->paginate(20);
$latestScan = $segment->scans()->latest()->first();
return view('network.segments.show', compact('segment', 'scans', 'latestScan'));
}
public function edit(NetworkSegment $segment): View
{
return view('network.segments.edit', compact('segment'));
}
public function update(Request $request, NetworkSegment $segment): RedirectResponse
{
$validated = $request->validate([
'name' => ['required', 'string', 'max:100'],
'subnet' => ['required', 'string', 'max:50'],
'vlan_id' => ['nullable', 'integer', 'min:1', 'max:4094'],
'active' => ['boolean'],
'description' => ['nullable', 'string', 'max:500'],
]);
$validated['active'] = $request->boolean('active', true);
$segment->update($validated);
return redirect()->route('network.segments.index')
->with('success', "Segment \"{$segment->name}\" aktualisiert.");
}
public function destroy(NetworkSegment $segment): RedirectResponse
{
$name = $segment->name;
$segment->delete();
return redirect()->route('network.segments.index')
->with('success', "Segment \"{$name}\" gelöscht.");
}
}
app/Models/NetworkScan.php
+6 -1
View File
@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
class NetworkScan extends Model
{
protected $fillable = [
'subnet', 'source', 'scanner', 'total_hosts',
'segment_id', 'subnet', 'source', 'scanner', 'total_hosts',
'online_hosts', 'new_devices', 'changed_devices',
'notes', 'created_by',
];
@@ -27,4 +27,9 @@ class NetworkScan extends Model
{
return $this->belongsTo(User::class, 'created_by');
}
public function segment(): BelongsTo
{
return $this->belongsTo(NetworkSegment::class, 'segment_id');
}
}
app/Models/NetworkSegment.php
+59
View File
@@ -0,0 +1,59 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
class NetworkSegment extends Model
{
protected $fillable = [
'name', 'subnet', 'vlan_id', 'active', 'description', 'created_by',
];
protected $casts = [
'active' => 'boolean',
'vlan_id' => 'integer',
];
public function createdBy(): BelongsTo
{
return $this->belongsTo(User::class, 'created_by');
}
public function scans(): HasMany
{
return $this->hasMany(NetworkScan::class, 'segment_id');
}
public function latestScan(): HasMany
{
return $this->hasMany(NetworkScan::class, 'segment_id')->latestOfMany();
}
/** Alle Hosts dieses Segments (über Scans) */
public function hosts(): HasManyThrough
{
return $this->hasManyThrough(NetworkHost::class, NetworkScan::class, 'segment_id', 'scan_id');
}
/** Anzahl online-Hosts im letzten Scan */
public function getOnlineCountAttribute(): int
{
return $this->scans()->latest()->first()?->online_hosts ?? 0;
}
/** Anzahl Geräte gesamt im letzten Scan */
public function getTotalCountAttribute(): int
{
return $this->scans()->latest()->first()?->total_hosts ?? 0;
}
/** Letzter Scan-Zeitpunkt */
public function getLastScannedAtAttribute(): ?string
{
return $this->scans()->latest()->first()?->created_at?->format('d.m.Y H:i');
}
}
app/Services/NetworkScanImporter.php
+86 -37
View File
@@ -8,6 +8,7 @@ use App\Models\NetworkHost;
use App\Models\NetworkScan;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class NetworkScanImporter
{
@@ -19,47 +20,84 @@ class NetworkScanImporter
/**
* Importiert eine Angry IP Scanner .txt Exportdatei.
*/
public function importAngryIpScannerFile(string $filePath, int $createdBy): NetworkScan
public function importAngryIpScannerFile(string $filePath, int $createdBy, ?int $segmentId = null): NetworkScan
{
$lines = file($filePath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
$scanner = '';
$subnet = '';
$headers = [];
$rows = [];
// Datei einlesen und UTF-8 BOM entfernen
$content = file_get_contents($filePath);
$content = preg_replace('/^\xEF\xBB\xBF/', '', $content); // UTF-8 BOM
$content = str_replace("\r\n", "\n", $content); // Windows CRLF → LF
$content = str_replace("\r", "\n", $content); // altes Mac CR → LF
$lines = array_filter(explode("\n", $content), fn($l) => trim($l) !== '');
$lines = array_values($lines);
$scanner = '';
$subnet = '';
$headers = [];
$rows = [];
$splitPattern = null; // wird beim ersten Header-Treffer gesetzt
foreach ($lines as $line) {
if (str_starts_with($line, 'Erstellt von') || str_starts_with($line, 'Created by')) {
$scanner = trim(str_replace(['Erstellt von ', 'Created by '], '', $line));
$trimmed = trim($line);
if (str_starts_with($trimmed, 'Erstellt von') || str_starts_with($trimmed, 'Created by')) {
$scanner = trim(str_replace(['Erstellt von ', 'Created by '], '', $trimmed));
continue;
}
if (str_starts_with($line, 'Gescannt') || str_starts_with($line, 'Scanned')) {
// "Gescannt 192.168.86.0 - 192.168.86.255"
preg_match('/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/', $line, $m);
if (str_starts_with($trimmed, 'Gescannt') || str_starts_with($trimmed, 'Scanned')) {
preg_match('/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/', $trimmed, $m);
$subnet = $m[1] ?? '0.0.0.0';
continue;
}
if (str_starts_with($line, 'http') || str_starts_with($line, 'https')) {
continue; // URL-Zeile überspringen
}
// Header-Zeile (beginnt mit "IP")
if (str_starts_with($line, 'IP') && empty($headers)) {
$headers = preg_split('/\t+/', $line);
$headers = array_map('trim', $headers);
if (str_starts_with($trimmed, 'http')) {
continue;
}
// Datenzeile
if (!empty($headers) && str_starts_with(trim($line), '') && preg_match('/^\d{1,3}\./', trim($line))) {
$cols = preg_split('/\t+/', $line);
$row = [];
// Header-Zeile erkennen (beginnt mit "IP")
if (str_starts_with($trimmed, 'IP') && empty($headers)) {
// Trennzeichen auto-detektieren
if (substr_count($trimmed, "\t") >= 2) {
$splitPattern = '/\t/';
} elseif (substr_count($trimmed, ';') >= 2) {
$splitPattern = '/;/';
} elseif (substr_count($trimmed, ',') >= 2) {
$splitPattern = '/,/';
} else {
// Angry IP Scanner: mehrere normale Leerzeichen als Trennzeichen
// Non-Breaking Spaces (0xC2 0xA0) bleiben innerhalb von Werten erhalten
$splitPattern = '/ {2,}/';
}
$headers = array_map('trim', preg_split($splitPattern, $trimmed));
continue;
}
// Datenzeile: muss mit IP-Adresse beginnen
if (!empty($headers) && $splitPattern !== null
&& preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', $trimmed)) {
$cols = array_map(
fn($v) => trim(str_replace("\xc2\xa0", ' ', $v)), // Non-Breaking Spaces → normale Spaces
preg_split($splitPattern, $line)
);
$row = [];
foreach ($headers as $i => $h) {
$row[$h] = trim($cols[$i] ?? '');
$row[$h] = $cols[$i] ?? '';
}
$rows[] = $row;
}
}
return DB::transaction(function () use ($rows, $scanner, $subnet, $createdBy) {
// DEBUG: Log parse results
Log::info('NetworkScanImporter: scanner=' . $scanner . ', subnet=' . $subnet);
Log::info('NetworkScanImporter: separator hex=' . bin2hex($separator));
Log::info('NetworkScanImporter: headers=' . json_encode($headers));
Log::info('NetworkScanImporter: rows found=' . count($rows));
if (!empty($rows)) {
Log::info('NetworkScanImporter: first row=' . json_encode($rows[0]));
}
return DB::transaction(function () use ($rows, $scanner, $subnet, $createdBy, $segmentId) {
$this->scan = NetworkScan::create([
'segment_id' => $segmentId,
'subnet' => $subnet,
'source' => 'import',
'scanner' => $scanner,
@@ -83,23 +121,23 @@ class NetworkScanImporter
private function processRow(array $row): void
{
$ip = $this->extractColumn($row, ['IP']);
$ping = $this->extractColumn($row, ['Ping']);
$host = $this->extractColumn($row, ['Hostname']);
$mac = $this->normalizeMAC($this->extractColumn($row, ['MAC Addresse', 'MAC Address']));
$vendor = $this->extractColumn($row, ['MAC Hersteller', 'MAC Vendor']);
$ttl = (int) $this->extractColumn($row, ['TTL']) ?: null;
$ports = $this->extractColumn($row, ['Ports']);
$netbios= $this->extractColumn($row, ['NetBIOS Info']);
$http = $this->extractColumn($row, ['HTTP Sender']);
$web = $this->extractColumn($row, ['Web Erkennung', 'Web Detection']);
$ip = trim($this->extractColumn($row, ['IP', 'IP-Adresse', 'IP Address', 'IP Adresse']));
$ping = trim($this->extractColumn($row, ['Ping', 'Ping (ms)']));
$host = $this->cleanValue($this->extractColumn($row, ['Hostname', 'Host Name', 'DNS-Hostname']));
$mac = $this->normalizeMAC($this->extractColumn($row, ['MAC Adresse', 'MAC Addresse', 'MAC Address', 'MAC-Adresse', 'MAC']));
$vendor = $this->cleanValue($this->extractColumn($row, ['MAC Hersteller', 'MAC Vendor', 'Hersteller', 'Vendor']));
$ttl = (int) $this->cleanValue($this->extractColumn($row, ['TTL'])) ?: null;
$ports = $this->cleanValue($this->extractColumn($row, ['Ports', 'Gefilterte Ports', 'Offene Ports']));
$netbios= $this->cleanValue($this->extractColumn($row, ['NetBIOS Info', 'NetBIOS-Info', 'NetBIOS']));
$http = $this->cleanValue($this->extractColumn($row, ['HTTP Sender', 'HTTP']));
$web = $this->cleanValue($this->extractColumn($row, ['Web Erkennung', 'Web Detection', 'Webserver']));
$pingMs = null;
$status = 'offline';
if (!empty($ping) && $ping !== 'n/a' && $ping !== '-') {
preg_match('/(\d+)/', $ping, $m);
$pingMs = isset($m[1]) ? (int)$m[1] : null;
// Online-Erkennung: Ping enthält eine Zahl gefolgt von "ms"
if (preg_match('/(\d+)\s*ms/i', $ping, $m)) {
$pingMs = (int) $m[1];
$status = 'online';
$this->onlineHosts++;
}
@@ -210,6 +248,17 @@ class NetworkScanImporter
return '';
}
/**
* Bereinigt Angry IP Scanner Platzhalterwerte wie [n/a], [n/s], [n/d] zu leerem String.
*/
private function cleanValue(string $value): string
{
if (preg_match('/^\[n\/[asd]\]$/i', trim($value))) {
return '';
}
return trim($value);
}
private function normalizeMAC(string $mac): string
{
// Verschiedene MAC-Formate normalisieren zu XX:XX:XX:XX:XX:XX