X-Git-Url: http://git.scottworley.com/voter/blobdiff_plain/9d82c13f6abc03482d4c669aa6c89a8c570fad49..5ee4072bf723ad5b091bcf8e5869382fed9f00ba:/src/main.rs diff --git a/src/main.rs b/src/main.rs index bd329fa..92937e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,11 @@ +// voter: A simple CGI vote recorder, approval-voting-style +// +// This program is free software: you can redistribute it and/or modify it +// under the terms of the GNU Affero General Public License as published +// by the Free Software Foundation, version 3. + use rand::prelude::*; +use std::collections::{HashMap, HashSet}; use std::io::prelude::*; use std::path::{Path, PathBuf}; @@ -11,7 +18,7 @@ fn validate_path(path: &str) -> Result { if path == "/" { return Err(cgi::text_response(404, "(This is the voting place. You should have been given a more specific URL for the specific thing you've been invited to vote on.)")); } - if path.contains("..") || !path.starts_with("/") { + if path.contains("..") || !path.starts_with('/') { return Err(invalid_path()); } let dir = Path::new(&format!("{DATA_PATH}{path}")).to_path_buf(); @@ -33,7 +40,7 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> { let cookie = request .headers() .get(cgi::http::header::COOKIE) - .map(|c| c.as_bytes()) + .map(cgi::http::HeaderValue::as_bytes) .and_then(|c| c.strip_prefix(COOKIE_NAME)) .and_then(|c| c.strip_prefix(b"=")) .ok_or_else(|| cgi::text_response(400, "Invalid cookie"))?; @@ -44,14 +51,53 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> { } } +fn tally_votes(dir: &Path) -> std::io::Result>> { + let mut tally: HashMap> = HashMap::new(); + match std::fs::File::open(dir.to_owned().join("votes")) { + Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(tally), + Err(e) => Err(e), + Ok(vfile) => { + for liner in std::io::BufReader::new(vfile).lines() { + let line = liner?; + if let Some((voter, datum)) = line.split_once(' ') { + if voter.len() == COOKIE_LENGTH { + if let Some((vote, candidate)) = datum.split_once(' ') { + if vote == "0" { + if let Some(entry) = tally.get_mut(candidate) { + entry.remove(voter); + } + } else if vote == "1" { + tally + .entry(candidate.to_owned()) + .or_default() + .insert(voter.to_owned()); + } + } + } + } + } + Ok(tally) + } + } +} + +fn read_elim_list(dir: &Path) -> std::io::Result> { + match std::fs::File::open(dir.join("eliminated")) { + Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(HashSet::new()), + Err(e) => Err(e), + Ok(elimfile) => std::io::BufReader::new(elimfile).lines().collect(), + } +} + +fn valid_id_char(c: u8) -> bool { + c.is_ascii_alphanumeric() +} + fn make_random_id() -> [u8; COOKIE_LENGTH] { 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() + for c in &mut id { + while !valid_id_char(*c) { + *c = random(); } } id @@ -65,7 +111,7 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result Vote! - "; +
+ + + + + "; const HTML_FOOTER: &str = "
CountVoteCandidate
"; -fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result { - let voter = get_voter(&request); +fn supports(tally: &HashMap>, me: &str, candidate: &str) -> bool { + tally + .get(candidate) + .map_or(false, |supporters| supporters.contains(me)) +} + +fn prompt_for_vote(dir: &Path, request: &cgi::Request) -> Result { + let voter = get_voter(request); + let me = if let Ok(id) = voter { + std::str::from_utf8(id).ok() + } else { + None + }; + let tally = tally_votes(dir).map_err(|_| cgi::text_response(503, "Couldn't tally votes"))?; + let elim = + read_elim_list(dir).map_err(|_| cgi::text_response(503, "Couldn't read eliminations"))?; let cfile = std::fs::File::open(dir.join("candidates")) .map_err(|_| cgi::text_response(503, "No candidates"))?; let mut response = cgi::html_response( @@ -107,7 +227,20 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result{c}") + let count = tally.get(&c).map_or(0, std::collections::HashSet::len); + let checked = if me.map_or(false, |me| supports(&tally, me, &c)) { + "checked" + } else { + "" + }; + let class = if elim.contains(&c) { "eliminated" } else { "" }; + format!( + " + {count} + + {c} + " + ) }) })) .chain(std::iter::once(Ok(HTML_FOOTER.to_owned()))) @@ -115,12 +248,12 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result std::io::Result<()> { +fn write_vote(dir: &Path, voter: &[u8], vote: &[u8]) -> std::io::Result<()> { let datum = [voter, b" ", vote, b"\n"].concat(); let vpath = dir.join("votes"); let vfile = std::fs::File::options() @@ -128,11 +261,11 @@ fn write_vote(dir: PathBuf, voter: &[u8], vote: &[u8]) -> std::io::Result<()> { .create(true) .open(vpath)?; let mut vlock = fd_lock::RwLock::new(vfile); - vlock.write()?.write(&datum)?; + vlock.write()?.write_all(&datum)?; Ok(()) } -fn record_vote(dir: PathBuf, request: cgi::Request) -> Result { +fn record_vote(dir: &Path, request: &cgi::Request) -> Result { let body = request.body(); // Valid votes look like "0 foo" or "1 bar" if body.len() < 3 @@ -142,7 +275,14 @@ fn record_vote(dir: PathBuf, request: cgi::Request) -> Result cgi::Response { response } -fn respond(request: cgi::Request) -> Result { +fn respond(request: &cgi::Request) -> Result { let dir = validate_path(request.uri().path())?; - match request.method() { - &cgi::http::Method::HEAD => prompt_for_vote(dir, request).map(strip_body), - &cgi::http::Method::GET => prompt_for_vote(dir, request), - &cgi::http::Method::PUT => record_vote(dir, request), + match *request.method() { + cgi::http::Method::HEAD => prompt_for_vote(&dir, request).map(strip_body), + cgi::http::Method::GET => prompt_for_vote(&dir, request), + cgi::http::Method::PUT => record_vote(&dir, request), _ => Err(cgi::text_response(405, "Huh?")), } } fn respond_or_report_error(request: cgi::Request) -> cgi::Response { - match respond(request) { + match respond(&request) { Ok(result) => result, Err(error) => error, }