Merge branch 'master' into 'master'

Master See merge request !12

Merge branch 'master' into 'master'
Master See merge request !12
9a1cbcb1 · tec · 53c4f463 · 21f3bd95 · 9a1cbcb1 · 9a1cbcb1
Commit 9a1cbcb1 authored May 01, 2020 by tec
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2532 additions and 2 deletions

.gitignore .gitignore +0 -1

Cargo.lock Cargo.lock +2531 -0

src/ldap.rs src/ldap.rs +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
 /target/
-Cargo.lock
 **/*.rs.bk
 src/discord_token
 ucc-bot.log
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/src/ldap.rs
+++ b/src/ldap.rs
@@ -23,7 +23,7 @@ pub fn ldap_search(username: &str) -> Option<LDAPUser> {
        .search(
            "cn=Users,dc=ad,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au",
            Scope::Subtree,
-            &format!("(cn={})", username),
+            &format!("(cn={})", ldap3::ldap_escape(username)),
            vec!["when_created", "displayName", "name"],
        )
        .expect("LDAP error")