Update dependencies' versions

[voter] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 528a2301c04a44ba486551cb4e5568ff3e117075..2e5de542f4381e15ecf3646bb45f6348f6aea5e2 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();


@@ -47,21 +53,22 @@ fn get_voter(request: &cgi::Request) -> Result<&[u8], cgi::Response> {
 
 fn tally_votes(dir: PathBuf) -> std::io::Result<HashMap<String, HashSet<String>>> {
     let mut tally: HashMap<String, HashSet<String>> = HashMap::new();
 
 fn tally_votes(dir: PathBuf) -> std::io::Result<HashMap<String, HashSet<String>>> {
     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);
+    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);
+                            }
+                        } 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());

                     }
                 }
             }
                     }
                 }
             }


@@ -70,14 +77,16 @@ fn tally_votes(dir: PathBuf) -> std::io::Result<HashMap<String, HashSet<String>>
     Ok(tally)
 }
 
     Ok(tally)
 }
 

+fn valid_id_char(c: &u8) -> bool {
+    (b'A'..=b'Z').contains(c) || (b'a'..=b'z').contains(c) || (b'0'..=b'9').contains(c)
+}
+

 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])
+    for c in id.iter_mut() {
+        while !valid_id_char(c)

         {
         {

-            id[i] = random()
+            *c = random()

         }
     }
     id
         }
     }
     id


@@ -91,7 +100,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(),


@@ -144,14 +153,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>


@@ -217,7 +249,7 @@ 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(())
 }
 


@@ -231,7 +263,7 @@ 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)
+    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"))
 }


@@ -243,10 +275,10 @@ fn strip_body(mut response: cgi::Response) -> cgi::Response {
 
 fn respond(request: cgi::Request) -> Result<cgi::Response, cgi::Response> {
     let dir = validate_path(request.uri().path())?;
 
 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?")),
     }
 }
         _ => Err(cgi::text_response(405, "Huh?")),
     }
 }