M6: Firewall-Schritt (opt-in Sicherheits-Grundschutz)

Standardmäßig aus (Toggle wie VLAN) -- höchstes Risiko aller bisherigen
Schritte, falsche Regeln können Fernzugriff kappen. Preset ist
Mikrotiks eigener Standard-Ansatz (unverändert seit Jahren in
RouterOS-Werkskonfigurationen): NAT/Masquerade auf WAN, established/
related erlauben, invalid verwerfen, unaufgeforderte WAN-Verbindungen
zu LAN-Geräten blocken (außer explizitem Port-Forward via
connection-nat-state=!dstnat).

Jede neue Regel bekommt ein place-before mit aufsteigendem Index,
damit sie vor eventuell schon vorhandenen Regeln des Routers landet --
sonst könnte eine bereits vorhandene "alles blocken"-Regel unsere
neuen Regeln wirkungslos machen. NAT und Filter sind getrennte,
unabhängig nummerierte RouterOS-Listen.

Vor dem Anwenden zeigt der Schritt die Anzahl bereits vorhandener
Filter-/NAT-Regeln (neuer fetchFirewallRuleCounts()-Aufruf in
RouterOSTransport/RestTransport/SSHTransport/ConnectionService) --
Transparenz, bevor auf einem möglicherweise schon konfigurierten
Router weitere Regeln landen. Nutzer-Entscheidung, extra Lese-Aufruf
in Kauf zu nehmen statt nur Warntext.

