feat: will now get the ldap data at the same time
This commit is contained in:
parent
58bf1e80fd
commit
057284712c
4 changed files with 163 additions and 160 deletions
73
src/lib.rs
73
src/lib.rs
|
@ -1,7 +1,6 @@
|
|||
pub mod methods;
|
||||
use chrono::{Datelike, SecondsFormat, Utc};
|
||||
use dotenvy::dotenv;
|
||||
use ldap3::{LdapConn, Scope, SearchEntry};
|
||||
use rand::{distributions::Alphanumeric, thread_rng, Rng};
|
||||
use sqlx::{
|
||||
sqlite::{SqliteConnectOptions, SqlitePoolOptions},
|
||||
|
@ -106,8 +105,6 @@ pub async fn db_init(config: &Config) -> Result<Pool<Sqlite>, Error> {
|
|||
.execute(&pool)
|
||||
.await?;
|
||||
|
||||
update_accounts(&pool, config).await;
|
||||
|
||||
Ok(pool)
|
||||
}
|
||||
|
||||
|
@ -199,76 +196,6 @@ pub fn get_config() -> Config {
|
|||
config
|
||||
}
|
||||
|
||||
async fn update_accounts(pool: &Pool<Sqlite>, config: &Config) {
|
||||
let mut ldap = LdapConn::new(&config.ldap_host).unwrap();
|
||||
|
||||
ldap.simple_bind(&config.ldap_admin, &config.ldap_admin_pw).unwrap().success().unwrap();
|
||||
|
||||
// use this to pre load a large chunk of data
|
||||
if let Ok(x) = ldap.search("ou=users,dc=skynet,dc=ie", Scope::OneLevel, "(objectClass=*)", vec!["uid", "uidNumber", "skDiscord", "skMemberOf", "mail", "skID", "userPassword"]) {
|
||||
if let Ok((rs, _res)) = x.success() {
|
||||
for entry in rs {
|
||||
let tmp = SearchEntry::construct(entry);
|
||||
|
||||
let mut tmp_account = Accounts {
|
||||
user: "".to_string(),
|
||||
uid: 0,
|
||||
discord: None,
|
||||
mail: "".to_string(),
|
||||
student_id: "".to_string(),
|
||||
enabled: false,
|
||||
secure: false,
|
||||
};
|
||||
|
||||
// pull out the required info
|
||||
if tmp.attrs.contains_key("uid") && !tmp.attrs["uid"].is_empty() {
|
||||
tmp_account.user = tmp.attrs["uid"][0].clone();
|
||||
}
|
||||
if tmp.attrs.contains_key("uidNumber") && !tmp.attrs["uidNumber"].is_empty() {
|
||||
tmp_account.uid = tmp.attrs["uidNumber"][0].clone().parse().unwrap_or(0);
|
||||
}
|
||||
if tmp.attrs.contains_key("skDiscord") && !tmp.attrs["skDiscord"].is_empty() {
|
||||
tmp_account.discord = Option::from(tmp.attrs["skDiscord"][0].clone());
|
||||
}
|
||||
if tmp.attrs.contains_key("mail") && !tmp.attrs["mail"].is_empty() {
|
||||
tmp_account.mail = tmp.attrs["mail"][0].clone();
|
||||
}
|
||||
if tmp.attrs.contains_key("skID") && !tmp.attrs["skID"].is_empty() {
|
||||
tmp_account.student_id = tmp.attrs["skID"][0].clone();
|
||||
}
|
||||
if tmp.attrs.contains_key("skMemberOf") && !tmp.attrs["skMemberOf"].is_empty() && tmp.attrs["skMemberOf"].contains(&String::from("cn=skynet-users-linux,ou=groups,dc=skynet,dc=ie")) {
|
||||
tmp_account.enabled = true;
|
||||
}
|
||||
if tmp.attrs.contains_key("userPassword") && !tmp.attrs["userPassword"].is_empty() {
|
||||
tmp_account.secure = tmp.attrs["userPassword"][0].starts_with("{SSHA512}")
|
||||
}
|
||||
|
||||
if !tmp_account.user.is_empty() {
|
||||
sqlx::query_as::<_, Accounts>(
|
||||
"
|
||||
INSERT OR REPLACE INTO accounts (user, uid, discord, mail, student_id, enabled, secure)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
|
||||
",
|
||||
)
|
||||
.bind(&tmp_account.user)
|
||||
.bind(tmp_account.uid)
|
||||
.bind(&tmp_account.discord)
|
||||
.bind(&tmp_account.mail)
|
||||
.bind(&tmp_account.student_id)
|
||||
.bind(tmp_account.enabled)
|
||||
.bind(tmp_account.secure)
|
||||
.fetch_optional(pool)
|
||||
.await
|
||||
.ok();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// done with ldap
|
||||
ldap.unbind().unwrap();
|
||||
}
|
||||
|
||||
// from https://rust-lang-nursery.github.io/rust-cookbook/algorithms/randomness.html#create-random-passwords-from-a-set-of-alphanumeric-characters
|
||||
pub fn random_string(len: usize) -> String {
|
||||
thread_rng().sample_iter(&Alphanumeric).take(len).map(char::from).collect()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue