Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 107 cancel scans from paused state #121

Merged
merged 21 commits into from
Nov 21, 2020
Merged

Feature 107 cancel scans from paused state #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
169d6c1
added normalize_url to utils
epi052 Nov 10, 2020
a2e13ea
added call to new scanner::initialize function
epi052 Nov 10, 2020
d0a6c61
pre master merge
epi052 Nov 12, 2020
171238b
Merge branch 'master' into FEATURE-107-cancel-scans-from-paused-state
epi052 Nov 12, 2020
b00a47e
moved functions related to scan management into their own module
epi052 Nov 12, 2020
2b73927
added pretty print of current scans
epi052 Nov 13, 2020
fd4a8d8
Merge branch 'master' into FEATURE-107-cancel-scans-from-paused-state
epi052 Nov 18, 2020
880e884
clippy and fmt
epi052 Nov 18, 2020
805f02a
incremental save; a transmitter isnt being dropped
epi052 Nov 19, 2020
1c9a42c
removed prints from tests
epi052 Nov 19, 2020
4ef95ec
Merge branch 'master' into FEATURE-107-cancel-scans-from-paused-state
epi052 Nov 20, 2020
addf867
fixed the hanging issue; cleaned up
epi052 Nov 20, 2020
1b11905
added a test for display scans
epi052 Nov 20, 2020
46a471c
added param to pause function for testability
epi052 Nov 20, 2020
f8b1857
added param to pause function for testability
epi052 Nov 20, 2020
c081808
added more tests for scan_manager
epi052 Nov 21, 2020
8eec5ce
even more tests!
epi052 Nov 21, 2020
697a1cf
added spinner back in; updated comments with what to change for 107 f…
epi052 Nov 21, 2020
582ce9e
bumped version to 1.6.3
epi052 Nov 21, 2020
df19c63
fixed up getting the progress bar in scanner
epi052 Nov 21, 2020
3881789
removed unnecessary test
epi052 Nov 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ pub mod logger;
pub mod parser;
pub mod progress;
pub mod reporter;
pub mod scan_manager;
pub mod scanner;
pub mod utils;

use reqwest::{
header::HeaderMap,
{Response, StatusCode, Url},
};
use reqwest::{header::HeaderMap, Response, StatusCode, Url};
use std::{error, fmt};
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};

Expand Down
5 changes: 3 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use feroxbuster::{
banner,
config::{CONFIGURATION, PROGRESS_BAR, PROGRESS_PRINTER},
heuristics, logger, reporter,
scanner::{self, scan_url, PAUSE_SCAN},
scan_manager::PAUSE_SCAN,
scanner::{self, scan_url},
utils::{ferox_print, get_current_depth, module_colorizer, status_colorizer},
FeroxError, FeroxResponse, FeroxResult, SLEEP_DURATION, VERSION,
};
Expand Down Expand Up @@ -253,7 +254,7 @@ async fn clean_up(
save_output: bool,
) {
log::trace!(
"enter: clean_up({:?}, {:?}, {:?}, {:?}, {}",
"enter: clean_up({:?}, {:?}, {:?}, {:?}, {})",
tx_term,
term_handle,
tx_file,
Expand Down
Loading