paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed toggle ALLOW_APP_PASSWORDS_IN_EAS

master
Jürgen Kellerer 2021-10-27 09:39:34 +02:00
parent 7fdd73135b
commit d38c371253
No known key found for this signature in database
GPG Key ID: 505B87299E28CCA9
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/web/autodiscover.php
View File

@ -68,8 +68,7 @@ if (empty($_SERVER['PHP_AUTH_USER']) || empty($_SERVER['PHP_AUTH_PW'])) {
exit(0); exit(0);
} }
$allow_app_passwords = $ALLOW_APP_PASSWORDS_IN_EAS === true || $autodiscover_config['autodiscoverType'] == 'imap'; $login_role = check_login($login_user, $login_pass, true);
$login_role = check_login($login_user, $login_pass, $allow_app_passwords);
if ($login_role === "user") { if ($login_role === "user") {
header("Content-Type: application/xml"); header("Content-Type: application/xml");

3
data/web/inc/vars.inc.php
View File

@ -188,9 +188,6 @@ $MAILBOX_DEFAULT_ATTRIBUTES['mailbox_format'] = 'maildir:';
// Show last IMAP and POP3 logins // Show last IMAP and POP3 logins
$SHOW_LAST_LOGIN = true; $SHOW_LAST_LOGIN = true;
// Allow app passwords in CardDav, CalDav and ActiveSync
$ALLOW_APP_PASSWORDS_IN_EAS = true;
// UV flag handling in FIDO2/WebAuthn - defaults to false to allow iOS logins // UV flag handling in FIDO2/WebAuthn - defaults to false to allow iOS logins
// true = required // true = required
// false = preferred // false = preferred

2
data/web/sogo-auth.php
View File

@ -15,7 +15,7 @@ if (isset($_SERVER['PHP_AUTH_USER'])) {
$username = $_SERVER['PHP_AUTH_USER']; $username = $_SERVER['PHP_AUTH_USER'];
$password = $_SERVER['PHP_AUTH_PW']; $password = $_SERVER['PHP_AUTH_PW'];
$is_eas = preg_match('/^(\/SOGo|)\/(dav|Microsoft-Server-ActiveSync).*/', $_SERVER['HTTP_X_ORIGINAL_URI']); $is_eas = preg_match('/^(\/SOGo|)\/(dav|Microsoft-Server-ActiveSync).*/', $_SERVER['HTTP_X_ORIGINAL_URI']);
$login_check = check_login($username, $password, $is_eas && $ALLOW_APP_PASSWORDS_IN_EAS); $login_check = check_login($username, $password, $is_eas);
if ($login_check === 'user') { if ($login_check === 'user') {
header("X-User: $username"); header("X-User: $username");
header("X-Auth: Basic ".base64_encode("$username:$password")); header("X-Auth: Basic ".base64_encode("$username:$password"));