blizzardfinnegan/seymourLifeRust
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 7 Packages Wiki Activity Actions

Add proper password prompt parsing functionality
All checks were successful
Basic Cargo Checks / docker-check (push) Successful in 50s
Details
Basic Cargo Checks / docker-build (push) Successful in 3m57s
Details

Browse source
This commit is contained in:
Blizzard Finnegan 2023-06-14 10:14:04 -04:00
parent fe7cd6d510
commit 714c198f54
Signed by: blizzardfinnegan
GPG key ID: 61C1E13067E0018E
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/device.rs
View file

@ -5,7 +5,6 @@ use rppal::gpio::{Gpio,OutputPin};
const BP_RUN_1:Duration = Duration::from_secs(29); const BP_RUN_1:Duration = Duration::from_secs(29);
const TEMP_WAIT:Duration = Duration::from_secs(3); const TEMP_WAIT:Duration = Duration::from_secs(3);
const BP_RUN_2:Duration = Duration::from_secs(28); const BP_RUN_2:Duration = Duration::from_secs(28);
const LOGIN_WAIT:Duration = Duration::from_secs(1);
const REBOOTS_SECTION: &str = "Reboots: "; const REBOOTS_SECTION: &str = "Reboots: ";
const BP_SECTION: &str = "Successful BP tests: "; const BP_SECTION: &str = "Successful BP tests: ";
const TEMP_SECTION: &str = "Successful temp tests: "; const TEMP_SECTION: &str = "Successful temp tests: ";
@ -165,14 +164,13 @@ impl Device{
}, },
State::LoginPrompt => { State::LoginPrompt => {
self.usb_tty.write_to_device(Command::Login); self.usb_tty.write_to_device(Command::Login);
thread::sleep(LOGIN_WAIT);
_ = self.usb_tty.read_from_device(None); _ = self.usb_tty.read_from_device(None);
self.usb_tty.write_to_device(Command::DebugMenu); self.usb_tty.write_to_device(Command::DebugMenu);
_ = self.usb_tty.read_from_device(None); _ = self.usb_tty.read_from_device(None);
self.current_state = State::DebugMenu; self.current_state = State::DebugMenu;
}, },
State::Shutdown => { State::Shutdown => {
while self.usb_tty.read_from_device(None) != Response::Rebooting {} while self.usb_tty.read_from_device(None) != Response::LoginPrompt{}
self.current_state = State::LoginPrompt; self.current_state = State::LoginPrompt;
}, },
}; };
@ -196,7 +194,6 @@ impl Device{
}, },
State::LoginPrompt => { State::LoginPrompt => {
self.usb_tty.write_to_device(Command::Login); self.usb_tty.write_to_device(Command::Login);
thread::sleep(LOGIN_WAIT);
_ = self.usb_tty.read_from_device(None); _ = self.usb_tty.read_from_device(None);
self.usb_tty.write_to_device(Command::DebugMenu); self.usb_tty.write_to_device(Command::DebugMenu);
_ = self.usb_tty.read_from_device(None); _ = self.usb_tty.read_from_device(None);
@ -204,7 +201,7 @@ impl Device{
return self; return self;
}, },
State::Shutdown => { State::Shutdown => {
while self.usb_tty.read_from_device(None) != Response::Rebooting {} while self.usb_tty.read_from_device(None) != Response::LoginPrompt {}
self.current_state = State::LoginPrompt; self.current_state = State::LoginPrompt;
}, },
}; };
@ -229,14 +226,13 @@ impl Device{
}, },
State::LoginPrompt => { State::LoginPrompt => {
self.usb_tty.write_to_device(Command::Login); self.usb_tty.write_to_device(Command::Login);
thread::sleep(LOGIN_WAIT);
_ = self.usb_tty.read_from_device(None); _ = self.usb_tty.read_from_device(None);
self.usb_tty.write_to_device(Command::DebugMenu); self.usb_tty.write_to_device(Command::DebugMenu);
_ = self.usb_tty.read_from_device(None); _ = self.usb_tty.read_from_device(None);
self.current_state = State::DebugMenu; self.current_state = State::DebugMenu;
}, },
State::Shutdown => { State::Shutdown => {
while self.usb_tty.read_from_device(None) != Response::Rebooting {} while self.usb_tty.read_from_device(None) != Response::LoginPrompt {}
self.current_state = State::LoginPrompt; self.current_state = State::LoginPrompt;
}, },
}; };

6
src/tty.rs
View file

@ -111,6 +111,7 @@ impl TTY{
log::debug!("writing {:?} to tty {}...", command, self.tty.name().unwrap_or("unknown".to_string())); log::debug!("writing {:?} to tty {}...", command, self.tty.name().unwrap_or("unknown".to_string()));
let output = self.tty.write_all(COMMAND_MAP.get(&command).unwrap().as_bytes()).is_ok(); let output = self.tty.write_all(COMMAND_MAP.get(&command).unwrap().as_bytes()).is_ok();
_ = self.tty.flush(); _ = self.tty.flush();
if command == Command::Login { std::thread::sleep(std::time::Duration::from_secs(2)); }
std::thread::sleep(std::time::Duration::from_millis(500)); std::thread::sleep(std::time::Duration::from_millis(500));
return output; return output;
} }
@ -141,6 +142,11 @@ impl TTY{
} }
} }
} }
else if enum_value == Response::PasswordPrompt {
log::error!("Recieved password prompt on device {}! Something fell apart here. Check preceeding log lines.",self.tty.name().unwrap_or("unknown shell".to_string()));
self.write_to_device(Command::Newline);
_ = self.read_from_device(None);
}
else{ else{
return enum_value; return enum_value;
} }