danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(notifications): encode SMTP credentials in Shoutrrr URLs (#831)

Browse source 
Closes #829
This commit is contained in:
Nico 2026-04-25 09:24:05 +02:00 committed by GitHub
parent 3adc722cca
commit f078e006c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/server/modules/notifications/__tests__/notification-builders.test.ts
View file

@ -39,6 +39,21 @@ describe("notification shoutrrr URL builders", () => {
).toBe( ).toBe(
"smtp://user%20name:p%40ss%20word@smtp.example.com:465/?from=alerts%2Bteam%40example.com&fromname=Ops+Team&to=ops%40example.com&starttls=no", "smtp://user%20name:p%40ss%20word@smtp.example.com:465/?from=alerts%2Bteam%40example.com&fromname=Ops+Team&to=ops%40example.com&starttls=no",
); );
expect(
buildEmailShoutrrrUrl({
type: "email",
smtpHost: "smtp.example.com",
smtpPort: 465,
username: "user%name+tag",
password: "pa%ss+word",
from: "alerts@example.com",
to: ["ops@example.com"],
useTLS: false,
}),
).toBe(
"smtp://user%25name%2Btag:pa%25ss%2Bword@smtp.example.com:465/?from=alerts%40example.com&to=ops%40example.com&starttls=no",
);
}); });
test("builds discord URLs and rejects invalid webhook formats", () => { test("builds discord URLs and rejects invalid webhook formats", () => {

6
app/server/modules/notifications/builders/email.ts
View file

@ -7,9 +7,9 @@ export const buildEmailShoutrrrUrl = (config: Extract<NotificationConfig, { type
shoutrrrUrl.port = String(config.smtpPort); shoutrrrUrl.port = String(config.smtpPort);
shoutrrrUrl.pathname = "/"; shoutrrrUrl.pathname = "/";
let auth = "";
if (config.username && config.password) { if (config.username && config.password) {
shoutrrrUrl.username = config.username; auth = `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`;
shoutrrrUrl.password = config.password;
} }
shoutrrrUrl.searchParams.set("from", config.from); shoutrrrUrl.searchParams.set("from", config.from);
@ -19,5 +19,5 @@ export const buildEmailShoutrrrUrl = (config: Extract<NotificationConfig, { type
shoutrrrUrl.searchParams.set("to", config.to.join(",")); shoutrrrUrl.searchParams.set("to", config.to.join(","));
shoutrrrUrl.searchParams.set("starttls", config.useTLS ? "yes" : "no"); shoutrrrUrl.searchParams.set("starttls", config.useTLS ? "yes" : "no");
return shoutrrrUrl.toString(); return shoutrrrUrl.toString().replace("smtp://", `smtp://${auth}`);
}; };