X-Git-Url: http://git.scottworley.com/voter/blobdiff_plain/dd0a124698a0ded987f7b5b426607308b0e79ffc..9e49b3f023b0f20c38098e83ec711ad07b6c976c:/src/main.rs diff --git a/src/main.rs b/src/main.rs index 273a719..a1ec8bc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ use std::path::{Path, PathBuf}; const DATA_PATH: &str = "/var/lib/voter"; const COOKIE_NAME: &[u8] = b"__Secure-id"; -const COOKIE_LENGTH: usize = 32; +const COOKIE_LENGTH: usize = 12; fn validate_path(path: &str) -> Result { let invalid_path = || cgi::text_response(404, "Invalid path"); @@ -45,14 +45,16 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> { } fn make_random_id() -> [u8; COOKIE_LENGTH] { - std::iter::from_fn(random) - .filter(|c| { - (b'A'..=b'Z').contains(c) || (b'a'..=b'z').contains(c) || (b'0'..=b'9').contains(c) - }) - .take(COOKIE_LENGTH) - .collect::>() - .try_into() - .unwrap() + let mut id = [0; COOKIE_LENGTH]; + for i in 0..COOKIE_LENGTH { + while !(b'A'..=b'Z').contains(&id[i]) + && !(b'a'..=b'z').contains(&id[i]) + && !(b'0'..=b'9').contains(&id[i]) + { + id[i] = random() + } + } + id } fn set_cookie(mut response: cgi::Response, path: &str) -> Result { @@ -73,9 +75,35 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result Result { let voter = get_voter(&request); - let mut response = cgi::html_response(200, "You should vote"); + let cfile = std::fs::File::open(dir.join("candidates")) + .map_err(|_| cgi::text_response(503, "No candidates"))?; + let mut response = cgi::html_response( + 200, + std::iter::once(Ok(HTML_HEADER.to_owned())) + .chain(std::io::BufReader::new(cfile).lines().map(|rc| { + rc.map(|c| format!("{c}")) + })) + .chain(std::iter::once(Ok(HTML_FOOTER.to_owned()))) + .collect::>() + .map_err(|_| cgi::text_response(503, "Missing candidates"))?, + ); if voter.is_err() { response = set_cookie(response, request.uri().path())? }