Set-Cookie flags are ;-separated

[voter] / src / main.rs
diff --git a/src/main.rs b/src/main.rs

index 61875d6de16d412d40ef12c2129524ab438c5a58..f75557e95aa67f7bb9fc5fb98ebd8b8f67b743f6 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,21 +47,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();
-    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());
                      }
                  }
              }
@@ -91,7 +92,7 @@ fn set_cookie(mut response: cgi::Response, path: &str) -> Result<cgi::Response,
                  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(),
@@ -107,6 +108,7 @@ const HTML_HEADER: &str = "<!DOCTYPE html>
      <meta charset=\"utf-8\">
      <title>Vote!</title>
      <style>
+      th { font-size: 70%; text-align: left }
        input { transform: scale(1.5) }
        div { animation: 2s infinite linear spin }
        @keyframes spin {
@@ -129,6 +131,9 @@ const HTML_HEADER: &str = "<!DOCTYPE html>
                  cb.parentElement.removeChild(cb.previousElementSibling)
                  if (req.status == 200) {
                      cb.style.display = ''
+                    const delta = cb.checked ? 1 : -1
+                    const count_td = cb.parentElement.previousElementSibling
+                    count_td.textContent = parseInt(count_td.textContent) + delta
                  } else {
                     cb.parentElement.insertBefore(document.createTextNode('❗'), cb)
                  }
@@ -140,10 +145,38 @@ const HTML_HEADER: &str = "<!DOCTYPE html>
            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>";
+    <table>
+      <tr>
+        <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>
    </body>
@@ -172,6 +205,10 @@ 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| {
+                    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) {
                          "checked"
                      } else {
@@ -179,6 +216,7 @@ fn prompt_for_vote(dir: PathBuf, request: cgi::Request) -> Result<cgi::Response,
                      };
                      format!(
                          "<tr>
+                        <td>{count}</td>
                          <td><input type=\"checkbox\" autocomplete=\"off\" {checked} disabled></td>
                          <td>{c}</td>
                          </tr>"