mirror of
https://github.com/notohh/rustlings.git
synced 2024-12-22 00:18:09 -05:00
Revert "Implement third-party exercises trust handling"
This reverts commit 15ca847c37.
See https://rust-lang.zulipchat.com/#narrow/stream/334454-rustlings/topic/Proposal.3A.20Third-party.20exercises/near/433183449
This commit is contained in:
mo8it
parent
15ca847c37
commit
6f04570dd0
5 changed files with 5 additions and 191 deletions
80
Cargo.lock
generated
80
Cargo.lock
generated
|
|
@ -253,27 +253,6 @@ version = "0.4.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "5.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
|
||||
dependencies = [
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"option-ext",
|
||||
"redox_users",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "doc-comment"
|
||||
version = "0.3.3"
|
||||
|
|
@ -341,17 +320,6 @@ dependencies = [
|
|||
"toml_edit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.3"
|
||||
|
|
@ -460,16 +428,6 @@ version = "0.2.153"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
|
||||
[[package]]
|
||||
name = "libredox"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
|
||||
dependencies = [
|
||||
"bitflags 2.5.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.13"
|
||||
|
|
@ -570,12 +528,6 @@ version = "1.19.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
|
||||
[[package]]
|
||||
name = "option-ext"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.1"
|
||||
|
|
@ -682,17 +634,6 @@ dependencies = [
|
|||
"bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"libredox",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.4"
|
||||
|
|
@ -743,7 +684,6 @@ dependencies = [
|
|||
"assert_cmd",
|
||||
"clap",
|
||||
"crossterm",
|
||||
"dirs",
|
||||
"hashbrown",
|
||||
"notify-debouncer-mini",
|
||||
"predicates",
|
||||
|
|
@ -925,26 +865,6 @@ version = "0.4.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.58"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.58",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "0.6.5"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ edition.workspace = true
|
|||
anyhow.workspace = true
|
||||
clap = { version = "4.5.4", features = ["derive"] }
|
||||
crossterm = "0.27.0"
|
||||
dirs = "5.0.1"
|
||||
hashbrown = "0.14.3"
|
||||
notify-debouncer-mini = "0.4.1"
|
||||
ratatui = "0.26.1"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use std::{
|
|||
path::Path,
|
||||
};
|
||||
|
||||
use crate::{embedded::EMBEDDED_FILES, info_file::ExerciseInfo, trust::trust_current_dir};
|
||||
use crate::{embedded::EMBEDDED_FILES, info_file::ExerciseInfo};
|
||||
|
||||
fn create_cargo_toml(exercise_infos: &[ExerciseInfo]) -> io::Result<()> {
|
||||
let mut cargo_toml = Vec::with_capacity(1 << 13);
|
||||
|
|
@ -85,8 +85,6 @@ pub fn init(exercise_infos: &[ExerciseInfo]) -> Result<()> {
|
|||
|
||||
create_vscode_dir().context("Failed to create the file `rustlings/.vscode/extensions.json`")?;
|
||||
|
||||
trust_current_dir()?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
|
|||
39
src/main.rs
39
src/main.rs
|
|
@ -1,4 +1,5 @@
|
|||
use anyhow::{Context, Result};
|
||||
use app_state::StateFileStatus;
|
||||
use clap::{Parser, Subcommand};
|
||||
use crossterm::{
|
||||
terminal::{Clear, ClearType},
|
||||
|
|
@ -18,16 +19,14 @@ mod init;
|
|||
mod list;
|
||||
mod progress_bar;
|
||||
mod run;
|
||||
mod trust;
|
||||
mod watch;
|
||||
|
||||
use self::{
|
||||
app_state::{AppState, StateFileStatus},
|
||||
app_state::AppState,
|
||||
info_file::InfoFile,
|
||||
init::init,
|
||||
list::list,
|
||||
run::run,
|
||||
trust::{current_dir_is_trusted, trust_current_dir},
|
||||
watch::{watch, WatchExit},
|
||||
};
|
||||
|
||||
|
|
@ -62,11 +61,6 @@ enum Subcommands {
|
|||
/// The name of the exercise
|
||||
name: String,
|
||||
},
|
||||
/// Trust the current directory with its exercises.
|
||||
///
|
||||
/// You only need to run this if you want to work on third-party exercises or after you moved
|
||||
/// the official exercises that were initialized with `rustlings init`.
|
||||
Trust,
|
||||
}
|
||||
|
||||
fn main() -> Result<()> {
|
||||
|
|
@ -87,17 +81,6 @@ fn main() -> Result<()> {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
if matches!(args.command, Some(Subcommands::Trust)) {
|
||||
trust_current_dir()?;
|
||||
println!("{POST_TRUST_MSG}");
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if !current_dir_is_trusted()? {
|
||||
println!("{NOT_TRUSTED_MSG}");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
let (mut app_state, state_file_status) = AppState::new(
|
||||
info_file.exercises,
|
||||
info_file.final_message.unwrap_or_default(),
|
||||
|
|
@ -148,6 +131,8 @@ fn main() -> Result<()> {
|
|||
}
|
||||
}
|
||||
}
|
||||
// `Init` is handled above.
|
||||
Some(Subcommands::Init) => (),
|
||||
Some(Subcommands::Run { name }) => {
|
||||
if let Some(name) = name {
|
||||
app_state.set_current_exercise_by_name(&name)?;
|
||||
|
|
@ -165,8 +150,6 @@ fn main() -> Result<()> {
|
|||
app_state.set_current_exercise_by_name(&name)?;
|
||||
println!("{}", app_state.current_exercise().hint);
|
||||
}
|
||||
// `Init` and `Trust` are handled above.
|
||||
Some(Subcommands::Init | Subcommands::Trust) => (),
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
|
@ -193,20 +176,6 @@ const PRE_INIT_MSG: &str = r"
|
|||
The `exercises` directory wasn't found in the current directory.
|
||||
If you are just starting with Rustlings, run the command `rustlings init` to initialize it.";
|
||||
|
||||
const POST_TRUST_MSG: &str = "You now trust the exercises in the current directory.
|
||||
Run `rustlings` to start working on them.";
|
||||
|
||||
const NOT_TRUSTED_MSG: &str = "It looks like you are trying to work on third-party exercises.
|
||||
Rustlings supports third-party exercises. But because Rustlings runs the code inside an exercise,
|
||||
we need to warn you about the possibility of malicious code.
|
||||
We recommend that you read all the exercise files in the `exercises` directory and check the
|
||||
dependencies in the `Cargo.toml` file.
|
||||
If everything looks fine and you want to trust this directory, run `rustlings trust`.
|
||||
|
||||
If you you are trying to work on the official exercises that were generated using `rustlings init`,
|
||||
then you probably moved the directory containing them. In that case, you can run `rustlings trust`
|
||||
without a problem.";
|
||||
|
||||
const FENISH_LINE: &str = "+----------------------------------------------------+
|
||||
| You made it to the Fe-nish line! |
|
||||
+-------------------------- ------------------------+
|
||||
|
|
|
|||
72
src/trust.rs
72
src/trust.rs
|
|
@ -1,72 +0,0 @@
|
|||
use anyhow::{Context, Error, Result};
|
||||
use std::{
|
||||
env,
|
||||
fs::{self, OpenOptions},
|
||||
io::{ErrorKind, Write},
|
||||
};
|
||||
|
||||
const DATA_DIR_NAME: &str = "rustlings";
|
||||
const TRUSTED_DIRS_FILE_NAME: &str = "trusted-dirs.txt";
|
||||
|
||||
pub fn trust_current_dir() -> Result<()> {
|
||||
let mut path = dirs::data_dir().context("Failed to determine the data directory")?;
|
||||
path.push(DATA_DIR_NAME);
|
||||
if !path.is_dir() {
|
||||
fs::create_dir(&path)
|
||||
.with_context(|| format!("Failed to create the directory {}", path.display()))?;
|
||||
}
|
||||
|
||||
path.push(TRUSTED_DIRS_FILE_NAME);
|
||||
let mut file = OpenOptions::new()
|
||||
.create(true)
|
||||
.append(true)
|
||||
.open(&path)
|
||||
.with_context(|| {
|
||||
format!(
|
||||
"Failed to create/open the file {} in write mode",
|
||||
path.display(),
|
||||
)
|
||||
})?;
|
||||
|
||||
let dir = env::current_dir().context("Failed to get the current directory path")?;
|
||||
let dir = dir.to_string_lossy();
|
||||
let mut line = Vec::with_capacity(dir.as_bytes().len() + 1);
|
||||
line.extend_from_slice(dir.as_bytes());
|
||||
line.push(b'\n');
|
||||
|
||||
file.write_all(&line)
|
||||
.with_context(|| format!("Failed to append to the file {}", path.display()))
|
||||
}
|
||||
|
||||
pub fn current_dir_is_trusted() -> Result<bool> {
|
||||
let mut path = dirs::data_dir().context("Failed to determine the data directory")?;
|
||||
path.push(DATA_DIR_NAME);
|
||||
path.push(TRUSTED_DIRS_FILE_NAME);
|
||||
|
||||
let content = match fs::read(&path) {
|
||||
Ok(v) => v,
|
||||
Err(e) => match e.kind() {
|
||||
ErrorKind::NotFound => return Ok(false),
|
||||
_ => {
|
||||
return Err(
|
||||
Error::from(e).context(format!("Failed to read the file {}", path.display()))
|
||||
)
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
let current_dir = env::current_dir().context("Failed to get the current directory path")?;
|
||||
let current_dir = current_dir.to_string_lossy();
|
||||
|
||||
for line in content.split(|c| *c == b'\n') {
|
||||
if line.is_empty() {
|
||||
break;
|
||||
}
|
||||
|
||||
if line == current_dir.as_bytes() {
|
||||
return Ok(true);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(false)
|
||||
}
|
||||
Loading…
Reference in a new issue