Skip to content

WIP: Default to STARTTLS #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sophie-h wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Default to STARTTLS #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/imap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,19 @@ public function checkPassword($uid, $password) {
$groups[] = $pieces[1];
}

$protocol = ($this->sslmode === "ssl") ? "imaps" : "imap";
$url = "{$protocol}://{$this->mailbox}:{$this->port}";
$ch = curl_init();
if ($this->sslmode === 'tls') {
Copy link
Member

@violoncelloCH violoncelloCH Apr 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe a simpler solution: how about just changing this line to include everything expect:

  • explicit ssl (and also TRUE),
  • explicit nossl, notls, maybe "empty string" (and also FALSE)
    so everything else (including tls) would be handled as STARTTLS...
    what do you think?

curl_setopt($ch, CURLOPT_USE_SSL, CURLUSESSL_ALL);

if ($this->sslmode !== 'tls') {
Copy link
Member

@violoncelloCH violoncelloCH Apr 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't people with tls set use STARTTLS by default? - this would exclude them, right?

$protocol = 'imaps';
// Use STARTTLS as default encryption mode
if ($this->sslmode) {
curl_setopt($ch, CURLOPT_USE_SSL, CURLUSESSL_ALL);
}
} else {
$protocol = 'imaps';
Copy link
Member

@violoncelloCH violoncelloCH Apr 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you set the $protocol two times to imaps but for starttls (and insecure connections) we would need imap, right?

}

$url = "{$protocol}://{$this->mailbox}:{$this->port}";
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_USERPWD, $username.":".$password);
Expand Down