r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Add dynamic selection of the TLS/SSL encryption method

This commit is contained in:
Nik 2020-10-12 22:53:54 +02:00
parent 95b822f000
commit 44dd2435ec
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bl-plugins/imap-authentication/languages/de.json
View File

@ -3,6 +3,7 @@
{ {
"name": "IMAP-Authentifizierung", "name": "IMAP-Authentifizierung",
"description": "Dieses Plugin ermöglicht die Authentifizierung von Benutzern mit Hilfe eines IMAP-Servers.", "description": "Dieses Plugin ermöglicht die Authentifizierung von Benutzern mit Hilfe eines IMAP-Servers.",
"imap-server": "IMAP Server" "imap-server": "IMAP Server",
"encryption": "Verschlüsselung"
} }
} }

3
bl-plugins/imap-authentication/languages/en.json
View File

@ -3,6 +3,7 @@
{ {
"name": "IMAP Authentication", "name": "IMAP Authentication",
"description": "This plugin enables the authentication of users, using an IMAP server.", "description": "This plugin enables the authentication of users, using an IMAP server.",
"imap-server": "IMAP Server" "imap-server": "IMAP Server",
"encryption": "Encryption"
} }
} }

19
bl-plugins/imap-authentication/plugin.php
View File

@ -3,11 +3,13 @@
class pluginImapAuthentication extends Plugin { class pluginImapAuthentication extends Plugin {
const IMAP_SERVER_DB_FIELD = 'imapServer'; const IMAP_SERVER_DB_FIELD = 'imapServer';
const IMAP_ENCRYPTION_DB_FIELD = 'imapEncryption';
public function init() public function init()
{ {
$this->dbFields = array( $this->dbFields = array(
self::IMAP_SERVER_DB_FIELD=>'', self::IMAP_SERVER_DB_FIELD=>'',
self::IMAP_ENCRYPTION_DB_FIELD=>'ssl',
); );
} }
@ -24,6 +26,14 @@ class pluginImapAuthentication extends Plugin {
$html .= '<input name="imapServer" id="imapServer" type="text" value="'.$this->getValue(self::IMAP_SERVER_DB_FIELD).'">'; $html .= '<input name="imapServer" id="imapServer" type="text" value="'.$this->getValue(self::IMAP_SERVER_DB_FIELD).'">';
$html .= '</div>'; $html .= '</div>';
$html .= '<div>';
$html .= '<label>'.$L->get('Encryption').'</label>';
$html .= '<select name="imapEncryption" id="imapEncryption">';
$html .= '<option value="ssl" '.('ssl' === $this->getValue(self::IMAP_ENCRYPTION_DB_FIELD) ? 'selected' : ''). '>SSL</option>';
$html .= '<option value="tls" '.('tls' === $this->getValue(self::IMAP_ENCRYPTION_DB_FIELD) ? 'selected' : ''). '>TLS</option>';
$html .= '</select>';
$html .= '</div>';
return $html; return $html;
} }
@ -58,7 +68,7 @@ class pluginImapAuthentication extends Plugin {
$username = $_POST['username']; $username = $_POST['username'];
$password = $_POST['password']; $password = $_POST['password'];
if (!$this->authenticateUser($this->getValue(self::IMAP_SERVER_DB_FIELD), $username, $password)) { if (!$this->authenticateUser($this->getValue(self::IMAP_SERVER_DB_FIELD), $this->getValue(self::IMAP_ENCRYPTION_DB_FIELD), $username, $password)) {
return; return;
} }
@ -71,11 +81,12 @@ class pluginImapAuthentication extends Plugin {
/** /**
* @param $mailbox * @param $mailbox
* @param $encryption
* @param $username User's mail address * @param $username User's mail address
* @param $password * @param $password
* @return bool * @return bool
*/ */
private function authenticateUser($mailbox, $username, $password) private function authenticateUser($mailbox, $encryption, $username, $password)
{ {
if (!function_exists('imap_open')) { if (!function_exists('imap_open')) {
Log::set(__METHOD__.LOG_SEP.'ERROR: PHP imap extension is not installed'); Log::set(__METHOD__.LOG_SEP.'ERROR: PHP imap extension is not installed');
@ -87,7 +98,7 @@ class pluginImapAuthentication extends Plugin {
$username = str_replace("%40","@",$username); $username = str_replace("%40","@",$username);
} }
$imapConnection = @imap_open("{{$mailbox}/imap/tls}INBOX", $username, $password, OP_HALFOPEN, 1); $imapConnection = @imap_open("{{$mailbox}/imap/{$encryption}}INBOX", $username, $password, OP_HALFOPEN, 1);
$imapErrors = imap_errors(); $imapErrors = imap_errors();
$imapAlerts = imap_alerts(); $imapAlerts = imap_alerts();
if (!empty($imapErrors)) { if (!empty($imapErrors)) {
@ -114,7 +125,7 @@ class pluginImapAuthentication extends Plugin {
{ {
global $users; global $users;
if (!$this->authenticateUser($this->getValue(self::IMAP_SERVER_DB_FIELD), $username, $password)) { if (!$this->authenticateUser($this->getValue(self::IMAP_SERVER_DB_FIELD), $this->getValue(self::IMAP_ENCRYPTION_DB_FIELD), $username, $password)) {
return; return;
} }