prehistoric-systems/bewcloud
1
0
Fork 0
mirror of https://github.com/bewcloud/bewcloud.git synced 2026-03-11 08:54:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expose new tlsMode and tlsVerify options for connecting to the mail submission agent

Browse source
This commit is contained in:
Erin of Yukis 2025-12-14 23:16:02 +01:00
parent 624fdb69f4
commit 648459f7ce
5 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.sample
View file

@ -16,5 +16,5 @@ MFA_SALT="fake" # optional, if you want to enable multi-factor authentication
OIDC_CLIENT_ID="fake" # optional, if you want to enable SSO (Single Sign-On)
OIDC_CLIENT_SECRET="fake" # optional, if you want to enable SSO (Single Sign-On)
SMTP_USERNAME="fake" # optional, if you want to enable signup email verification or multi-factor authentication via email
SMTP_PASSWORD="fake" # optional, if you want to enable signup email verification or multi-factor authentication via email
#SMTP_USERNAME="" # optional, if you want to use signup email verification or multi-factor with an email service requiring authentication
#SMTP_PASSWORD="" # optional, if you want to use signup email verification or multi-factor with an email service requiring authentication

2
bewcloud.config.sample.ts
View file

@ -32,6 +32,8 @@ const config: PartialDeep<Config> = {
// from: 'help@bewcloud.com',
// host: 'localhost',
// port: 465,
// tlsMode: null, // May be "immediate", "starttls" or "none", defaults to immediate TLS if port is 465, StartTLS otherwise
// tlsVerify: true, // Whether to verify the TLS certificate, if a string is used the hostname will be verified using that name
// },
// contacts: {
// enableCardDavServer: true,

2
lib/config.ts
View file

@ -37,6 +37,8 @@ export class AppConfig {
from: 'help@bewcloud.com',
host: 'localhost',
port: 465,
tlsMode: null, // Depends on the port number above
tlsVerify: true,
},
contacts: {
enableCardDavServer: true,

20
lib/models/email.ts
View file

@ -15,14 +15,28 @@ export class EmailModel {
throw new Error('config.email.from, config.email.host, or config.email.port is not set');
}
let tlsMode = emailConfig.tlsMode;
if (!["immediate", "starttls", "none"].includes(tlsMode)) {
tlsMode = Number(emailConfig.port) === 465 ? "immediate" : "starttls";
}
const transporterConfig = {
host: emailConfig.host,
port: emailConfig.port,
secure: Number(emailConfig.port) === 465,
auth: {
secure: tlsMode === "immediate",
requireTLS: tlsMode === "starttls",
ignoreTLS: tlsMode === "none",
tls: (
emailConfig.tlsVerify === false ? { rejectUnauthorized: false } :
emailConfig.tlsVerify !== true ? { servername: emailConfig.tlsVerify } :
{}
),
auth: (SMTP_USERNAME || SMTP_PASSWORD) ? {
user: SMTP_USERNAME,
pass: SMTP_PASSWORD,
},
} : null,
};
const transporter = nodemailer.createTransport(transporterConfig);

4
lib/types.ts
View file

@ -206,6 +206,10 @@ export interface Config {
host: string;
/** The SMTP port to send emails from */
port: number;
/** How to use TLS when connecting: default is “immediate” on port 465, “starttls” otherwise */
tlsMode: null | "immediate" | "starttls" | "none";
/** Whether to verify the TLS certificate, if a string is used the hostname will be verified using that name */
tlsVerify: boolean | string;
};
contacts: {
/** If true, the CardDAV server will be enabled (proxied) */