feat: now able to pull data from the csv

This commit is contained in:
silver 2023-07-16 23:29:52 +01:00
parent aef7cda678
commit b9bcd5352e
4 changed files with 136 additions and 3 deletions

4
.gitignore vendored
View file

@ -9,4 +9,6 @@
# flakes # flakes
result result
/result /result
tmp.*

22
Cargo.lock generated
View file

@ -628,6 +628,27 @@ dependencies = [
"subtle", "subtle",
] ]
[[package]]
name = "csv"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086"
dependencies = [
"csv-core",
"itoa",
"ryu",
"serde",
]
[[package]]
name = "csv-core"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "ctor" name = "ctor"
version = "0.1.26" version = "0.1.26"
@ -1962,6 +1983,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"async-std", "async-std",
"chrono", "chrono",
"csv",
"dotenv", "dotenv",
"ldap3", "ldap3",
"rand 0.8.5", "rand 0.8.5",

View file

@ -31,3 +31,6 @@ rand = "0.8.5"
# fancy time stuff # fancy time stuff
chrono = "0.4.26" chrono = "0.4.26"
# handlign teh csv export from wolves
csv = "1.2"

View file

@ -1,7 +1,10 @@
use dotenv::dotenv; use dotenv::dotenv;
use ldap3::{LdapConn, Mod}; use ldap3::{LdapConn, Mod, Scope, SearchEntry};
use skynet_ldap_backend::{get_config, Config}; use skynet_ldap_backend::{get_config, Config};
use std::env; use std::{env, io};
use std::collections::{HashMap, HashSet};
use std::error::Error;
use csv;
#[async_std::main] #[async_std::main]
async fn main() -> tide::Result<()> { async fn main() -> tide::Result<()> {
@ -27,6 +30,9 @@ async fn update_users(config: &Config) -> tide::Result<()> {
} }
} }
for user in from_csv(config).await.unwrap_or_default() {
users_tmp.push(user);
}
/* /*
pull in data from wolves (csv or api (hopefully api) pull in data from wolves (csv or api (hopefully api)
pull entire ldap data pull entire ldap data
@ -125,3 +131,103 @@ async fn update_group(config: &Config, group: &str, users: &[&str], replace: boo
Ok(()) Ok(())
} }
async fn ldap_get_accounts(config: &Config) -> Result<(HashMap<String, String>, HashMap<String, String>), Box<dyn Error>>{
// connect to ldap
let mut ldap = LdapConn::new(&config.ldap_host)?;
ldap.simple_bind(&config.ldap_admin, &config.ldap_admin_pw)?.success()?;
let mut uid_idstudent: HashMap<String, String> = HashMap::new();
let mut uid_email: HashMap<String, String> = HashMap::new();
let (rs, _res) = ldap.search(
"ou=users,dc=skynet,dc=ie",
Scope::OneLevel,
"(objectClass=*)",
vec!["uid", "mail", "skID", "skSecure"]
)
.unwrap()
.success()
.unwrap();
for entry in rs {
let tmp = SearchEntry::construct(entry);
// skSecure is a standin for teh password, only 1 if the password is SSHA512
if !tmp.attrs.contains_key("skSecure"){
continue;
}
if tmp.attrs["skSecure"].is_empty() {
continue;
}
// make sure there is an id;
let uid = if !tmp.attrs["uid"].is_empty() {
tmp.attrs["uid"][0].clone()
}else {
continue;
};
if !tmp.attrs["skID"].is_empty() {
let skid = tmp.attrs["skID"][0].clone();
if &skid != "00000000" {
uid_idstudent.insert(skid, uid.clone());
}
}
if !tmp.attrs["mail"].is_empty() {
let mail = tmp.attrs["mail"][0].clone();
if &mail != "nomail@skynet.ie" {
uid_email.insert(mail, uid.clone());
}
}
}
ldap.unbind()?;
Ok((uid_idstudent, uid_email))
}
async fn from_csv(config: &Config) -> Result<HashSet<String>, Box<dyn Error>>{
let mut uids = HashSet::new();
let (uid_idstudent, uid_email) = ldap_get_accounts(config).await?;
let records = read_csv()?;
for record in records {
if let Some(uid) = uid_email.get(&record.email) {
uids.insert(uid.clone());
}
if let Some(uid) = uid_idstudent.get(&record.id_student) {
uids.insert(uid.clone());
}
}
Ok(uids)
}
#[derive(Debug, serde::Deserialize)]
struct Record {
#[serde(rename = "MemID")]
id_wolves: String,
#[serde(rename = "Student Num")]
id_student: String,
#[serde(rename = "Contact Email")]
email: String,
}
fn read_csv() -> Result<Vec<Record>, Box<dyn Error>> {
let mut records: Vec<Record> = vec![];
if let Ok(mut rdr) = csv::Reader::from_path("tmp.csv") {
for result in rdr.deserialize() {
// Notice that we need to provide a type hint for automatic
// deserialization.
let record: Record = result?;
records.push(record);
}
}
Ok(records)
}