fail better

Cargo.lock

@@ -2,6 +2,54 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "anstream"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.7"
@@ -76,6 +124,52 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "clap"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.0"
@@ -124,6 +218,12 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -166,6 +266,7 @@ dependencies = [
 name = "map-tool"
 version = "0.1.0"
 dependencies = [
+ "clap",
  "rbx_binary",
  "rbx_dom_weak",
  "rbx_reflection_database",
@@ -364,6 +465,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -413,6 +520,12 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -424,3 +537,69 @@ name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

Cargo.toml

@@ -6,6 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+clap = { version = "4.4.2", features = ["derive"] }
 rbx_binary = "0.7.1"
 rbx_dom_weak = "2.5.0"
 rbx_reflection_database = "0.2.7"
+
+[profile.release]
+lto = true
+strip = true
+codegen-units = 1

src/main.rs

@@ -1,3 +1,29 @@
+use std::unimplemented;
+
+use clap::{Args, Parser, Subcommand};
+
+#[derive(Parser)]
+#[command(author, version, about, long_about = None)]
+#[command(propagate_version = true)]
+struct Cli {
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    Download(MapList),
+    Upload,
+    Scan,
+    Replace,
+    Interactive,
+}
+
+#[derive(Args)]
+struct MapList {
+    maps: Vec<u64>,
+}
+
 fn class_is_a(class: &str, superclass: &str) -> bool {
     if class==superclass {
         return true
@@ -11,63 +37,209 @@ fn class_is_a(class: &str, superclass: &str) -> bool {
     return false
 }
 
-fn recursive_collect_scripts(scripts: &mut std::vec::Vec<rbx_dom_weak::types::Ref>,dom: &rbx_dom_weak::WeakDom, instance: &rbx_dom_weak::Instance){
+//download
-    for &referent in instance.children() {
+    //download list of maps to maps/unprocessed
-        if let Some(c) = dom.get_by_ref(referent) {
+//scan (scripts)
-            if class_is_a(c.class.as_str(), "LuaSourceContainer") {
+    //iter maps/unprocessed
-                scripts.push(c.referent());//copy ref
+    //passing moves to maps/verified
-            }
+    //failing moves to maps/purgatory
-            recursive_collect_scripts(scripts,dom,c);
+//replace (edits & deletions)
+    //iter maps/purgatory
+    //replace scripts and put in maps/unprocessed
+//upload
+    //iter maps/verified
+    //interactively print DisplayName/Creator and ask for target upload ids
+//interactive
+    //iter maps/unprocessed
+    //for each unique script, load it into the file current.lua and have it open in sublime text
+    //I can edit the file and it will edit it in place
+    //I pass/fail(with comment)/allow each script
+
+fn get_scripts(dom:rbx_dom_weak::WeakDom) -> Vec<rbx_dom_weak::Instance>{
+    let mut scripts = std::vec::Vec::<rbx_dom_weak::Instance>::new();
+
+    let (_,mut instances) = dom.into_raw();
+    for (_,instance) in instances.drain() {
+        if class_is_a(instance.class.as_str(), "LuaSourceContainer") {
+            scripts.push(instance);
         }
     }
+    scripts
 }
 
-fn main() -> Result<(), Box<dyn std::error::Error>> {
+fn download(map_list: Vec<u64>) -> Result<(), Box<dyn std::error::Error>>{
-    // Using buffered I/O is recommended with rbx_binary
+    let header=format!("Cookie: .ROBLOSECURITY={}",std::env::var("RBXCOOKIE")?);
-    let input = std::io::BufReader::new(std::fs::File::open("map.rbxm")?);
+    let shared_args=&[
+        "-q",
+        "--header",
+        header.as_str(),
+        "-O",
+    ];
+    for map_id in map_list.iter() {
+        std::process::Command::new("wget")
+        .args(shared_args)
+        .arg(format!("maps/unprocessed/{}.rbxl",map_id))
+        .arg(format!("https://assetdelivery.roblox.com/v1/asset/?ID={}",map_id))
+        .spawn()?;
+    }
+    Ok(())
+}
+
+enum Scan{
+    Passed,
+    Blocked,
+    Flagged,
+}
+fn scan() -> Result<(), Box<dyn std::error::Error>>{
+    let mut id = 0u32;
+    match std::fs::read_to_string("id"){
+        Ok(id_file)=>id=id_file.parse::<u32>()?,
+        Err(e) => match e.kind() {
+            std::io::ErrorKind::NotFound => println!("id file does not exist: starting from 0"),//continue on, implicitly take on id=0, write the id file at the end
+            _ => return Err(e)?,
+        }
+    }
+    //Construct allowed scripts
+    let mut allowed_set = std::collections::HashSet::<String>::new();
+    for entry in std::fs::read_dir("scripts/allowed")? {
+        allowed_set.insert(std::fs::read_to_string(entry?.path())?);
+    }
+    let mut blocked = std::collections::HashSet::<String>::new();
+    for entry in std::fs::read_dir("scripts/blocked")? {
+        blocked.insert(std::fs::read_to_string(entry?.path())?);
+    }
+
+    for entry in std::fs::read_dir("maps/unprocessed")? {
+        let file_thing=entry?;
+        let input = std::io::BufReader::new(std::fs::File::open(file_thing.path())?);
 
         let dom = rbx_binary::from_reader(input)?;
 
+        let scripts = get_scripts(dom);
+
+        //check scribb
+        let mut fail_count=0;
+        let mut fail_type=Scan::Passed;
+        for script in scripts.iter() {
+            if let Some(rbx_dom_weak::types::Variant::String(s)) = script.properties.get("Source") {
+                //flag keywords and instantly fail
+                if s.find("getfenv").is_some()||s.find("require").is_some(){
+                    println!("{:?} - flagged.",file_thing.file_name());
+                    fail_type=Scan::Flagged;
+                    break;
+                }
+                if allowed_set.contains(s) {
+                    continue;
+                }else{
+                    fail_type=Scan::Blocked;//no need to check for Flagged, it breaks the loop.
+                    fail_count+=1;
+                    if !blocked.contains(s) {
+                        blocked.insert(s.clone());//all fixed! just clone!
+                        std::fs::write(format!("scripts/blocked/{}.lua",id),s)?;
+                        id+=1;
+                    }
+                }
+            }else{
+                panic!("FATAL: failed to get source for {:?}",file_thing.file_name());
+            }
+        }
+        let mut dest=match fail_type {
+            Scan::Passed => std::path::PathBuf::from("maps/processed"),
+            Scan::Blocked => {
+                println!("{:?} - {} {} not allowed.",file_thing.file_name(),fail_count,if fail_count==1 {"script"}else{"scripts"});
+                std::path::PathBuf::from("maps/purgatory")
+            }
+            Scan::Flagged => std::path::PathBuf::from("maps/flagged")
+        };
+        dest.push(file_thing.file_name());
+        std::fs::rename(file_thing.path(), dest)?;
+    }
+    std::fs::write("id",id.to_string())?;
+    Ok(())
+}
+fn replace() -> Result<(), Box<dyn std::error::Error>>{
     //Construct allowed scripts
-    let mut allowed = std::collections::HashSet::<String>::new();
+    let mut allowed_map = std::collections::HashMap::<u32,String>::new();
-    for entry in std::fs::read_dir("allowed")? {
+    for entry in std::fs::read_dir("scripts/allowed")? {
-        allowed.insert(std::fs::read_to_string(entry?.path())?);
+        let entry=entry?;
+        allowed_map.insert(entry.file_name().to_str().unwrap().parse::<u32>()?,std::fs::read_to_string(entry.path())?);
+    }
+    let mut replace = std::collections::HashMap::<String,u32>::new();
+    for entry in std::fs::read_dir("scripts/replace")? {
+        let entry=entry?;
+        replace.insert(std::fs::read_to_string(entry.path())?,entry.file_name().to_str().unwrap().parse::<u32>()?);
     }
 
-    let mut scripts = std::vec::Vec::<rbx_dom_weak::types::Ref>::new();
+    for entry in std::fs::read_dir("maps/purgatory")? {
-    recursive_collect_scripts(&mut scripts, &dom, dom.root());
+        let file_thing=entry?;
+        let input = std::io::BufReader::new(std::fs::File::open(file_thing.path())?);
+
+        let dom = rbx_binary::from_reader(input)?;
+
+        let mut write_dom = rbx_dom_weak::WeakDom::new(rbx_dom_weak::InstanceBuilder::empty());
+        dom.clone_into_external(dom.root_ref(), &mut write_dom);
+
+        let scripts = get_scripts(dom);
 
         //check scribb
         let mut any_failed=false;
-    for (i,&referent) in scripts.iter().enumerate() {
+        for script in scripts.iter() {
-        if let Some(script) = dom.get_by_ref(referent) {
+            if let Some(rbx_dom_weak::types::Variant::String(source)) = script.properties.get("Source") {
-            if let Some(rbx_dom_weak::types::Variant::String(s)) = script.properties.get("Source") {
+                if let (Some(replace_id),Some(replace_script))=(replace.get(source),write_dom.get_by_ref_mut(script.referent())) {
-                if allowed.contains(s) {
+                    println!("replace {}",replace_id);
-                    println!("pass");
+                    //replace the source
+                    if let Some(replace_source)=allowed_map.get(replace_id){
+                        replace_script.properties.insert("Source".to_string(), rbx_dom_weak::types::Variant::String(replace_source.clone()));
                     }else{
-                    println!("fail");
+                        println!("failed to get replacement source {}",replace_id);
-                    any_failed=true;
-                    std::fs::write(format!("blocked/{}.lua",i),s)?;
-                }
-            }else{
-                println!("failed to get source");
                         any_failed=true;
                     }
                 }else{
-            println!("failed to deref script");
+                    println!("failed to failed to get replace_id and replace_script");
+                    any_failed=true;
+                }
+            }else{
+                println!("failed to failed to get source");
                 any_failed=true;
             }
         }
         if any_failed {
-        println!("One or more scripts are not allowed.");
+            println!("One or more scripts failed to replace.");
-        return Ok(())//everything is not ok but idk how to return an error LMAO
+        }else{
+            let mut dest=std::path::PathBuf::from("maps/unprocessed");
+            dest.set_file_name(file_thing.file_name());
+            dest.set_extension("rbxl");//extension is always rbxl even if source file is extensionless
+            let output = std::io::BufWriter::new(std::fs::File::open(dest)?);
+            rbx_binary::to_writer(output, &write_dom, &[write_dom.root_ref()])?;
         }
-    println!("All scripts passed!");
+    }
+    Ok(())
+}
+fn upload() -> Result<(), Box<dyn std::error::Error>>{
+    //interactive prompt per upload:
+    //Creator: [auto fill creator]
+    //DisplayName: [auto fill DisplayName]
+    //id: ["New" for blank because of my double enter key]
     // std::process::Command::new("rbxcompiler")
     // .arg("--compile=false")
     // .arg("--group=6980477")
     // .arg("--asset=5692139100")
     // .arg("--input=map.rbxm")
     // .spawn()?;
-    Ok(())
+    unimplemented!()
+}
+
+fn interactive() -> Result<(), Box<dyn std::error::Error>>{
+    unimplemented!()
+}
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let cli = Cli::parse();
+    match cli.command {
+        Commands::Download(map_list)=>download(map_list.maps),
+        Commands::Upload=>upload(),
+        Commands::Scan=>scan(),
+        Commands::Replace=>replace(),
+        Commands::Interactive=>interactive(),
+    }
 }