Fix Whitelist

Author: Ragnt

Cargo.lock

@@ -2,7 +2,7 @@
 members = ["libs/libwifi", "libs/libwifi_macros", "libs/pcap-file"]
 
 [workspace.package]
-version = "0.7.4"
+version = "0.7.5"
 authors = ["Ryan Butler"]
 description = "80211 Attack Tool"
 license = "MIT"

Cargo.toml

@@ -354,15 +354,15 @@ impl OxideRuntime {
                 .filter_map(|f| {
                     match MacAddress::from_str(&f) {
                         Ok(mac) => {
-                            if targ_list.is_target_mac(&mac) {
+                            if targ_list.is_actual_target_mac(&mac) {
                                 println!("Whitelist {} is a target. Cannot add to whitelist.", mac);
                                 None
                             } else {
                                 Some(White::MAC(WhiteMAC::new(mac)))
                             }
                         },
                         Err(_) => {
-                            if targ_list.is_target_ssid(&f) {
+                            if targ_list.is_actual_target_ssid(&f) {
                                 println!("Whitelist {} is a target. Cannot add to whitelist.", f);
                                 None
                             } else {

src/main.rs

@@ -182,6 +182,36 @@ impl TargetList {
         return matches;
     }
 
+    pub fn is_actual_target_mac(&self, mac: &MacAddress) -> bool {
+
+        for target in &self.targets {
+            match target {
+                Target::MAC(tgt) => {
+                    if tgt.addr == *mac {
+                        return true;
+                    }
+                }
+                Target::SSID(_) => {} // do nothing
+            }
+        }
+        false
+    }
+
+    pub fn is_actual_target_ssid(&self, ssid: &str) -> bool {
+
+        for target in &self.targets {
+            match target {
+                Target::MAC(_) => {} // do nothing, we don't have anything to compare to here.
+                Target::SSID(tgt) => {
+                    if tgt.match_ssid(ssid.to_owned()) {
+                        return true;
+                    }
+                }
+            }
+        }
+        false
+    }
+
     pub fn is_target_mac(&self, mac: &MacAddress) -> bool {
         if self.empty() {
             return true;