From 93bfc372474199367519f0b10820cd0d5b332e66 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 2 Aug 2022 17:40:05 +0200 Subject: Test that uploads fail if outside restricted dir --- tests/upload_files.rs | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 71fcbc4..a7a0a10 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -80,6 +80,44 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { Ok(()) } +#[rstest] +fn uploading_files_is_restricted( + #[with(&["-u", "--restrict-upload-dir", "someDir"])] server: TestServer +) -> Result<(), Error> { + let test_file_name = "uploaded test file.txt"; + + // Before uploading, check whether the uploaded file does not yet exist. + let body = reqwest::blocking::get(server.url())?.error_for_status()?; + let parsed = Document::from_read(body)?; + assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); + + // Ensure the file upload form is not present + assert!(parsed.find(Attr("id", "file_submit")).next().is_none()); + + // Then try to upload anyway + let form = multipart::Form::new(); + let part = multipart::Part::text("this should not be uploaded") + .file_name(test_file_name) + .mime_str("text/plain")?; + let form = form.part("file_to_upload", part); + + let client = Client::new(); + // Ensure uploading fails and returns an error + assert!(client + .post(server.url().join("/upload?path=/")?) + .multipart(form) + .send()? + .error_for_status() + .is_err()); + + // After uploading, check whether the uploaded file is now getting listed. + let body = reqwest::blocking::get(server.url())?; + let parsed = Document::from_read(body)?; + assert!(!parsed.find(Text).any(|x| x.text() == test_file_name)); + + Ok(()) +} + /// Test for path traversal vulnerability (CWE-22) in both path parameter of query string and in /// file name (Content-Disposition) /// -- cgit v1.2.3 From fdf38e9bbbe41c00df09f31a1cc3176c21d90f02 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 2 Aug 2022 20:28:08 +0200 Subject: Removed redundant test code, fixed comments --- tests/upload_files.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index a7a0a10..a046426 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -72,7 +72,7 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { .error_for_status() .is_err()); - // After uploading, check whether the uploaded file is now getting listed. + // After uploading, check whether the uploaded file is NOT getting listed. let body = reqwest::blocking::get(server.url())?; let parsed = Document::from_read(body)?; assert!(!parsed.find(Text).any(|x| x.text() == test_file_name)); @@ -80,21 +80,15 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { Ok(()) } +// This test runs the server with --restrict-upload-dir argument and +// checks that file upload to a different directory is actually prevented. #[rstest] fn uploading_files_is_restricted( #[with(&["-u", "--restrict-upload-dir", "someDir"])] server: TestServer ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; - // Before uploading, check whether the uploaded file does not yet exist. - let body = reqwest::blocking::get(server.url())?.error_for_status()?; - let parsed = Document::from_read(body)?; - assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); - - // Ensure the file upload form is not present - assert!(parsed.find(Attr("id", "file_submit")).next().is_none()); - - // Then try to upload anyway + // Then try to upload file to root directory (which is not the --restrict-upload-dir) let form = multipart::Form::new(); let part = multipart::Part::text("this should not be uploaded") .file_name(test_file_name) @@ -110,7 +104,7 @@ fn uploading_files_is_restricted( .error_for_status() .is_err()); - // After uploading, check whether the uploaded file is now getting listed. + // After uploading, check whether the uploaded file is NOT getting listed. let body = reqwest::blocking::get(server.url())?; let parsed = Document::from_read(body)?; assert!(!parsed.find(Text).any(|x| x.text() == test_file_name)); -- cgit v1.2.3 From 7cd15dfb54829979ff9ebb4c6ad2a463f1534491 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 2 Aug 2022 20:35:45 +0200 Subject: Added positive test for --restrict-upload-dir --- tests/upload_files.rs | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index a046426..afe2972 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -112,6 +112,51 @@ fn uploading_files_is_restricted( Ok(()) } +// This tests that we can upload files to the directory specified by --restrict-upload-dir +#[rstest] +fn uploading_files_to_restricted_dir_works( + #[with(&["-u", "--restrict-upload-dir", "someDir"])] server: TestServer +) -> Result<(), Error> { + let test_file_name = "uploaded test file.txt"; + + // Create test directory + use std::fs::create_dir_all; + create_dir_all(server.path().join("someDir")).unwrap(); + + // Before uploading, check whether the uploaded file does not yet exist. + let body = reqwest::blocking::get(server.url().join("someDir")?)?.error_for_status()?; + let parsed = Document::from_read(body)?; + assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); + + // Perform the actual upload. + let upload_action = parsed + .find(Attr("id", "file_submit")) + .next() + .expect("Couldn't find element with id=file_submit") + .attr("action") + .expect("Upload form doesn't have action attribute"); + let form = multipart::Form::new(); + let part = multipart::Part::text("this should be uploaded") + .file_name(test_file_name) + .mime_str("text/plain")?; + let form = form.part("file_to_upload", part); + + let client = Client::new(); + client + .post(server.url().join(upload_action)?) + .multipart(form) + .send()? + .error_for_status()?; + + // After uploading, check whether the uploaded file is now getting listed. + let body = reqwest::blocking::get(server.url().join("someDir")?)?; + let parsed = Document::from_read(body)?; + assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); + + Ok(()) +} + + /// Test for path traversal vulnerability (CWE-22) in both path parameter of query string and in /// file name (Content-Disposition) /// -- cgit v1.2.3 From b51cbc9e6dcc2b563f8403c520609d1a4b074d6d Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Wed, 3 Aug 2022 14:42:40 +0200 Subject: added test cases for sub directory --- tests/upload_files.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index afe2972..7bd85df 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -83,8 +83,10 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { // This test runs the server with --restrict-upload-dir argument and // checks that file upload to a different directory is actually prevented. #[rstest] +#[case(server(&["-u", "--restrict-upload-dir", "someDir"]))] +#[case(server(&["-u", "--restrict-upload-dir", "someDir/some_sub_dir"]))] fn uploading_files_is_restricted( - #[with(&["-u", "--restrict-upload-dir", "someDir"])] server: TestServer + #[case] server: TestServer ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; @@ -114,17 +116,20 @@ fn uploading_files_is_restricted( // This tests that we can upload files to the directory specified by --restrict-upload-dir #[rstest] +#[case(server(&["-u", "--restrict-upload-dir", "someDir"]), "someDir")] +#[case(server(&["-u", "--restrict-upload-dir", "someDir/some_sub_dir"]), "someDir/some_sub_dir")] fn uploading_files_to_restricted_dir_works( - #[with(&["-u", "--restrict-upload-dir", "someDir"])] server: TestServer + #[case] server: TestServer, + #[case] upload_dir: &str, ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; // Create test directory use std::fs::create_dir_all; - create_dir_all(server.path().join("someDir")).unwrap(); + create_dir_all(server.path().join(upload_dir)).unwrap(); // Before uploading, check whether the uploaded file does not yet exist. - let body = reqwest::blocking::get(server.url().join("someDir")?)?.error_for_status()?; + let body = reqwest::blocking::get(server.url().join(upload_dir)?)?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); @@ -149,7 +154,7 @@ fn uploading_files_to_restricted_dir_works( .error_for_status()?; // After uploading, check whether the uploaded file is now getting listed. - let body = reqwest::blocking::get(server.url().join("someDir")?)?; + let body = reqwest::blocking::get(server.url().join(upload_dir)?)?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); -- cgit v1.2.3 From 36b041a07183c69eb40c9ae74b0a9ab4c6ccbd53 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Wed, 3 Aug 2022 14:51:20 +0200 Subject: Avoid error message during testing of restricted --- tests/upload_files.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 7bd85df..35569cb 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -83,8 +83,8 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { // This test runs the server with --restrict-upload-dir argument and // checks that file upload to a different directory is actually prevented. #[rstest] -#[case(server(&["-u", "--restrict-upload-dir", "someDir"]))] -#[case(server(&["-u", "--restrict-upload-dir", "someDir/some_sub_dir"]))] +#[case(server_no_stderr(&["-u", "--restrict-upload-dir", "someDir"]))] +#[case(server_no_stderr(&["-u", "--restrict-upload-dir", "someDir/some_sub_dir"]))] fn uploading_files_is_restricted( #[case] server: TestServer ) -> Result<(), Error> { -- cgit v1.2.3 From 550ae0151c1dadc6c1f00df300d88528c29fbf49 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Thu, 4 Aug 2022 11:20:37 +0200 Subject: Renamed option for more clarity --- tests/upload_files.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 35569cb..508d7c6 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -83,8 +83,8 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { // This test runs the server with --restrict-upload-dir argument and // checks that file upload to a different directory is actually prevented. #[rstest] -#[case(server_no_stderr(&["-u", "--restrict-upload-dir", "someDir"]))] -#[case(server_no_stderr(&["-u", "--restrict-upload-dir", "someDir/some_sub_dir"]))] +#[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir"]))] +#[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]))] fn uploading_files_is_restricted( #[case] server: TestServer ) -> Result<(), Error> { @@ -116,8 +116,8 @@ fn uploading_files_is_restricted( // This tests that we can upload files to the directory specified by --restrict-upload-dir #[rstest] -#[case(server(&["-u", "--restrict-upload-dir", "someDir"]), "someDir")] -#[case(server(&["-u", "--restrict-upload-dir", "someDir/some_sub_dir"]), "someDir/some_sub_dir")] +#[case(server(&["-u", "--allowed-upload-dir", "someDir"]), "someDir")] +#[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]), "someDir/some_sub_dir")] fn uploading_files_to_restricted_dir_works( #[case] server: TestServer, #[case] upload_dir: &str, -- cgit v1.2.3 From 40b7d26c53692ccdaf139e612dd8b6d346c32b8e Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Thu, 4 Aug 2022 11:26:45 +0200 Subject: renaming of option for clarity in test --- tests/upload_files.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 508d7c6..a819abe 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -80,8 +80,8 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { Ok(()) } -// This test runs the server with --restrict-upload-dir argument and -// checks that file upload to a different directory is actually prevented. +/// This test runs the server with --allowed-upload-dir argument and +/// checks that file upload to a different directory is actually prevented. #[rstest] #[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir"]))] #[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]))] @@ -90,7 +90,7 @@ fn uploading_files_is_restricted( ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; - // Then try to upload file to root directory (which is not the --restrict-upload-dir) + // Then try to upload file to root directory (which is not the --allowed-upload-dir) let form = multipart::Form::new(); let part = multipart::Part::text("this should not be uploaded") .file_name(test_file_name) @@ -114,11 +114,11 @@ fn uploading_files_is_restricted( Ok(()) } -// This tests that we can upload files to the directory specified by --restrict-upload-dir +/// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] #[case(server(&["-u", "--allowed-upload-dir", "someDir"]), "someDir")] #[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]), "someDir/some_sub_dir")] -fn uploading_files_to_restricted_dir_works( +fn uploading_files_to_allowed_dir_works( #[case] server: TestServer, #[case] upload_dir: &str, ) -> Result<(), Error> { -- cgit v1.2.3 From c1c70790de73225077f6f4b762088e2cdbf946c8 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Mon, 15 Aug 2022 20:59:37 +0200 Subject: Moved use to global --- tests/upload_files.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index a819abe..aac9978 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -1,5 +1,6 @@ mod fixtures; +use std::fs::create_dir_all; use assert_fs::fixture::TempDir; use fixtures::{server, server_no_stderr, tmpdir, Error, TestServer}; use reqwest::blocking::{multipart, Client}; @@ -125,7 +126,6 @@ fn uploading_files_to_allowed_dir_works( let test_file_name = "uploaded test file.txt"; // Create test directory - use std::fs::create_dir_all; create_dir_all(server.path().join(upload_dir)).unwrap(); // Before uploading, check whether the uploaded file does not yet exist. @@ -180,7 +180,6 @@ fn prevent_path_traversal_attacks( #[case] expected: &str, ) -> Result<(), Error> { // Create test directories - use std::fs::create_dir_all; create_dir_all(server.path().join("foo")).unwrap(); if !cfg!(windows) { for dir in &["C:/foo/C:", r"C:\foo", r"\foo"] { -- cgit v1.2.3 From 0049bb2037d8adaf0d7393069447b06eed0e0c95 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Mon, 15 Aug 2022 21:26:45 +0200 Subject: test case with two allowed dirs --- tests/upload_files.rs | 74 +++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 35 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index aac9978..cf00d47 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -117,47 +117,51 @@ fn uploading_files_is_restricted( /// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] -#[case(server(&["-u", "--allowed-upload-dir", "someDir"]), "someDir")] -#[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]), "someDir/some_sub_dir")] +#[case(server(&["-u", "--allowed-upload-dir", "someDir"]), vec!["someDir"])] +#[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir"])] +#[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir", "--allowed-upload-dir", "someDir/some_other_dir"]), + vec!["someDir/some_sub_dir", "someDir/some_other_dir"])] fn uploading_files_to_allowed_dir_works( #[case] server: TestServer, - #[case] upload_dir: &str, + #[case] upload_dirs: Vec<&str>, ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; - // Create test directory - create_dir_all(server.path().join(upload_dir)).unwrap(); - - // Before uploading, check whether the uploaded file does not yet exist. - let body = reqwest::blocking::get(server.url().join(upload_dir)?)?.error_for_status()?; - let parsed = Document::from_read(body)?; - assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); - - // Perform the actual upload. - let upload_action = parsed - .find(Attr("id", "file_submit")) - .next() - .expect("Couldn't find element with id=file_submit") - .attr("action") - .expect("Upload form doesn't have action attribute"); - let form = multipart::Form::new(); - let part = multipart::Part::text("this should be uploaded") - .file_name(test_file_name) - .mime_str("text/plain")?; - let form = form.part("file_to_upload", part); - - let client = Client::new(); - client - .post(server.url().join(upload_action)?) - .multipart(form) - .send()? - .error_for_status()?; - - // After uploading, check whether the uploaded file is now getting listed. - let body = reqwest::blocking::get(server.url().join(upload_dir)?)?; - let parsed = Document::from_read(body)?; - assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); + for upload_dir in upload_dirs{ + // Create test directory + create_dir_all(server.path().join(upload_dir)).unwrap(); + + // Before uploading, check whether the uploaded file does not yet exist. + let body = reqwest::blocking::get(server.url().join(upload_dir)?)?.error_for_status()?; + let parsed = Document::from_read(body)?; + assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); + + // Perform the actual upload. + let upload_action = parsed + .find(Attr("id", "file_submit")) + .next() + .expect("Couldn't find element with id=file_submit") + .attr("action") + .expect("Upload form doesn't have action attribute"); + let form = multipart::Form::new(); + let part = multipart::Part::text("this should be uploaded") + .file_name(test_file_name) + .mime_str("text/plain")?; + let form = form.part("file_to_upload", part); + + let client = Client::new(); + client + .post(server.url().join(upload_action)?) + .multipart(form) + .send()? + .error_for_status()?; + + // After uploading, check whether the uploaded file is now getting listed. + let body = reqwest::blocking::get(server.url().join(upload_dir)?)?; + let parsed = Document::from_read(body)?; + assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); + } Ok(()) } -- cgit v1.2.3 From 384c2b808f1ad0db28ce2ab115399e60c23a2972 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Mon, 15 Aug 2022 21:39:06 +0200 Subject: check status code when restricted; fix formatting --- tests/upload_files.rs | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index cf00d47..de96aff 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -1,12 +1,12 @@ mod fixtures; -use std::fs::create_dir_all; use assert_fs::fixture::TempDir; use fixtures::{server, server_no_stderr, tmpdir, Error, TestServer}; use reqwest::blocking::{multipart, Client}; use rstest::rstest; use select::document::Document; use select::predicate::{Attr, Text}; +use std::fs::create_dir_all; #[rstest] fn uploading_files_works(#[with(&["-u"])] server: TestServer) -> Result<(), Error> { @@ -81,14 +81,12 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { Ok(()) } -/// This test runs the server with --allowed-upload-dir argument and +/// This test runs the server with --allowed-upload-dir argument and /// checks that file upload to a different directory is actually prevented. #[rstest] #[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir"]))] #[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]))] -fn uploading_files_is_restricted( - #[case] server: TestServer -) -> Result<(), Error> { +fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; // Then try to upload file to root directory (which is not the --allowed-upload-dir) @@ -100,12 +98,14 @@ fn uploading_files_is_restricted( let client = Client::new(); // Ensure uploading fails and returns an error - assert!(client - .post(server.url().join("/upload?path=/")?) - .multipart(form) - .send()? - .error_for_status() - .is_err()); + assert_eq!( + 500, + client + .post(server.url().join("/upload?path=/")?) + .multipart(form) + .send()? + .status() + ); // After uploading, check whether the uploaded file is NOT getting listed. let body = reqwest::blocking::get(server.url())?; @@ -127,7 +127,7 @@ fn uploading_files_to_allowed_dir_works( ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; - for upload_dir in upload_dirs{ + for upload_dir in upload_dirs { // Create test directory create_dir_all(server.path().join(upload_dir)).unwrap(); @@ -160,12 +160,10 @@ fn uploading_files_to_allowed_dir_works( let body = reqwest::blocking::get(server.url().join(upload_dir)?)?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); - } Ok(()) } - /// Test for path traversal vulnerability (CWE-22) in both path parameter of query string and in /// file name (Content-Disposition) /// -- cgit v1.2.3 From e2ae526727e0154a1bc618971011788ee24e8748 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Mon, 15 Aug 2022 22:15:57 +0200 Subject: Use argument -u instead of --allowed-upload-dir --- tests/upload_files.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index de96aff..ca9f007 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -84,8 +84,8 @@ fn uploading_files_is_prevented(server: TestServer) -> Result<(), Error> { /// This test runs the server with --allowed-upload-dir argument and /// checks that file upload to a different directory is actually prevented. #[rstest] -#[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir"]))] -#[case(server_no_stderr(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]))] +#[case(server_no_stderr(&["-u", "someDir"]))] +#[case(server_no_stderr(&["-u", "someDir/some_sub_dir"]))] fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; @@ -117,9 +117,9 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error /// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] -#[case(server(&["-u", "--allowed-upload-dir", "someDir"]), vec!["someDir"])] -#[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir"])] -#[case(server(&["-u", "--allowed-upload-dir", "someDir/some_sub_dir", "--allowed-upload-dir", "someDir/some_other_dir"]), +#[case(server(&["-u", "someDir"]), vec!["someDir"])] +#[case(server(&["-u", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir"])] +#[case(server(&["-u", "someDir/some_sub_dir", "-u", "someDir/some_other_dir"]), vec!["someDir/some_sub_dir", "someDir/some_other_dir"])] fn uploading_files_to_allowed_dir_works( #[case] server: TestServer, -- cgit v1.2.3 From 5404e4fcb513bd8bf355e730aa37546b16164cad Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Wed, 17 Aug 2022 10:28:11 +0200 Subject: sanitize allowed upload paths for cases like ./dir --- tests/upload_files.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index ca9f007..ecb7ddf 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -118,6 +118,7 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error /// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] #[case(server(&["-u", "someDir"]), vec!["someDir"])] +#[case(server(&["-u", "./someDir"]), vec!["./someDir"])] #[case(server(&["-u", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir"])] #[case(server(&["-u", "someDir/some_sub_dir", "-u", "someDir/some_other_dir"]), vec!["someDir/some_sub_dir", "someDir/some_other_dir"])] -- cgit v1.2.3 From 092b6195423134763db638652dfb3e31b46d7277 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Wed, 17 Aug 2022 10:30:00 +0200 Subject: Test dir with starting - --- tests/upload_files.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index ecb7ddf..63374a2 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -118,7 +118,7 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error /// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] #[case(server(&["-u", "someDir"]), vec!["someDir"])] -#[case(server(&["-u", "./someDir"]), vec!["./someDir"])] +#[case(server(&["-u", "./-someDir"]), vec!["./-someDir"])] #[case(server(&["-u", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir"])] #[case(server(&["-u", "someDir/some_sub_dir", "-u", "someDir/some_other_dir"]), vec!["someDir/some_sub_dir", "someDir/some_other_dir"])] -- cgit v1.2.3 From 7e4d1cff19337bee3d2271eead46c39720682ae0 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 30 Aug 2022 17:05:47 +0200 Subject: trying to handle paths in a way that works for windows --- tests/upload_files.rs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 63374a2..d96f296 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -117,23 +117,27 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error /// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] -#[case(server(&["-u", "someDir"]), vec!["someDir"])] -#[case(server(&["-u", "./-someDir"]), vec!["./-someDir"])] -#[case(server(&["-u", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir"])] +#[case(server(&["-u", "someDir"]), vec!["someDir".to_string()])] +#[case(server(&["-u", "./-someDir"]), vec!["./-someDir".to_string()])] +#[case(server(&["-u", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir".to_string()])] #[case(server(&["-u", "someDir/some_sub_dir", "-u", "someDir/some_other_dir"]), - vec!["someDir/some_sub_dir", "someDir/some_other_dir"])] + vec!["someDir/some_sub_dir".to_string(), "someDir/some_other_dir".to_string()])] fn uploading_files_to_allowed_dir_works( #[case] server: TestServer, - #[case] upload_dirs: Vec<&str>, + #[case] mut upload_dirs: Vec, ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; + + if cfg!(target_os = "windows"){ + upload_dirs = upload_dirs.iter().map(|x| x.replace("/", "\\")).collect(); + } for upload_dir in upload_dirs { // Create test directory - create_dir_all(server.path().join(upload_dir)).unwrap(); + create_dir_all(server.path().join(upload_dir.as_str())).unwrap(); // Before uploading, check whether the uploaded file does not yet exist. - let body = reqwest::blocking::get(server.url().join(upload_dir)?)?.error_for_status()?; + let body = reqwest::blocking::get(server.url().join(upload_dir.as_str())?)?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); @@ -158,7 +162,7 @@ fn uploading_files_to_allowed_dir_works( .error_for_status()?; // After uploading, check whether the uploaded file is now getting listed. - let body = reqwest::blocking::get(server.url().join(upload_dir)?)?; + let body = reqwest::blocking::get(server.url().join(upload_dir.as_str())?)?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); } -- cgit v1.2.3 From d34b411c4052b9127ee8eb853a071be8149289c8 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Fri, 16 Sep 2022 14:55:48 +0200 Subject: Fixed formatting --- tests/upload_files.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index d96f296..13e39ef 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -127,8 +127,8 @@ fn uploading_files_to_allowed_dir_works( #[case] mut upload_dirs: Vec, ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; - - if cfg!(target_os = "windows"){ + + if cfg!(target_os = "windows") { upload_dirs = upload_dirs.iter().map(|x| x.replace("/", "\\")).collect(); } @@ -137,7 +137,8 @@ fn uploading_files_to_allowed_dir_works( create_dir_all(server.path().join(upload_dir.as_str())).unwrap(); // Before uploading, check whether the uploaded file does not yet exist. - let body = reqwest::blocking::get(server.url().join(upload_dir.as_str())?)?.error_for_status()?; + let body = + reqwest::blocking::get(server.url().join(upload_dir.as_str())?)?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); -- cgit v1.2.3 From 734f55da94c867ce37fa37af408dd4355f29d139 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Sun, 18 Sep 2022 21:15:35 +0200 Subject: Fixing (hopefully) issue with path on Windows --- tests/upload_files.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 13e39ef..3900514 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -119,19 +119,17 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error #[rstest] #[case(server(&["-u", "someDir"]), vec!["someDir".to_string()])] #[case(server(&["-u", "./-someDir"]), vec!["./-someDir".to_string()])] -#[case(server(&["-u", "someDir/some_sub_dir"]), vec!["someDir/some_sub_dir".to_string()])] -#[case(server(&["-u", "someDir/some_sub_dir", "-u", "someDir/some_other_dir"]), +#[case(server(&["-u", if cfg!(windows) {r"someDir\some_sub_dir"} else {"someDir/some_sub_dir"}]), + vec!["someDir/some_sub_dir".to_string()])] +#[case(server(&["-u", if cfg!(windows) {r"someDir\some_sub_dir"} else {"someDir/some_sub_dir"}, + "-u", if cfg!(windows) {r"someDir\some_other_dir"} else {"someDir/some_other_dir"}]), vec!["someDir/some_sub_dir".to_string(), "someDir/some_other_dir".to_string()])] fn uploading_files_to_allowed_dir_works( #[case] server: TestServer, - #[case] mut upload_dirs: Vec, + #[case] upload_dirs: Vec, ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; - if cfg!(target_os = "windows") { - upload_dirs = upload_dirs.iter().map(|x| x.replace("/", "\\")).collect(); - } - for upload_dir in upload_dirs { // Create test directory create_dir_all(server.path().join(upload_dir.as_str())).unwrap(); -- cgit v1.2.3 From 851c8d9ad17cd905e49ed460be4f93a74fc3d59e Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Mon, 19 Sep 2022 10:22:21 +0200 Subject: Switched to using Path in test to handle windows platform. --- tests/upload_files.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 3900514..98ddc2a 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -7,6 +7,7 @@ use rstest::rstest; use select::document::Document; use select::predicate::{Attr, Text}; use std::fs::create_dir_all; +use std::path::Path; #[rstest] fn uploading_files_works(#[with(&["-u"])] server: TestServer) -> Result<(), Error> { @@ -117,26 +118,25 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error /// This tests that we can upload files to the directory specified by --allow-upload-dir #[rstest] -#[case(server(&["-u", "someDir"]), vec!["someDir".to_string()])] -#[case(server(&["-u", "./-someDir"]), vec!["./-someDir".to_string()])] -#[case(server(&["-u", if cfg!(windows) {r"someDir\some_sub_dir"} else {"someDir/some_sub_dir"}]), - vec!["someDir/some_sub_dir".to_string()])] -#[case(server(&["-u", if cfg!(windows) {r"someDir\some_sub_dir"} else {"someDir/some_sub_dir"}, - "-u", if cfg!(windows) {r"someDir\some_other_dir"} else {"someDir/some_other_dir"}]), - vec!["someDir/some_sub_dir".to_string(), "someDir/some_other_dir".to_string()])] +#[case(server(&["-u", "someDir"]), vec!["someDir"])] +#[case(server(&["-u", "./-someDir"]), vec!["./-someDir"])] +#[case(server(&["-u", Path::new("someDir/some_sub_dir").to_str().unwrap()]), + vec!["someDir/some_sub_dir"])] +#[case(server(&["-u", Path::new("someDir/some_sub_dir").to_str().unwrap(), + "-u", Path::new("someDir/some_other_dir").to_str().unwrap()]), + vec!["someDir/some_sub_dir", "someDir/some_other_dir"])] fn uploading_files_to_allowed_dir_works( #[case] server: TestServer, - #[case] upload_dirs: Vec, + #[case] upload_dirs: Vec<&str>, ) -> Result<(), Error> { let test_file_name = "uploaded test file.txt"; for upload_dir in upload_dirs { // Create test directory - create_dir_all(server.path().join(upload_dir.as_str())).unwrap(); + create_dir_all(server.path().join(Path::new(upload_dir))).unwrap(); // Before uploading, check whether the uploaded file does not yet exist. - let body = - reqwest::blocking::get(server.url().join(upload_dir.as_str())?)?.error_for_status()?; + let body = reqwest::blocking::get(server.url().join(upload_dir)?)?.error_for_status()?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).all(|x| x.text() != test_file_name)); @@ -161,7 +161,7 @@ fn uploading_files_to_allowed_dir_works( .error_for_status()?; // After uploading, check whether the uploaded file is now getting listed. - let body = reqwest::blocking::get(server.url().join(upload_dir.as_str())?)?; + let body = reqwest::blocking::get(server.url().join(upload_dir)?)?; let parsed = Document::from_read(body)?; assert!(parsed.find(Text).any(|x| x.text() == test_file_name)); } -- cgit v1.2.3 From 20a055dd82b009e94b1aa681cc4329f17e552f44 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Mon, 19 Sep 2022 16:43:50 +0200 Subject: Return 403 instead of 500 for upload errs --- tests/upload_files.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/upload_files.rs b/tests/upload_files.rs index 98ddc2a..196f3cd 100644 --- a/tests/upload_files.rs +++ b/tests/upload_files.rs @@ -100,7 +100,7 @@ fn uploading_files_is_restricted(#[case] server: TestServer) -> Result<(), Error let client = Client::new(); // Ensure uploading fails and returns an error assert_eq!( - 500, + 403, client .post(server.url().join("/upload?path=/")?) .multipart(form) -- cgit v1.2.3