Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

multiple ldap server update

Browse Source
This commit is contained in:
Khazhinov Vladislav 2022-09-30 09:52:12 +03:00
parent 4bacc45fb7
commit 965258baf5
2 changed files with 69 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example.complete
View File

@ -207,7 +207,6 @@ TWITTER_AUTO_CONFIRM_EMAIL=false
# LDAP authentication configuration # LDAP authentication configuration
# Refer to https://www.bookstackapp.com/docs/admin/ldap-auth/ # Refer to https://www.bookstackapp.com/docs/admin/ldap-auth/
# If you need to use multiple addresses, separate them with a semicolon. Ex: dc1.domain.local:389;dc2.domain.local:389
LDAP_SERVER=false LDAP_SERVER=false
LDAP_BASE_DN=false LDAP_BASE_DN=false
LDAP_DN=false LDAP_DN=false

136
app/Auth/Access/LdapService.php
View File

@ -216,92 +216,75 @@ class LdapService
$this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER); $this->ldap->setOption(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
} }
$serverDetails = $this->parseServerString($this->config['server']); $serverDetails = $this->parseEnvironmentServer($this->config['server']);
if (array_key_exists('hosts', $serverDetails)) { $this->ldapConnection = $this->prepareServerConnection($serverDetails);
$fail_counter = 0;
foreach ($serverDetails['hosts'] as $serverDetailsItem) {
try {
$ldapConnection = $this->ldap->connect($serverDetailsItem['host'], $serverDetailsItem['port']);
if ($ldapConnection === false) {
throw new LdapException(trans('errors.ldap_cannot_connect'));
}
// Set any required options
if ($this->config['version']) {
$this->ldap->setVersion($ldapConnection, $this->config['version']);
}
// Start and verify TLS if it's enabled
if ($this->config['start_tls']) {
$started = $this->ldap->startTls($ldapConnection);
if (!$started) {
throw new LdapException('Could not start TLS connection');
}
}
} catch (\Throwable $exception) {
$fail_counter++;
}
}
if ($fail_counter == count($serverDetails['hosts'])) {
throw new LdapException(trans('errors.ldap_cannot_connect'));
}
} else {
$ldapConnection = $this->ldap->connect($serverDetails['host'], $serverDetails['port']);
if ($ldapConnection === false) {
throw new LdapException(trans('errors.ldap_cannot_connect'));
}
// Set any required options
if ($this->config['version']) {
$this->ldap->setVersion($ldapConnection, $this->config['version']);
}
// Start and verify TLS if it's enabled
if ($this->config['start_tls']) {
$started = $this->ldap->startTls($ldapConnection);
if (!$started) {
throw new LdapException('Could not start TLS connection');
}
}
}
$this->ldapConnection = $ldapConnection;
return $this->ldapConnection; return $this->ldapConnection;
} }
/**
* Processes an array of received servers and returns the first working connection.
*
* @param array $serverDetails
* @return resource
* @throws LdapException
*/
protected function prepareServerConnection(array $serverDetails)
{
$lastException = null;
foreach ($serverDetails as $server) {
try {
$ldapConnection = $this->ldap->connect($server['host'], $server['port']);
if (!$ldapConnection) {
throw new LdapException(trans('errors.ldap_cannot_connect'));
}
// Set any required options
if ($this->config['version']) {
$this->ldap->setVersion($ldapConnection, $this->config['version']);
}
// Start and verify TLS if it's enabled
if ($this->config['start_tls']) {
$started = $this->ldap->startTls($ldapConnection);
if (!$started) {
throw new LdapException('Could not start TLS connection');
}
}
return $ldapConnection;
} catch (LdapException $exception) {
$lastException = $exception;
}
}
throw $lastException;
}
/**
* Parse environment variable with LDAP server and returns an array of recognized servers.
* If you need to use multiple addresses, separate them with a semicolon.
* Ex: 'ldap.example.com:8069;ldaps://ldap.example.com'
*/
protected function parseEnvironmentServer(string $environmentServer): array
{
$explodedEnvironmentServer = explode(';', $environmentServer);
$result_servers = [];
foreach ($explodedEnvironmentServer as $serverString) {
$result_servers[] = $this->parseServerString($serverString);
}
return $result_servers;
}
/** /**
* Parse a LDAP server string and return the host and port for a connection. * Parse a LDAP server string and return the host and port for a connection.
* Is flexible to formats such as 'ldap.example.com:8069' or 'ldaps://ldap.example.com'. * Is flexible to formats such as 'ldap.example.com:8069' or 'ldaps://ldap.example.com'.
* If you need to use multiple addresses, separate them with a semicolon.
* Ex: dc1.domain.local:389;dc2.domain.local:389
*/ */
protected function parseServerString(string $serverString): array protected function parseServerString(string $serverString): array
{ {
$explodedServerString = explode(';', $serverString);
if (count($explodedServerString) > 1) {
$result = ['hosts' => []];
foreach ($explodedServerString as $serverString) {
$serverNameParts = explode(':', $serverString);
// If we have a protocol just return the full string since PHP will ignore a separate port.
if ($serverNameParts[0] === 'ldaps' || $serverNameParts[0] === 'ldap') {
return ['host' => $serverString, 'port' => 389];
}
// Otherwise, extract the port out
$hostName = $serverNameParts[0];
$ldapPort = (count($serverNameParts) > 1) ? intval($serverNameParts[1]) : 389;
$result['hosts'][] = ['host' => $hostName, 'port' => $ldapPort];
}
return $result;
} else {
$serverNameParts = explode(':', $serverString); $serverNameParts = explode(':', $serverString);
// If we have a protocol just return the full string since PHP will ignore a separate port. // If we have a protocol just return the full string since PHP will ignore a separate port.
@ -315,7 +298,6 @@ class LdapService
return ['host' => $hostName, 'port' => $ldapPort]; return ['host' => $hostName, 'port' => $ldapPort];
} }
}
/** /**
* Build a filter string by injecting common variables. * Build a filter string by injecting common variables.