X-Git-Url: http://git.scottworley.com/voter/blobdiff_plain/f724d95fdf704f2480581d7de85f0198a5c049e8..a5a841dea698bd7b61a9ee04bebb3c4a83ab6f71:/src/main.rs?ds=sidebyside diff --git a/src/main.rs b/src/main.rs index 920384e..8c94be1 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,45 @@ 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 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 +103,7 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result Vote!