Build + Test-Compile (build-for-testing) sind grün. Der eigentliche
Testlauf (xcodebuild test) hängt aktuell an einem macOS-Gatekeeper-
Netzwerk-Check für ad-hoc-signierte Binaries (amfid: "adhoc signed or
signed by an unknown certificate chain", GK performScan über
syspolicyd) -- kein Code-Bug, tritt nur bei CLI-Testläufen auf, nicht
beim normalen Xcode-Cmd+R-Weg. Nutzer verifiziert M6 deshalb direkt in
Xcode.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HReLXMbmPvtQ23p1iWiJNW
This commit is contained in:
Kay
2026-09-12 19:57:53 +02:00
co-authored by Claude Sonnet 5
parent ea6bc0bfed
commit 772549c991
10 changed files with 241 additions and 0 deletions
@@ -0,0 +1,84 @@
import Foundation
struct FirewallRuleCounts: Equatable {
var filterRuleCount: Int
var natRuleCount: Int
}
/// A safe-default firewall + NAT preset, standard Mikrotik best practice (matches the ruleset
/// shipped in RouterOS' own factory-default home-router configurations, unchanged across
/// RouterOS versions for well over a decade): NAT/masquerade the WAN interface, allow
/// established/related traffic, drop invalid packets, and drop unsolicited connections
/// arriving from the WAN that aren't destination-NATed (i.e. not an explicit port forward).
///
/// Every rule gets an incrementing `place-before` so it lands ahead of whatever the router
/// already has in that chain (filter and NAT are separate, independently numbered lists)
/// otherwise, on a device that already has firewall rules, a pre-existing catch-all rule
/// earlier in the chain could make our rules unreachable.
struct FirewallConfig: Equatable {
var wanInterface: String
func buildCommands() -> [RouterOSCommand] {
let natCommand = RouterOSCommand.add(
menuPath: "/ip firewall nat",
restPath: "ip/firewall/nat",
arguments: [
"chain": "srcnat",
"out-interface": wanInterface,
"action": "masquerade",
"place-before": "0"
],
summary: "Internetfreigabe (NAT/Masquerade) über \(wanInterface) einrichten"
)
let filterRules: [(arguments: [String: String], summary: String)] = [
(
["chain": "input", "connection-state": "established,related", "action": "accept"],
"Bestehende Verbindungen zum Router erlauben"
),
(
["chain": "input", "connection-state": "invalid", "action": "drop"],
"Ungültige Pakete zum Router verwerfen"
),
(
["chain": "input", "in-interface": wanInterface, "protocol": "icmp", "action": "accept"],
"Ping (ICMP) vom Internet zum Router erlauben"
),
(
["chain": "input", "in-interface": wanInterface, "action": "drop"],
"Restlichen Zugriff vom Internet auf den Router blockieren"
),
(
["chain": "forward", "connection-state": "established,related", "action": "accept"],
"Bestehende Verbindungen durch den Router erlauben"
),
(
["chain": "forward", "connection-state": "invalid", "action": "drop"],
"Ungültige Pakete verwerfen"
),
(
[
"chain": "forward",
"connection-state": "new",
"connection-nat-state": "!dstnat",
"in-interface": wanInterface,
"action": "drop"
],
"Unaufgeforderte Verbindungen aus dem Internet zu Geräten im Heimnetz blockieren"
)
]
let filterCommands = filterRules.enumerated().map { index, rule -> RouterOSCommand in
var arguments = rule.arguments
arguments["place-before"] = "\(index)"
return RouterOSCommand.add(
menuPath: "/ip firewall filter",
restPath: "ip/firewall/filter",
arguments: arguments,
summary: rule.summary
)
}
return [natCommand] + filterCommands
}
}
@@ -56,6 +56,12 @@ final class RestTransport: NSObject, RouterOSTransport {
}
}
func fetchFirewallRuleCounts() async throws -> FirewallRuleCounts {
let filterItems = try await getJSONArray(path: "ip/firewall/filter")
let natItems = try await getJSONArray(path: "ip/firewall/nat")
return FirewallRuleCounts(filterRuleCount: filterItems.count, natRuleCount: natItems.count)
}
/// Creates or modifies the item described by `command`. `.add` is a plain
/// `POST /rest/<restPath>`. `.set` has no CLI-style inline lookup on REST, so it first
/// `GET`s the collection to find the item whose `matchField` equals `matchValue`, reads
@@ -10,6 +10,7 @@ protocol RouterOSTransport: AnyObject {
func connect() async throws
func fetchDeviceInfo() async throws -> RouterDeviceInfo
func fetchInterfaces() async throws -> [NetworkInterface]
func fetchFirewallRuleCounts() async throws -> FirewallRuleCounts
func apply(_ command: RouterOSCommand) async throws
func disconnect() async
}
@@ -58,6 +58,14 @@ final class SSHTransport: RouterOSTransport {
try await run("/export terse")
}
func fetchFirewallRuleCounts() async throws -> FirewallRuleCounts {
let filterOutput = try await run("/ip firewall filter print count-only")
let natOutput = try await run("/ip firewall nat print count-only")
let filterCount = Int(filterOutput.trimmingCharacters(in: .whitespacesAndNewlines)) ?? 0
let natCount = Int(natOutput.trimmingCharacters(in: .whitespacesAndNewlines)) ?? 0
return FirewallRuleCounts(filterRuleCount: filterCount, natRuleCount: natCount)
}
func apply(_ command: RouterOSCommand) async throws {
_ = try await run(command.cliLine)
}
@@ -71,6 +71,11 @@ final class ConnectionService: ObservableObject {
try await activeTransport.apply(command)
}
func fetchFirewallRuleCounts() async throws -> FirewallRuleCounts {
guard let activeTransport else { throw RouterOSError.notConnected }
return try await activeTransport.fetchFirewallRuleCounts()
}
private func finishConnecting(using transport: RouterOSTransport) async {
activeTransport = transport
do {
@@ -0,0 +1,65 @@
import SwiftUI
struct FirewallStepView: View {
@ObservedObject var viewModel: SetupViewModel
var body: some View {
Form {
Section {
Toggle(
"Firewall-Grundschutz einrichten (empfohlen)",
isOn: Binding(
get: { viewModel.firewallSectionEnabled },
set: { viewModel.setFirewallSectionEnabled($0) }
)
)
Text(
"Richtet einen Standard-Schutz ein: Internetfreigabe (NAT) für dein Heimnetz, "
+ "und blockiert unaufgeforderte Zugriffe aus dem Internet auf deinen Router "
+ "und deine Geräte. Bestehende, selbst eingerichtete Regeln bleiben erhalten — "
+ "die neuen Regeln werden vorangestellt."
)
.font(.caption)
.foregroundStyle(.secondary)
}
if viewModel.firewallSectionEnabled {
Section("Bereits vorhandene Regeln") {
if viewModel.isLoadingFirewallRuleCounts {
ProgressView()
} else if let counts = viewModel.existingFirewallRuleCounts {
LabeledContent("Filter-Regeln", value: "\(counts.filterRuleCount)")
LabeledContent("NAT-Regeln", value: "\(counts.natRuleCount)")
if counts.filterRuleCount > 0 || counts.natRuleCount > 0 {
Text(
"Dein Router hat bereits eigene Firewall-Regeln. Die neuen Regeln werden "
+ "vorangestellt, bestehende bleiben erhalten — prüfe nach dem Anwenden "
+ "trotzdem die Reihenfolge, z.B. über Winbox oder "
+ "\"/ip firewall filter print\"."
)
.font(.caption)
.foregroundStyle(.orange)
}
} else if let error = viewModel.firewallRuleCountsError {
Text(error).font(.caption).foregroundStyle(.red)
}
}
}
Section {
HStack {
Button("Zurück") { viewModel.goBack() }
Spacer()
Button("Weiter") { viewModel.goNext() }
}
}
}
.formStyle(.grouped)
.navigationTitle("Firewall (optional)")
.onAppear {
if viewModel.firewallSectionEnabled {
viewModel.loadExistingFirewallRuleCounts()
}
}
}
}
@@ -28,6 +28,8 @@ struct SetupView: View {
VlanStepView(viewModel: viewModel, availableInterfaces: connectionService.interfaces)
case .wifi:
WifiStepView(viewModel: viewModel)
case .firewall:
FirewallStepView(viewModel: viewModel)
case .review:
ReviewApplyView(viewModel: viewModel, credentials: connectionService.credentials)
}
@@ -5,6 +5,7 @@ enum SetupStep: Int, CaseIterable {
case lan
case vlan
case wifi
case firewall
case review
}
@@ -17,6 +18,10 @@ final class SetupViewModel: ObservableObject {
@Published var vlans: [VlanEntry] = []
@Published var wifiNetworks: [WifiNetworkConfig] = []
@Published private(set) var unsupportedWifiInterfaces: [NetworkInterface] = []
@Published private(set) var firewallSectionEnabled = false
@Published private(set) var existingFirewallRuleCounts: FirewallRuleCounts?
@Published private(set) var isLoadingFirewallRuleCounts = false
@Published private(set) var firewallRuleCountsError: String?
@Published private(set) var isApplying = false
@Published private(set) var applyLog: [String] = []
@@ -37,6 +42,31 @@ final class SetupViewModel: ObservableObject {
+ lanConfig.buildCommands()
+ vlans.flatMap { $0.buildCommands() }
+ wifiNetworks.flatMap { $0.buildCommands() }
+ (firewallSectionEnabled ? FirewallConfig(wanInterface: wanConfig.interfaceName).buildCommands() : [])
}
func setFirewallSectionEnabled(_ enabled: Bool) {
firewallSectionEnabled = enabled
if enabled {
loadExistingFirewallRuleCounts()
} else {
existingFirewallRuleCounts = nil
firewallRuleCountsError = nil
}
}
func loadExistingFirewallRuleCounts() {
guard firewallSectionEnabled, existingFirewallRuleCounts == nil, !isLoadingFirewallRuleCounts else { return }
isLoadingFirewallRuleCounts = true
firewallRuleCountsError = nil
Task {
do {
existingFirewallRuleCounts = try await connectionService.fetchFirewallRuleCounts()
} catch {
firewallRuleCountsError = error.localizedDescription
}
isLoadingFirewallRuleCounts = false
}
}
func setVlanSectionEnabled(_ enabled: Bool) {
@@ -17,6 +17,7 @@ private final class MockTransport: RouterOSTransport {
func fetchDeviceInfo() async throws -> RouterDeviceInfo { deviceInfo }
func fetchInterfaces() async throws -> [NetworkInterface] { [] }
func fetchFirewallRuleCounts() async throws -> FirewallRuleCounts { FirewallRuleCounts(filterRuleCount: 0, natRuleCount: 0) }
func apply(_ command: RouterOSCommand) async throws {}
func disconnect() async {}
}
@@ -0,0 +1,39 @@
import XCTest
@testable import RouterOSAssistant
final class FirewallConfigTests: XCTestCase {
func testBuildCommandsCoversNatAndSafeFilterDefaults() {
let config = FirewallConfig(wanInterface: "ether1")
let commands = config.buildCommands()
XCTAssertEqual(commands.count, 8)
XCTAssertEqual(commands[0].menuPath, "/ip firewall nat")
XCTAssertEqual(commands[0].arguments["action"], "masquerade")
XCTAssertEqual(commands[0].arguments["out-interface"], "ether1")
XCTAssertEqual(commands[0].arguments["place-before"], "0")
for command in commands.dropFirst() {
XCTAssertEqual(command.menuPath, "/ip firewall filter")
}
}
func testFilterRulesGetIncrementingPlaceBeforeInDeclaredOrder() {
let config = FirewallConfig(wanInterface: "ether1")
let filterCommands = config.buildCommands().dropFirst()
let placeBeforeValues = filterCommands.map { $0.arguments["place-before"] }
XCTAssertEqual(placeBeforeValues, ["0", "1", "2", "3", "4", "5", "6"])
}
func testFinalRuleBlocksUnsolicitedWanTrafficUnlessPortForwarded() {
let config = FirewallConfig(wanInterface: "ether1")
let commands = config.buildCommands()
let dropRule = commands.last!
XCTAssertEqual(dropRule.arguments["chain"], "forward")
XCTAssertEqual(dropRule.arguments["connection-nat-state"], "!dstnat")
XCTAssertEqual(dropRule.arguments["in-interface"], "ether1")
XCTAssertEqual(dropRule.arguments["action"], "drop")
}
}