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();
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"))?;
}
}
-fn tally_votes(dir: PathBuf) -> std::io::Result<HashMap<String, HashSet<String>>> {
+fn tally_votes(dir: &Path) -> std::io::Result<HashMap<String, HashSet<String>>> {
let mut tally: HashMap<String, HashSet<String>> = HashMap::new();
- if let Ok(vfile) = std::fs::File::open(dir.join("votes")) {
- 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);
+ 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());
}
- } else if vote == "1" {
- tally
- .entry(candidate.to_owned())
- .or_default()
- .insert(voter.to_owned());
}
}
}
}
+ Ok(tally)
}
}
- 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
fn supports(tally: &HashMap<String, HashSet<String>>, me: &str, candidate: &str) -> bool {
tally
.get(candidate)
- .map(|supporters| supporters.contains(me))
- .unwrap_or(false)
+ .map_or(false, |supporters| supporters.contains(me))
}
-fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result<cgi::Response, cgi::Response> {
- let voter = get_voter(&request);
+fn prompt_for_vote(dir: &Path, request: &cgi::Request) -> Result<cgi::Response, cgi::Response> {
+ 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.clone()).map_err(|_| cgi::text_response(503, "Couldn't tally votes"))?;
+ let tally = tally_votes(dir).map_err(|_| cgi::text_response(503, "Couldn't tally votes"))?;
let cfile = std::fs::File::open(dir.join("candidates"))
.map_err(|_| cgi::text_response(503, "No candidates"))?;
let mut response = cgi::html_response(
std::iter::once(Ok(HTML_HEADER.to_owned()))
.chain(std::io::BufReader::new(cfile).lines().map(|rc| {
rc.map(|c| {
- let count = tally
- .get(&c)
- .map(|supporters| supporters.len())
- .unwrap_or(0);
- let checked = if me.map(|me| supports(&tally, me, &c)).unwrap_or(false) {
+ 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 {
""
.map_err(|_| cgi::text_response(503, "Missing candidates"))?,
);
if voter.is_err() {
- response = set_cookie(response, request.uri().path())?
+ response = set_cookie(response, request.uri().path())?;
}
Ok(response)
}
-fn write_vote(dir: PathBuf, voter: &[u8], vote: &[u8]) -> 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()
.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<cgi::Response, cgi::Response> {
+fn record_vote(dir: &Path, request: &cgi::Request) -> Result<cgi::Response, cgi::Response> {
let body = request.body();
// Valid votes look like "0 foo" or "1 bar"
if body.len() < 3
{
return Err(cgi::text_response(415, "Invalid vote"));
}
- write_vote(dir, &get_voter(&request)?, body)
+ write_vote(dir, get_voter(request)?, body)
.map_err(|_| cgi::text_response(503, "Couldn't record vote"))?;
Ok(cgi::text_response(200, "Vote recorded"))
}
response
}
-fn respond(request: cgi::Request) -> Result<cgi::Response, cgi::Response> {
+fn respond(request: &cgi::Request) -> Result<cgi::Response, cgi::Response> {
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,
}
projects / voter / blobdiff