7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supporting app-passwds in cal/carddav & ActiveSync

Browse Source
This commit is contained in:
Jürgen Kellerer
2021-10-24 13:12:34 +02:00
parent 32745efd13
commit 2ac5294d55
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/web/inc/functions.inc.php
View File

@@ -807,7 +807,7 @@ function verify_hash($hash, $password) {
}
return false;
}
function check_login($user, $pass) {
function check_login($user, $pass, $allow_app_passwords = false) {
global $pdo;
global $redis;
global $imap_server;
@@ -896,6 +896,18 @@ function check_login($user, $pass) {
AND `username` = :user");
$stmt->execute(array(':user' => $user));
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
if ($allow_app_passwords === true) {
$stmt = $pdo->prepare("SELECT `app_passwd`.`password` as `password`, `app_passwd`.`id` as `app_passwd_id` FROM `app_passwd`
INNER JOIN `mailbox` ON `mailbox`.`username` = `app_passwd`.`mailbox`
INNER JOIN `domain` ON `mailbox`.`domain` = `domain`.`domain`
WHERE `mailbox`.`kind` NOT REGEXP 'location|thing|group'
AND `mailbox`.`active` = '1'
AND `domain`.`active` = '1'
AND `app_passwd`.`active` = '1'
AND `app_passwd`.`mailbox` = :user");
$stmt->execute(array(':user' => $user));
$rows = array_merge($rows, $stmt->fetchAll(PDO::FETCH_ASSOC));
}
foreach ($rows as $row) {
if (verify_hash($row['password'], $pass) !== false) {
unset($_SESSION['ldelay']);