the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-12-27 01:28:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1445 from S-A-L13/master

Browse source 
StartTLS for LDAP Identities plugin
This commit is contained in:
Maarten 2024-02-25 12:58:00 +01:00 committed by GitHub
commit e3830a5c3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/ldap-identities/LdapConfig.php
View file

@ -7,6 +7,7 @@ class LdapConfig
{
public const CONFIG_SERVER = "server";
public const CONFIG_PROTOCOL_VERSION = "server_version";
public const CONFIG_STARTTLS = "starttls";
public const CONFIG_BIND_USER = "bind_user";
public const CONFIG_BIND_PASSWORD = "bind_password";
@ -28,6 +29,7 @@ class LdapConfig
public $server;
public $protocol;
public $starttls;
public $bind_user;
public $bind_password;
public $user_base;
@ -48,6 +50,7 @@ class LdapConfig
$ldap = new self();
$ldap->server = trim($config->Get("plugin", self::CONFIG_SERVER));
$ldap->protocol = (int)trim($config->Get("plugin", self::CONFIG_PROTOCOL_VERSION, 3));
$ldap->starttls = (bool)trim($config->Get("plugin", self::CONFIG_STARTTLS));
$ldap->bind_user = trim($config->Get("plugin", self::CONFIG_BIND_USER));
$ldap->bind_password = trim($config->Get("plugin", self::CONFIG_BIND_PASSWORD));
$ldap->user_base = trim($config->Get("plugin", self::CONFIG_USER_BASE));

9
plugins/ldap-identities/LdapIdentities.php
View file

@ -178,6 +178,15 @@ class LdapIdentities implements IIdentities
return false;
}
// Activate StartTLS
if ($this->config->starttls) {
$starttlsResult = ldap_start_tls($ldap);
if (!$starttlsResult) {
$this->ldapAvailable = false;
return false;
}
}
$this->ldap = $ldap;
$this->ldapConnected = true;
return true;

10
plugins/ldap-identities/index.php
View file

@ -8,10 +8,10 @@ class LdapIdentitiesPlugin extends AbstractPlugin
{
const
NAME = 'LDAP Identities',
VERSION = '2.1',
VERSION = '2.2',
AUTHOR = 'FWest98',
URL = 'https://github.com/FWest98',
RELEASE = '2022-11-09',
RELEASE = '2024-02-22',
REQUIRED = '2.20.0',
CATEGORY = 'Accounts',
DESCRIPTION = 'Adds functionality to import account identities from LDAP.';
@ -57,6 +57,12 @@ class LdapIdentitiesPlugin extends AbstractPlugin
->SetLabel("LDAP Protocol Version")
->SetType(PluginPropertyType::SELECTION)
->SetDefaultValue([2, 3]),
Property::NewInstance(LdapConfig::CONFIG_STARTTLS)
->SetLabel("Use StartTLS")
->SetType(PluginPropertyType::BOOL)
->SetDescription("Whether or not to use TLS encrypted connection")
->SetDefaultValue(true),
Property::NewInstance(LdapConfig::CONFIG_BIND_USER)
->SetLabel("Bind User DN")