Release 0.3.0

[voter] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 528a2301c04a44ba486551cb4e5568ff3e117075..92937e58ff6f9b73a313d554432f695083b99161 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,9 @@
+// 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 rand::prelude::*;
 use std::collections::{HashMap, HashSet};
 use std::io::prelude::*;


@@ -12,7 +18,7 @@ fn validate_path(path: &str) -> Result<PathBuf, cgi::Response> {
     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 == "/" {
         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();
         return Err(invalid_path());
     }
     let dir = Path::new(&format!("{DATA_PATH}{path}")).to_path_buf();


@@ -34,7 +40,7 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> {
     let cookie = request
         .headers()
         .get(cgi::http::header::COOKIE)
     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"))?;
         .and_then(|c| c.strip_prefix(COOKIE_NAME))
         .and_then(|c| c.strip_prefix(b"="))
         .ok_or_else(|| cgi::text_response(400, "Invalid cookie"))?;


@@ -45,39 +51,53 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> {
     }
 }
 
     }
 }
 

-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();
     let mut tally: HashMap<String, HashSet<String>> = HashMap::new();

-    let 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 read_elim_list(dir: &Path) -> std::io::Result<HashSet<String>> {
+    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];
 }
 
 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
         }
     }
     id


@@ -91,7 +111,7 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result<cgi::Response,
                 COOKIE_NAME,
                 b"=",
                 &make_random_id(),
                 COOKIE_NAME,
                 b"=",
                 &make_random_id(),

-                b"; Secure HttpOnly SameSite=Strict Max-Age=30000000 Path=",
+                b"; Secure; HttpOnly; SameSite=Strict; Max-Age=30000000; Path=",

                 path.as_bytes(),
             ]
             .concat(),
                 path.as_bytes(),
             ]
             .concat(),


@@ -109,6 +129,7 @@ const HTML_HEADER: &str = "<!DOCTYPE html>
     <style>
       th { font-size: 70%; text-align: left }
       input { transform: scale(1.5) }
     <style>
       th { font-size: 70%; text-align: left }
       input { transform: scale(1.5) }

