feat: Added blacklisting for phone numbers.

Author: hiibolt

README.md

@@ -22,98 +22,98 @@ All commands are alternatively available as slash commands that better indicate
 
 ## Commands
 
-### Admin
+### R6
 
-` >>admin dm <user id> <message>`
-- DMs a message to a specific user.
+#### Economy
 
-` >>admin announce <sections> <message>`
-- Announces a message to all whitelisted users.
+` >>r6 econ transfer`
+` >>r6 econ transfer <ubisoft email> <ubisoft password>`
+- Finds the items with the least sellers either globally or on the account with the provided login.
 
-` >>admin whitelist <section> <user id>`
-- Adds a person to the authorized user list.
+` >>r6 econ graph <item name | item id>`
+- Graphs the all-time history of an item.
 
-` >>admin blacklist <section> <user id>`
-- Removes a person from the authorized user list.
+` >>r6 econ list`
+` >>r6 econ list <page #>`
+- Lists all available skins.
 
-### OSINT
+` >>r6 econ analyze <item name | item id>`
+- Creates a detailed data sheet on an item.
 
-#### Queries
+` >>r6 econ profit <$ bought for> <item name | item id>`
+- Calculates the amount you would make if you sold your item right now.
 
-` >>osint query name <name>`
-- Queries for leaks based on a name.
+#### OPSEC
 
-` >>osint query ip <ip>`
-- Queries for leaks based on a last IP.
+` >>r6 opsec pc <username>`
+- Looks up a Ubisoft account based on their registered PC username.
 
-` >>osint query email <email>`
-- Queries for leaks based on an email.
+` >>r6 opsec xbox <username>`
+- Looks up a Ubisoft account based on their registered Xbox username.
 
-` >>osint query username <username>`
-- Queries for leaks based on a username.
+` >>r6 opsec recon <username>`
+- Analyzes a Ubisoft account for suspicious behaviour based on their username (PC only).
 
-` >>osint query hash <hash>`
-- Queries for leaks based on a hash.
+` >>r6 opsec psn <username>`
+- Looks up a Ubisoft account based on their registered PSN username.
 
-` >>osint query password <password>`
-- Queries for leaks based on a password.
+` >>r6 opsec applications <username>`
+- Looks up a Ubisoft account based on their username (PC only).
 
-#### Hashing
+### OSINT
 
-` >>osint hash rehash <password>`
-- Rehashes a password into pre-hashed hashes.
+#### Hashing
 
 ` >>osint hash dehash <hash>`
 - Dehashes a hash into pre-cracked passwords.
 
-#### Other
+` >>osint hash rehash <password>`
+- Rehashes a password into pre-hashed hashes.
 
-` >>osint phone <phone number>`
-- Perform a Caller ID lookup on a phone number.
+#### Queries
 
-` >>osint geolocate <ip>`
-- Geolocates an IP.
+` >>osint query hash <hash>`
+- Queries for leaks based on a hash.
 
-` >>osint sherlock <username>`
-- Cross-references sites with a given username.
+` >>osint query name <name>`
+- Queries for leaks based on a name.
 
-### R6
+` >>osint query username <username>`
+- Queries for leaks based on a username.
 
-#### Economy
+` >>osint query email <email>`
+- Queries for leaks based on an email.
 
-` >>r6 econ profit <$ bought for> <item name | item id>`
-- Calculates the amount you would make if you sold your item right now.
+` >>osint query ip <ip>`
+- Queries for leaks based on a last IP.
 
-` >>r6 econ transfer`
-` >>r6 econ transfer <ubisoft email> <ubisoft password>`
-- Finds the items with the least sellers either globally or on the account with the provided login.
+` >>osint query password <password>`
+- Queries for leaks based on a password.
 
-` >>r6 econ list`
-` >>r6 econ list <page #>`
-- Lists all available skins.
+#### Other
 
-` >>r6 econ analyze <item name | item id>`
-- Creates a detailed data sheet on an item.
+` >>osint sherlock <username>`
+- Cross-references sites with a given username.
 
-` >>r6 econ graph <item name | item id>`
-- Graphs the all-time history of an item.
+` >>osint geolocate <ip>`
+- Geolocates an IP.
 
-#### OPSEC
+` >>osint phone <phone number>`
+- Perform a Caller ID lookup on a phone number.
 
-` >>r6 opsec pc <username>`
-- Looks up a Ubisoft account based on their registered PC username.
+### Admin
 
-` >>r6 opsec psn <username>`
-- Looks up a Ubisoft account based on their registered PSN username.
+` >>admin dm <user id> <message>`
+- DMs a message to a specific user.
 
-` >>r6 opsec applications <username>`
-- Looks up a Ubisoft account based on their username (PC only).
+` >>admin blacklist <section> <user id>`
+- Removes a person from the authorized user list.
 
-` >>r6 opsec recon <username>`
-- Analyzes a Ubisoft account for suspicious behaviour based on their username (PC only).
+` >>admin whitelist <section> <user id>`
+- Adds a person to the authorized user list.
 
-` >>r6 opsec xbox <username>`
-- Looks up a Ubisoft account based on their registered Xbox username.
+` >>admin announce <sections> <message>`
+- Announces a message to all whitelisted users.
 
 
 ## Setup

src/sections/osint.rs

@@ -259,6 +259,24 @@ pub async fn cnam_lookup(
     sendable: Arc<Mutex<Sendable>>,
     mut args: VecDeque<String>
 ) -> Result<(), String> {
+    // First, load the blacklisted strings from ./assets/blacklist.txt
+    let blacklisted_strings = std::fs::read_to_string("./assets/blacklist.txt")
+        .expect("Failed to read blacklist.txt!")
+        .split("\n")
+        .map(|s| s.to_string())
+        .collect::<Vec<String>>();
+
+    let mut cloned_args = args.clone();
+    let first_arg = cloned_args.pop_front();
+
+    // Check if the query contains any blacklisted strings
+    for blacklisted_string in &blacklisted_strings {
+        if let Some(ref ar) = first_arg {
+            if *ar == *blacklisted_string {
+                return Err(format!("The query contains a blacklisted string: '{}'. If this is in error, please contact @hiibolt!", blacklisted_string));
+            }
+        }
+    }
     let phone_number = args.pop_front()
         .ok_or(String::from("Missing phone number!"))?;