Timing Bug Squish and UI Updates

Author: consuelita

AdversaryLabSwift.xcodeproj/project.xcworkspace/xcuserdata/Lita.xcuserdatad/UserInterfaceState.xcuserstate

@@ -24,33 +24,17 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "AdversaryLabSwift/Controllers/ConnectionInspector.swift"
-            timestampString = "543376365.868775"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "20"
-            endingLineNumber = "20"
-            landmarkName = "analyzeConnections(enableSequenceAnalysis:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "AdversaryLabSwift/Controllers/ConnectionInspector.swift"
-            timestampString = "543376370.288467"
+            filePath = "AdversaryLabSwift/Features/Timing.swift"
+            timestampString = "543459914.6254441"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "44"
-            endingLineNumber = "44"
-            landmarkName = "analyzeConnections(enableSequenceAnalysis:)"
-            landmarkType = "7">
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            landmarkName = "processTiming(forConnection:)"
+            landmarkType = "9">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

AdversaryLabSwift.xcodeproj/xcuserdata/Lita.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -163,7 +163,7 @@ class ConnectionInspector
         }
 
         // Process Entropy
-        let (entropyProcessed, maybeEntropyError) = processEntropy(forConnection: connection)
+        let (entropyProcessed, _) = processEntropy(forConnection: connection)
 
         // Increment Packets Analyzed Field as we are done analyzing this connection
         if packetLengthProcessed, timingProcessed, offsetSequenceNoErrors, entropyProcessed

AdversaryLabSwift/Base.lproj/Main.storyboard

@@ -23,17 +23,17 @@ class FakeConnectionGenerator
 
     func addConnections()
     {
-        guard let redis = try? Redis(hostname: "localhost", port: 6379)
-            else
-        {
-            return
-        }
-        
         addAllowedPackets()
         addblockedPackets()
 
         NotificationCenter.default.post(name: .updateStats, object: nil)
 
+//        guard let redis = try? Redis(hostname: "localhost", port: 6379)
+//            else
+//        {
+//            return
+//        }
+//
 //        analysisQueue.sync
 //        {
 //            addAllowedPackets()

AdversaryLabSwift/Controllers/ConnectionInspector.swift

@@ -41,7 +41,7 @@ func processEntropy(forConnection connection: ObservedConnection) -> (processsed
 
 func calculateEntropy(for packet: Data) -> Double
 {
-    NSLog("Entropy for \(packet as! NSData)")
+    NSLog("Entropy for \(packet as NSData)")
     let probabilities: [Double] = calculateProbabilities(for: packet)
     var entropy: Double = 0
 
@@ -201,15 +201,11 @@ func scoreEntropy(allowedEntropyKey: String, allowedEntropyBinsKey: String, bloc
 
         /// Save Scores
         let requiredEntropy: RSortedSet<Int> = RSortedSet(key: requiredEntropyKey)
-        let (newREInserted, returnedRE) = requiredEntropy.insert((entropy, Float(requiredAccuracy)))
-        print("\nSaved required accuracy \(requiredAccuracy) for entropy \(entropy)")
-        print("\(newREInserted): (field, score) = \(returnedRE) ****")
+        let _ = requiredEntropy.insert((entropy, Float(requiredAccuracy)))
 
         //TODO: RSortedSet.insert displays notes for Set as provided by apple, this is inaccurate for sorted set and is confusing.
         let forbiddenEntropy: RSortedSet<Int> = RSortedSet(key: forbiddenEntropyKey)
-        let (newFEInserted, returnedFE) = forbiddenEntropy.insert((entropy, Float(forbiddenAccuracy)))
-        print("Saved forbidden accuracy \(forbiddenAccuracy) for entropy \(entropy)")
-        print("\(newFEInserted): (field, score) = \(returnedFE) ****")
+        let _ = forbiddenEntropy.insert((entropy, Float(forbiddenAccuracy)))
     }
 }
 

AdversaryLabSwift/Controllers/FakeConnectionGenerator.swift

@@ -123,12 +123,10 @@ func scorePacketLengths(allowedLengthsKey: String, blockedLengthsKey: String, re
 
         /// Save Scores
         let requiredLengths: RSortedSet<Int> = RSortedSet(key: requiredLengthsKey)
-        let (rlInserted, newRL) = requiredLengths.insert((length, Float(requiredAccuracy)))
-        print("\nSaved required accuracy for length \(length): |\(rlInserted): \(newRL)| <----------")
+        let _ = requiredLengths.insert((length, Float(requiredAccuracy)))
 
         let forbiddenLengths: RSortedSet<Int> = RSortedSet(key: forbiddenLengthsKey)
-        let (flInserted, newFL) = forbiddenLengths.insert((length, Float(forbiddenAccuracy)))
-        print("Saved forbidden accuracy for length \(length):  |\(flInserted): \(newFL)| <----------")
+        let _ = forbiddenLengths.insert((length, Float(forbiddenAccuracy)))
     }
 }
 

AdversaryLabSwift/Features/Entropy.swift

@@ -30,7 +30,7 @@ func processTiming(forConnection connection: ObservedConnection) -> (processed:
     }
 
     // Add the time difference for this connection to the database
-    let timeDifference = (outTimeInterval - inTimeInterval) * 1000000
+    let timeDifference = (outTimeInterval - inTimeInterval)
     timeDifferenceList.append(timeDifference)
 
     return (true, nil)
@@ -155,11 +155,9 @@ func scoreTiming(allowedTimeDifferenceKey: String, allowedTimeDifferenceBinsKey:
 
         /// Save Scores
         let requiredTiming: RSortedSet<Int> = RSortedSet(key: requiredTimeDifferenceKey)
-        let (rtInserted, newRT) = requiredTiming.insert((timeDifference, Float(requiredAccuracy)))
-        print("\nSaved required accuracy \(requiredAccuracy) for time difference \(timeDifference) |\(rtInserted): (field, score) = \(newRT)| <------------")
+        let _ = requiredTiming.insert((timeDifference, Float(requiredAccuracy)))
 
         let forbiddenTiming: RSortedSet<Int> = RSortedSet(key: forbiddenTimeDifferenceKey)
-        let (ftInserted, newFT) = forbiddenTiming.insert((timeDifference, Float(forbiddenAccuracy)))
-        print("Saved forbidden accuracy for time difference |\(ftInserted): \(newFT)| <------------")
+        let _ = forbiddenTiming.insert((timeDifference, Float(forbiddenAccuracy)))
     }
 }

AdversaryLabSwift/Features/PacketLengths.swift

@@ -192,18 +192,18 @@ class ViewController: NSViewController
 
             /// Scores
 
-            // Timing (microseconds)
+            // Timing (milliseconds)
             let requiredTimingSet: RSortedSet<Int> = RSortedSet(key: requiredTimeDiffKey)
             if let (rtMember, rtScore) = requiredTimingSet.last
             {
-                self.requiredTiming = "\(rtMember) μs"
+                self.requiredTiming = "\(rtMember) ms"
                 self.requiredTimeAcc = "\(rtScore)"
             }
 
             let forbiddenTimingSet: RSortedSet<Int> = RSortedSet(key: forbiddenTimeDiffKey)
             if let (ftMember, ftScore) = forbiddenTimingSet.last
             {
-                self.forbiddenTiming = "\(ftMember) μs"
+                self.forbiddenTiming = "\(ftMember) ms"
                 self.forbiddenTimingAcc = "\(ftScore)"
             }