+      .eliminated { text-decoration: line-through; }

       div { animation: 2s infinite linear spin }
       @keyframes spin {
         from { transform:rotate(0) }
       div { animation: 2s infinite linear spin }
       @keyframes spin {
         from { transform:rotate(0) }


@@ -118,6 +139,8 @@ const HTML_HEADER: &str = "<!DOCTYPE html>
     <script>
       window.onload = function() {
         for (cb of document.getElementsByTagName('input')) {
     <script>
       window.onload = function() {
         for (cb of document.getElementsByTagName('input')) {

+          if (cb.parentElement.parentElement.classList.contains('eliminated'))
+            continue;

           cb.addEventListener('click', (function(cb) {
             return function() {
               cb.style.display = 'none'
           cb.addEventListener('click', (function(cb) {
             return function() {
               cb.style.display = 'none'


@@ -144,14 +167,37 @@ const HTML_HEADER: &str = "<!DOCTYPE html>
           cb.disabled = false
         }
       }
           cb.disabled = false
         }
       }

+      function num_cmp(a, b) {
+        return parseInt(b.textContent) - parseInt(a.textContent)
+      }
+      function str_cmp(a, b) {
+        if (a.textContent < b.textContent) return -1
+        if (a.textContent > b.textContent) return 1
+        return 0
+      }
+      function checked_cmp(a, b) {
+        vs = [a, b].map(x => {
+          const v = x.children[0].checked + 0
+          return isNaN(v) ? -1 : v
+        })
+        return vs[1] - vs[0]
+      }
+      function sort_table(col, cmp) {
+        const rows = Array.from(document.getElementsByTagName('tr'))
+        rows.shift()
+        rows.sort((a, b) => cmp(a.children[col], b.children[col]))
+        for (row of rows) {
+          row.parentElement.appendChild(row)
+        }
+      }

     </script>
   </head>
   <body>
     <table>
       <tr>
     </script>
   </head>
   <body>
     <table>
       <tr>

-        <th>Count</th>
-        <th>Vote</th>
-        <th>Candidate</th>
+        <th onclick='sort_table(0, num_cmp)'>Count</th>
+        <th onclick='sort_table(1, checked_cmp)'>Vote</th>
+        <th onclick='sort_table(2, str_cmp)'>Candidate</th>

       </tr>";
 const HTML_FOOTER: &str = "
     </table>
       </tr>";
 const HTML_FOOTER: &str = "
     </table>


@@ -161,19 +207,19 @@ const HTML_FOOTER: &str = "
 fn supports(tally: &HashMap<String, HashSet<String>>, me: &str, candidate: &str) -> bool {
     tally
         .get(candidate)
 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 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 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(
     let cfile = std::fs::File::open(dir.join("candidates"))
         .map_err(|_| cgi::text_response(503, "No candidates"))?;
     let mut response = cgi::html_response(


@@ -181,17 +227,15 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result<cgi::Response,
         std::iter::once(Ok(HTML_HEADER.to_owned()))
             .chain(std::io::BufReader::new(cfile).lines().map(|rc| {
                 rc.map(|c| {
         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 {
                         ""
                     };
                         "checked"
                     } else {
                         ""
                     };

+                    let class = if elim.contains(&c) { "eliminated" } else { "" };

                     format!(
                     format!(

-                        "<tr>
+                        "<tr class=\"{class}\">

                         <td>{count}</td>
                         <td><input type=\"checkbox\" autocomplete=\"off\" {checked} disabled></td>
                         <td>{c}</td>
                         <td>{count}</td>
                         <td><input type=\"checkbox\" autocomplete=\"off\" {checked} disabled></td>
                         <td>{c}</td>


@@ -204,12 +248,12 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result<cgi::Response,
             .map_err(|_| cgi::text_response(503, "Missing candidates"))?,
     );
     if voter.is_err() {
             .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)
 }
 
     }
     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()
     let datum = [voter, b" ", vote, b"\n"].concat();
     let vpath = dir.join("votes");
     let vfile = std::fs::File::options()


@@ -217,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);
         .create(true)
         .open(vpath)?;
     let mut vlock = fd_lock::RwLock::new(vfile);

-    vlock.write()?.write(&datum)?;
+    vlock.write()?.write_all(&datum)?;

     Ok(())
 }
 
     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
     let body = request.body();
     // Valid votes look like "0 foo" or "1 bar"
     if body.len() < 3


@@ -231,7 +275,14 @@ fn record_vote(dir: PathBuf, request: cgi::Request) -> Result<cgi::Response, cgi
     {
         return Err(cgi::text_response(415, "Invalid vote"));
     }
     {
         return Err(cgi::text_response(415, "Invalid vote"));
     }

-    write_vote(dir, &get_voter(&request)?, body)
+    let elim =
+        read_elim_list(dir).map_err(|_| cgi::text_response(503, "Couldn't read eliminations"))?;
+    if elim.contains(
+        std::str::from_utf8(&body[2..]).map_err(|_| cgi::text_response(415, "Vote not UTF-8"))?,
+    ) {
+        return Err(cgi::text_response(403, "Candidate eliminated"));
+    }
+    write_vote(dir, get_voter(request)?, body)

         .map_err(|_| cgi::text_response(503, "Couldn't record vote"))?;
     Ok(cgi::text_response(200, "Vote recorded"))
 }
         .map_err(|_| cgi::text_response(503, "Couldn't record vote"))?;
     Ok(cgi::text_response(200, "Vote recorded"))
 }


@@ -241,18 +292,18 @@ fn strip_body(mut response: cgi::Response) -> cgi::Response {
     response
 }
 
     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())?;
     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 {
         _ => 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,
     }
         Ok(result) => result,
         Err(error) => error,
     }