Read preapproved users CSV file from config

3 files changed, 10 insertions, 6 deletions

diff --git a/config.yaml b/config.yaml
index b60691a..caac122 100644
--- a/config.yaml
+++ b/config.yaml
@@ -3,6 +3,10 @@ name: mainnet
 # URL Prefix for this network
 # For example, url_prefix is "example", register at "gradecoin.xyz/example/register"
 url_prefix: ""
+# List of users who can register
+# CSV file: userID,password
+# First line is ignored
+preapproved_users: "students.csv"
 # Valid blocks should have this many transactions
 block_transaction_count: 4
 # Bonus awarded after registration
diff --git a/src/config.rs b/src/config.rs
index e6f5e0e..9fb268b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -11,6 +11,8 @@ pub struct Config {
     pub name: String,
     // URL prefix for this network, can be empty
     pub url_prefix: String,
+    // CSV file that contains the list of users who can register
+    pub preapproved_users: String,
     // Valid blocks should have this many transactions
     pub block_transaction_count: u8,
     // Inital registration bonus
diff --git a/src/db.rs b/src/db.rs
index e7fb137..2187010 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -15,8 +15,6 @@ use log::debug;
 use parking_lot::RwLock;
 use std::{collections::HashMap, fs, io, path::PathBuf, sync::Arc};
 
-const PREAPPROVED_STU_FILENAME: &str = "students.csv";
-
 #[derive(Debug, Clone, Default)]
 pub struct Db {
     pub blockchain: Arc<RwLock<Block>>,
@@ -35,7 +33,7 @@ impl Db {
         let users: HashMap<Fingerprint, User> = get_friendly_users();
 
         // Read the list of users who can register
-        let preapproved_users = read_approved_users();
+        let preapproved_users = read_approved_users(&config.preapproved_users);
 
         let mut db = Db {
             blockchain: Arc::new(RwLock::new(Block::default())),
@@ -184,14 +182,14 @@ fn get_friendly_users() -> HashMap<Fingerprint, User> {
     users
 }
 
-fn read_approved_users() -> Vec<MetuId> {
+fn read_approved_users(filename: &str) -> Vec<MetuId> {
     let mut approved_students: Vec<MetuId> = Vec::new();
-    let contents = fs::read_to_string(PREAPPROVED_STU_FILENAME).unwrap_or_else(|_| {
+    let contents = fs::read_to_string(filename).unwrap_or_else(|_| {
         panic!(
             "{}",
             format!(
                 "Expected {} in place to load preapproved students",
-                PREAPPROVED_STU_FILENAME
+                filename
             )
         )
     });