Skip to content

fix(module/config): read postgres byte streams before decryption #1772

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(module/config): read postgres byte streams before decryption #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db26e7e
smtp: honor STARTTLS setting instead of forcing implicit TLS
Nov 2, 2025
30d10b4
fix(module/config): read postgres bytea streams before decryption
Nov 2, 2025
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
10 changes: 9 additions & 1 deletion lib/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,15 @@ private function new_settings($username) {
*/
private function decrypt_settings($data, $key) {
if (!$this->crypt) {
$data = $this->decode($data['settings']);
$settings = $data['settings'];
if (is_resource($settings)) {
Copy link
Member

@kroky kroky Nov 3, 2025

Choose a reason for hiding this comment

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

Can we do this at the place where stream is defined/used? It seems awkward to work with streams here. THis method should receive a string.

$settings = stream_get_contents($settings);
}
if ($settings === false) {
$this->decrypt_failed = true;
return false;
}
$data = $this->decode($settings);
} else {
$data = $this->decode(Hm_Crypt::plaintext($data['settings'], $key));
}
Expand Down
32 changes: 26 additions & 6 deletions modules/smtp/hm-smtp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,33 @@ function __construct($conf) {
else {
$this->port = 25;
}
if (isset($conf['tls']) && $conf['tls']) {
$this->tls = true;
}
else {
$this->tls = false;
$this->tls = false;
Copy link
Member

@kroky kroky Nov 3, 2025

Choose a reason for hiding this comment

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

This seems to be part of another PR (which I already merged). Can you push one change at a time to a PR? Thanks.

$this->starttls = false;
if (isset($conf['tls'])) {
$tls_val = $conf['tls'];
if (is_string($tls_val)) {
$normalized = mb_strtolower(trim($tls_val));
if ($normalized === 'starttls') {
$this->starttls = true;
}
elseif ($normalized === 'tls' || $normalized === 'ssl' || $normalized === 'true' || $normalized === '1') {
$this->tls = true;
}
elseif ($normalized === 'false' || $normalized === '0' || $normalized === '') {
// leave both false
}
elseif ($tls_val) {
$this->tls = true;
}
}
elseif ($tls_val === true || $tls_val === 1) {
$this->tls = true;
}
elseif ($tls_val) {
$this->tls = true;
}
}
if (!$this->tls) {
if (!$this->tls && !$this->starttls) {
$this->starttls = true;
}
$this->request_auths = array(
Expand Down
Loading