chore: clean-up

.github/actions/setup-runner/action.yml

@@ -6,15 +6,14 @@ runs:
     - name: Set environment variables
       shell: bash
       run: |
-        echo "DOTNET_VERSION=10.x" >> $GITHUB_ENV
         echo "DOTNET_NOLOGO=false" >> $GITHUB_ENV
         echo "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $GITHUB_ENV
         echo "NUKE_TELEMETRY_OPTOUT=true" >> $GITHUB_ENV
 
     - name: Set up .NET
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: ${{ env.DOTNET_VERSION }}
+        global-json-file: global.json
 
     - name: Restore .NET tools
       shell: bash

.github/workflows/ci.yaml

@@ -19,6 +19,10 @@ on:
           - 'detailed'
           - 'diagnostic'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test-linux:
     name: 🐧 Test

renovate.json

@@ -1,15 +1,19 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:best-practices"],
   "timezone": "Europe/Berlin",
   "addLabels": [
     "dependencies"
   ],
-  "minimumReleaseAge": "14 days",
+  "minimumReleaseAge": "7 days",
   "internalChecksFilter": "strict",
-  "prCreation": "not-pending",
   "dependencyDashboard": true,
   "prConcurrentLimit": 5,
   "prHourlyLimit": 0,
+  "vulnerabilityAlerts": {
+    "labels": ["security"],
+    "minimumReleaseAge": "1 day"
+  },
   "automerge": false,
   "dockerfile": {
     //"pinDigests": true

src/Scanning/Arp/LinuxArpTableProvider.cs

@@ -1,27 +1,25 @@
-using System.Diagnostics;
 using System.Net;
 using System.Runtime.Versioning;
 using Drift.Domain.Device.Addresses;
 
 namespace Drift.Scanning.Arp;
 
 internal class LinuxArpTableProvider : ArpTableProviderBase {
-  // TODO read from /proc/net/arp instead of spawning processes
+  private const string ProcArpPath = "/proc/net/arp";
+
   [SupportedOSPlatform( "linux" )]
   protected override ArpTable ReadSystemArpCache() {
-    const string procArpPath = "/proc/net/arp";
-
-    if ( !File.Exists( procArpPath ) ) {
-      throw new FileNotFoundException( $"Path not found: {procArpPath}" );
+    if ( !File.Exists( ProcArpPath ) ) {
+      throw new FileNotFoundException( $"Path not found: {ProcArpPath}" );
     }
 
-    using var streamReader = new StreamReader( procArpPath );
+    using var streamReader = new StreamReader( ProcArpPath );
 
     return ParseArpOutput( streamReader );
   }
 
   /// <summary>
-  /// Parses the output of <c>/proc/net/arp</c> into an <see cref="ArpTable"/>.
+  /// Parses the contents of <c>/proc/net/arp</c> into an <see cref="ArpTable"/>.
   /// </summary>
   /// <remarks>
   /// Format:
@@ -33,10 +31,17 @@ protected override ArpTable ReadSystemArpCache() {
   internal static ArpTable ParseArpOutput( TextReader reader ) {
     var map = new Dictionary<IPAddress, MacAddress>();
 
-    reader.ReadLine(); // Skip header
-
     while ( reader.ReadLine() is { } line ) {
       var parts = line.Split( (char[]?) null, StringSplitOptions.RemoveEmptyEntries );
+
+      if (
+        parts[0].Count( c => c == '.' ) != 3 && // Dots in an IPv4 address
+        parts[3].Count( c => c == ':' ) != 5 // Semicolons in a Linux-reported MAC. E.g., 00:11:22:33:44:55
+      ) {
+        Console.Error.WriteLine( $"Skipping invalid ARP entry: {line}" );
+        continue;
+      }
+
       var ip = IPAddress.Parse( parts[0] );
       var mac = new MacAddress( parts[3] );
       map[ip] = mac;

src/Scanning/Arp/WindowsArpTableProvider.cs

@@ -41,14 +41,17 @@ protected override ArpTable ReadSystemArpCache() {
   internal static ArpTable ParseArpOutput( TextReader reader ) {
     var map = new Dictionary<IPAddress, MacAddress>();
 
-    reader.ReadLine(); // Skip empty line
-    reader.ReadLine(); // Skip interface
-    reader.ReadLine(); // Skip header
-
     while ( reader.ReadLine() is { } line ) {
+      if ( string.IsNullOrWhiteSpace( line ) ) {
+        continue;
+      }
+
       var parts = line.Split( (char[]?) null, StringSplitOptions.RemoveEmptyEntries );
 
-      if ( parts[0].Count( c => c == '.' ) != 3 ) { // Should look like an IPv4 address
+      if (
+        parts[0].Count( c => c == '.' ) != 3 && // Dots in an IPv4 address
+        parts[1].Count( c => c == '-' ) != 5 // Hyphens in a Windows-reported MAC. E.g., 00-11-22-33-44-55
+      ) {
         Console.Error.WriteLine( $"Skipping invalid ARP entry: {line}" );
         continue;
       }