holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport of r49425+r49431: do not return an smtp account with a password encrypted with user-credentials for async service, as it can not work

Browse Source
This commit is contained in:
Klaus Leithoff 2014-11-18 11:03:09 +00:00
parent aae7765a35
commit f1c51df068
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
emailadmin/inc/class.emailadmin_account.inc.php
View File

@ -34,6 +34,7 @@
* @property-read int $acc_imap_port imap port, default 143 or for ssl 993 * @property-read int $acc_imap_port imap port, default 143 or for ssl 993
* @property-read string $acc_imap_username * @property-read string $acc_imap_username
* @property-read string $acc_imap_password * @property-read string $acc_imap_password
* @property-read string $acc_imap_pw_enc emailadmin_credentials::(CLEARTEXT|USER|SYSTEM)
* @property-read boolean $acc_sieve_enabled sieve enabled * @property-read boolean $acc_sieve_enabled sieve enabled
* @property-read string $acc_sieve_host sieve host, default imap_host * @property-read string $acc_sieve_host sieve host, default imap_host
* @property-read int $acc_sieve_ssl 0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate * @property-read int $acc_sieve_ssl 0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate
@ -48,6 +49,7 @@
* @property-read int $acc_smtp_port smtp port * @property-read int $acc_smtp_port smtp port
* @property-read string $acc_smtp_username if smtp auth required * @property-read string $acc_smtp_username if smtp auth required
* @property-read string $acc_smtp_password * @property-read string $acc_smtp_password
* @property-read string $acc_smtp_pw_enc emailadmin_credentials::(CLEARTEXT|USER|SYSTEM)
* @property-read string $acc_smtp_type smtp class to use, default emailadmin_smtp * @property-read string $acc_smtp_type smtp class to use, default emailadmin_smtp
* @property-read string $acc_imap_type imap class to use, default emailadmin_imap * @property-read string $acc_imap_type imap class to use, default emailadmin_imap
* @property-read string $acc_imap_logintype how to construct login-name standard, vmailmgr, admin, uidNumber * @property-read string $acc_imap_logintype how to construct login-name standard, vmailmgr, admin, uidNumber
@ -1315,6 +1317,7 @@ class emailadmin_account implements ArrayAccess
*/ */
static function get_default_acc_id($smtp=false) static function get_default_acc_id($smtp=false)
{ {
//error_log(__METHOD__.__LINE__.'Smtp?'.array2string($smtp));
try try
{ {
foreach(emailadmin_account::search(true, 'params') as $acc_id => $params) foreach(emailadmin_account::search(true, 'params') as $acc_id => $params)
@ -1323,7 +1326,23 @@ class emailadmin_account implements ArrayAccess
{ {
if (!$params['acc_smtp_host'] || !$params['acc_smtp_port']) continue; if (!$params['acc_smtp_host'] || !$params['acc_smtp_port']) continue;
// check requirement of session, which is not available in async service! // check requirement of session, which is not available in async service!
if (isset($GLOBALS['egw_info']['flags']['async-service']) && $params['acc_smtp_auth_session']) continue; //error_log(__METHOD__.__LINE__.array2string($params));
//error_log(__METHOD__.__LINE__.'is async:'.array2string($GLOBALS['egw_info']['flags']['async-service']));
if (isset($GLOBALS['egw_info']['flags']['async-service']))
{
if ($params['acc_smtp_auth_session']) continue;
// may fail because of smtp only profile, or no session password, etc
try
{
$account = new emailadmin_account($params);
}
catch (Exception $x)
{
continue;
}
if ($account->acc_smtp_pw_enc == emailadmin_credentials::USER) continue;
//error_log(__METHOD__.__LINE__.array2string($account->params));
}
} }
else else
{ {

1
emailadmin/inc/class.emailadmin_credentials.inc.php
View File

@ -150,6 +150,7 @@ class emailadmin_credentials
$results[$prefix.'password'] = $password; $results[$prefix.'password'] = $password;
$results[$prefix.'cred_id'] = $row['cred_id']; $results[$prefix.'cred_id'] = $row['cred_id'];
$results[$prefix.'account_id'] = $row['account_id']; $results[$prefix.'account_id'] = $row['account_id'];
$results[$prefix.'pw_enc'] = $row['cred_pw_enc'];
} }
} }
} }