Merge pull request #1 from mastahyeti/security-fixes

[WIP] Security fixes
github · Jul 5, 2017 · 573e475 · 573e475
2 parents e526fb6 + e48dbe7
commit 573e475
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/SoftU2F b/SoftU2F
diff --git a/SoftU2FTool/UserPresence.swift b/SoftU2FTool/UserPresence.swift
@@ -17,9 +17,25 @@ class UserPresence: NSObject {
 
     typealias Callback = (_ success: Bool) -> Void
 
-    static var current: UserPresence?
     static var skip = false
 
+    // Hacks to avoid a race between reads/writes to current.
+    static let currentAccessQueue = DispatchQueue(label: "currentAccessQueue")
+    static var _current: UserPresence?
+    static var current: UserPresence? {
+        get {
+            return currentAccessQueue.sync {
+                return _current
+            }
+        }
+
+        set(newValue) {
+            currentAccessQueue.sync {
+                _current = newValue
+            }
+        }
+    }
+
     // Display a notification, wait for the user to click it, and call the callback with `true`.
     // Calls callback with `false` if another test is done while we're waiting for this one.
     static func test(_ type: Notification, with callback: @escaping Callback) {