feat!: Added blacklist for OSINT. Requires assets/blacklist.txt

Author: hiibolt

.gitignore

@@ -2,4 +2,5 @@
 .direnv
 .envrc
 test.py
-*.png
+*.png
+blacklist.txt

README.md

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

src/sections/osint.rs

@@ -21,6 +21,22 @@ pub async fn lookup(
     mut args: VecDeque<String>,
     lookup_type: &str
 ) -> 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>>();
+
+    // Check if the query contains any blacklisted strings
+    for arg in &args {
+        for blacklisted_string in &blacklisted_strings {
+            if arg.contains(blacklisted_string) {
+                return Err(format!("The query contains a blacklisted piece of information: `{}` If this is in error, please contact @hiibolt.", blacklisted_string));
+            }
+        }
+    }
+
     let snusbase_response_result = match lookup_type {
         "email" => {
             let mut ret = Err(anyhow::anyhow!("No email provided!"));