Use a record for se_public_keys

src/web/web_common.ml

@@ -183,12 +183,17 @@ type setup_voter = {
   mutable sv_password : (string * string) option;
 }
 
+type setup_trustee = {
+  st_token : string;
+  mutable st_public_key : string;
+}
+
 type setup_election = {
   mutable se_owner : user;
   mutable se_group : string;
   mutable se_voters : setup_voter list;
   mutable se_questions : template;
-  mutable se_public_keys : (string * string ref) list;
+  mutable se_public_keys : setup_trustee list;
   mutable se_metadata : metadata;
   mutable se_public_creds : string;
   mutable se_public_creds_received : bool;

src/web/web_common.mli

@@ -100,12 +100,17 @@ type setup_voter = {
   mutable sv_password : (string * string) option;
 }
 
+type setup_trustee = {
+  st_token : string;
+  mutable st_public_key : string;
+}
+
 type setup_election = {
   mutable se_owner : user;
   mutable se_group : string;
   mutable se_voters : setup_voter list;
   mutable se_questions : template;
-  mutable se_public_keys : (string * string ref) list;
+  mutable se_public_keys : setup_trustee list;
   mutable se_metadata : metadata;
   mutable se_public_creds : string;
   mutable se_public_creds_received : bool;

src/web/web_site.ml

@@ -121,9 +121,9 @@ let finalize_election uuid se =
     | _ :: _ ->
        return
          (List.rev_map
-            (fun (_, r) ->
-              if !r = "" then failwith "some public keys are missing";
-              trustee_public_key_of_string G.read !r
+            (fun {st_public_key; _} ->
+              if st_public_key = "" then failwith "some public keys are missing";
+              trustee_public_key_of_string G.read st_public_key
             ) se.se_public_keys, None)
   in
   let y = KG.combine (Array.of_list public_keys) in
@@ -192,8 +192,8 @@ let finalize_election uuid se =
   (* clean up setup database *)
   Ocsipersist.remove election_credtokens se.se_public_creds >>
   Lwt_list.iter_s
-    (fun (token, _) ->
-      Ocsipersist.remove election_pktokens token)
+    (fun {st_token; _} ->
+      Ocsipersist.remove election_pktokens st_token)
     se.se_public_keys >>
   Ocsipersist.remove election_stable uuid_s >>
   (* inject passwords *)
@@ -666,10 +666,11 @@ let () =
           lwt se = Ocsipersist.find election_stable uuid_s in
           if se.se_owner = u
           then (
-            lwt token = generate_token () in
-            se.se_public_keys <- (token, ref "") :: se.se_public_keys;
+            lwt st_token = generate_token () in
+            let trustee = {st_token; st_public_key = ""} in
+            se.se_public_keys <- trustee :: se.se_public_keys;
             Ocsipersist.add election_stable uuid_s se >>
-            Ocsipersist.add election_pktokens token uuid_s
+            Ocsipersist.add election_pktokens st_token uuid_s
           ) else forbidden ()
         ) >>
         return (preapply election_setup_trustees uuid)
@@ -688,10 +689,10 @@ let () =
           if se.se_owner = u
           then (
             match se.se_public_keys with
-            | (token, _) :: xs ->
+            | {st_token; _} :: xs ->
                se.se_public_keys <- xs;
                Ocsipersist.add election_stable uuid_s se >>
-               Ocsipersist.remove election_pktokens token
+               Ocsipersist.remove election_pktokens st_token
             | _ -> return ()
           ) else forbidden ()
         ) >>
@@ -899,13 +900,13 @@ let () =
           election_setup_mutex
           (fun () ->
            lwt se = Ocsipersist.find election_stable uuid in
-           let pkref = List.assoc token se.se_public_keys in
+           let t = List.find (fun x -> token = x.st_token) se.se_public_keys in
            let module G = (val Group.of_string se.se_group : GROUP) in
            let pk = trustee_public_key_of_string G.read public_key in
            let module KG = Election.MakeSimpleDistKeyGen (G) (LwtRandom) in
            if not (KG.check pk) then failwith "invalid public key";
            (* we keep pk as a string because of G.t *)
-           pkref := public_key;
+           t.st_public_key <- public_key;
            Ocsipersist.add election_stable uuid se
           ) >> T.generic_page ~title:"Success"
             "Your key has been received and checked!"

src/web/web_templates.ml

@@ -493,14 +493,14 @@ let election_setup_trustees uuid se () =
       br ();
       ol
         (List.rev_map
-           (fun (token, _) ->
+           (fun {st_token; _} ->
              li [
                a ~service:election_setup_trustee [
                  pcdata @@ rewrite_prefix @@ Eliom_uri.make_string_uri
                    ~absolute:true
                    ~service:election_setup_trustee
-                   token
-               ] token
+                   st_token
+               ] st_token
              ];
            ) se.se_public_keys
         );
@@ -775,7 +775,8 @@ let election_setup_credentials token uuid se () =
 let election_setup_trustee token se () =
   let title = "Trustee for election " ^ se.se_questions.t_name in
   let form =
-    let value = !(List.assoc token se.se_public_keys) in
+    let trustee = List.find (fun x -> x.st_token = token) se.se_public_keys in
+    let value = trustee.st_public_key in
     let service = Eliom_service.preapply election_setup_trustee_post token in
     post_form
       ~service