Generation changes

Signed-off-by: Elizabeth Myers <elizabeth.jennifer.myers@gmail.com>
Elizafox · Apr 3, 2024 · 2b6cc87 · 2b6cc87
1 parent 6e461ea
commit 2b6cc87
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/src/generate.rs b/src/generate.rs
@@ -257,6 +257,7 @@ mod strings {
         "300deadmen",
         "30waystokillyourwife",
         "4chanhacks",
+        "4chan-porn",
         "419scam",
         "420",
         "500$-cashprize",
@@ -281,6 +282,7 @@ mod strings {
         "alien-abduction",
         "all-natural",
         "ambien",
+        "amphpetamine",
         "anal",
         "anal-penetration",
         "analsex",
@@ -335,6 +337,7 @@ mod strings {
         "best-gore",
         "best-pills",
         "bettingonline",
+        "biden-sextape",
         "bigasses",
         "bigbang",
         "bigbutts",
@@ -639,6 +642,7 @@ mod strings {
         "horse-slaughter",
         "hotbabes",
         "hotgoats",
+        "hotties",
         "hotwomen",
         "hotmail",
         "how2printmoney",
@@ -658,6 +662,7 @@ mod strings {
         "illegal-drugs",
         "illegal-guns-4-sale",
         "illegal-porno",
+        "illegal-videos",
         "iloveu",
         "imake2000aweekathome",
         "impersonateanyone",
@@ -679,6 +684,7 @@ mod strings {
         "intifada",
         "instagram-hack",
         "instagram-of-sex",
+        "investment",
         "investmentopportunity",
         "icloud-bypass",
         "icloud-unlock",
@@ -729,6 +735,7 @@ mod strings {
         "jointhearyanbrotherhood",
         "jointhekkk",
         "k9porn",
+        "kangaroo-porno",
         "keygen",
         "keylogger",
         "killallimmigrants",
@@ -763,6 +770,7 @@ mod strings {
         "linkedin-hookup",
         "linkedin-of-sex",
         "liveleak-for-lesbians",
+        "loans",
         "localmen",
         "localwomen",
         "loli-pics",
@@ -772,6 +780,7 @@ mod strings {
         "loosesluts",
         "lorazepam",
         "lotto-winner",
+        "low-interest-payday-loans",
         "lsdcheap",
         "m4m",
         "m4t",
@@ -810,6 +819,8 @@ mod strings {
         "mercenary",
         "mercenary-kills-animals",
         "mercenary-kills-kids",
+        "meth-online",
+        "meth-mouth-pics",
         "microsoft-giveaway",
         "mike-pence-gay",
         "mike-pence-naked",
@@ -880,8 +891,11 @@ mod strings {
         "overnitemillionaire",
         "overnitesuccess",
         "overnitetrillionaire",
+        "ozempic-weightloss",
         "palestinian-bombing",
         "palestinian-murder",
+        "payday",
+        "paydirt",
         "passwordhack",
         "peanut-butter-sex",
         "pee-everywhere",
@@ -890,6 +904,7 @@ mod strings {
         "pedophilesonline",
         "penetration",
         "penisenlargement",
+        "penisland",
         "petitmilf",
         "pewdiepie-sextape",
         "pharmacanada",
@@ -932,6 +947,7 @@ mod strings {
         "popup",
         "popup-spam",
         "porn",
+        "porno",
         "prince-scandal",
         "princess-scandal",
         "probing",
@@ -976,6 +992,7 @@ mod strings {
         "realdonkeyshow",
         "reallyhornygirls",
         "refinance-now",
+        "refinance-your-home",
         "refugee-murder",
         "removevirus",
         "richfast",
@@ -1035,6 +1052,7 @@ mod strings {
         "shotacon-pics",
         "sim-clone",
         "sim-unlock",
+        "skibidi-toilet",
         "skinned-alive",
         "skinned-cats",
         "slutcams",
@@ -1054,6 +1072,7 @@ mod strings {
         "spyonurhusband",
         "spyonurwife",
         "spyware",
+        "ssh-backdoor",
         "ssn",
         "stalkher",
         "steal",
@@ -1087,6 +1106,7 @@ mod strings {
         "taliban-interview",
         "taliban-meetup",
         "taliban-recruiter",
+        "tarball-exploit",
         "teen",
         "teen-barely-legal",
         "telegram-adult-rooms",
@@ -1103,6 +1123,7 @@ mod strings {
         "tighten-my-pussy",
         "tits",
         "titstitstits",
+        "toilet-vids",
         "tokens",
         "toolbar",
         "toolbar-download",
@@ -1121,8 +1142,10 @@ mod strings {
         "trackmywife",
         "train-accident-photos",
         "trans-porn",
+        "trans-surgery-vids",
         "trojaninstaller",
         "trojan-start",
+        "trump-sextape",
         "turd-fucking",
         "turkey-porn",
         "twitter-blowjob",
@@ -1135,6 +1158,7 @@ mod strings {
         "ur-hubby-is-cumming",
         "ur-jackpot-awaits",
         "ur-wife-is-cumming",
+        "urinal-vids",
         "usb-hijacker",
         "vaginapix",
         "vaginal-rejeuvenation",
@@ -1170,6 +1194,7 @@ mod strings {
         "watchtv4free",
         "web-toolbar",
         "weed",
+        "wegovy-weightloss",
         "weightloss",
         "wetfartporn",
         "wetpussy",
@@ -1199,6 +1224,7 @@ mod strings {
         "xxx-tits",
         "xxxtra",
         "xylophone-sex",
+        "xz-backdoor",
         "yenforex",
         "you-won",
         "youre-a-winner",
@@ -1208,17 +1234,20 @@ mod strings {
         "zinc-supplement",
         "zebra-porn",
         "zipper-open-pics",
+        "zipperporn",
         "zoo",
         "zooporn",
+        "zoosadism",
     ]);
 
     // Various extensions to use in a shady filename
     arr!(pub(super) const EXT: [&str; _] = [
-        ".avi", ".bas", ".csv", ".divx", ".dll", ".doc", ".docx", ".flv", ".gif", ".htm", ".html",
-        ".ini", ".jar", ".js", ".jpeg", ".jpg", ".m1v", ".m4a", ".mid", ".midi", ".mkv", ".mod", ".mov",
-        ".movie", ".mpa", ".mpe", ".mpeg", ".mpg", ".mp3", ".mp4", ".p7r", ".pdf", ".png", ".ppt",
-        ".pptx", ".rar", ".sgml", ".snd", ".swf", ".tiff", ".txt", ".webm", ".webp", ".vbs", ".xaf",
-        ".xhtml", ".xls", ".xlsx", ".xml", ".zip",
+        ".avi", ".bas", ".bz2", ".csv", ".divx", ".dll", ".doc", ".docx", ".flv", ".gif", ".gz", ".htm",
+        ".html", ".img", ".ini", ".jar", ".js", ".jpeg", ".jpg", ".lzma", ".m1v", ".m4a", ".mid",
+        ".midi", ".mkv", ".mod", ".mov", ".movie", ".mpa", ".mpe", ".mpeg", ".mpg", ".mp3", ".mp4",
+        ".p7r", ".pdf", ".png", ".ppt", ".pptx", ".rar", ".sgml", ".snd", ".swf", ".tar", ".tar.bz2",
+        ".tar.gz", ".tar.lzma", ".tar.xz", ".tbz2", ".tgz", ".tlzma", ".txz", ".tiff", ".torrent",
+        ".txt", ".webm", ".webp", ".vbs", ".xaf", ".xhtml", ".xls", ".xlsx", ".xml", ".xz", ".zip",
     ]);
 
     // Executable formats, to make it look really shady

diff --git a/src/util/string.rs b/src/util/string.rs
@@ -104,8 +104,9 @@ impl Distribution<u8> for WebsafeAlphabet {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u8 {
         const GEN_ASCII_STR_CHARSET: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\
                 abcdefghijklmnopqrstuvwxyz\
-                0123456789$-_.+!*(),";
-        const MAX: usize = 26 + 26 + 10 + 10;
+                0123456789\
+                $-_+!*,";
+        const MAX: usize = 26 + 26 + 10 + 7;
         let range = Lazy::new(|| Uniform::new(0, MAX));
 
         // SAFETY: guaranteed to be within bounds