Skip to content

Update Ldap.php to allow LDAP over SSL/TLS connections #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssddanbrown merged 1 commit into from
Jan 14, 2017
Merged

Update Ldap.php to allow LDAP over SSL/TLS connections #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion app/Services/Ldap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ class Ldap
*/
public function connect($hostName, $port)
{
/*
* LDAPS is not working because even if port 363 is specified,
* BookStack tries to open a LDAP connection on the LDAPS channel.
* The if-clause below fixed this, although it would be better to
* change the settings in .env from
* LDAP_SERVER=servername:port
* to
* LDAP_SERVER=ldap://servername:389
* LDAP_SERVER=ldaps://servername:363
* in order to be compatible with non-standard setups. Currently,
* specifying ldap:// or ldaps:// results in an error because BookStack
* splits at ":" and takes the seconds chunk (in this case "//servername"
* as the port value.
*/
if ($port == 363)
{
$hostName = "ldaps://".$hostName;
}
return ldap_connect($hostName, $port);
}

Expand Down Expand Up @@ -94,4 +112,4 @@ public function bind($ldapConnection, $bindRdn = null, $bindPassword = null)
return ldap_bind($ldapConnection, $bindRdn, $bindPassword);
}

}
}