Skip to content

fix: handle ntfy access token auth, and handle @ in credentials #424

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
w33ble wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle ntfy access token auth, and handle @ in credentials #424

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
29 changes: 20 additions & 9 deletions src/lib/server/notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,23 +283,34 @@ async function sendNtfy(appriseUrl: string, payload: NotificationPayload): Promi
// Supported formats:
// ntfy://topic (public ntfy.sh)
// ntfy://host/topic (custom server, no auth)
// ntfy://user:pass@host/topic (custom server with auth)
// ntfy://user:pass@host/topic (custom server with user auth)
// ntfy://token@host/topic (custom server with token auth)
// ntfys:// variants for HTTPS
const isSecure = appriseUrl.startsWith('ntfys');
const path = appriseUrl.replace(/^ntfys?:\/\//, '');
const protocol = isSecure ? 'https' : 'http'

let url: string;
let auth: string | null = null;

// Check for user:pass@host/topic format
const authMatch = path.match(/^([^:]+):([^@]+)@(.+)$/);
if (authMatch) {
const [, user, pass, hostAndTopic] = authMatch;
auth = Buffer.from(`${user}:${pass}`).toString('base64');
url = `${isSecure ? 'https' : 'http'}://${hostAndTopic}`;
// Check for auth in apprise url
const urlParams = URL.parse(`${protocol}://${path}`)
if (urlParams && (urlParams.username || urlParams.password)) {
const user = urlParams.username;
const pass = urlParams.password;
const hostAndTopic = `${urlParams.hostname}${urlParams.pathname}`

if (urlParams.username && urlParams.password) {
// base64 encode username and password
auth = `Basic ${Buffer.from(decodeURIComponent(`${user}:${pass}`)).toString('base64')}`
} else {
// use token as provided
auth = `Bearer ${decodeURIComponent(urlParams.username)}`
}
url = `${protocol}://${hostAndTopic}`;
} else if (path.includes('/')) {
// Custom server without auth
url = `${isSecure ? 'https' : 'http'}://${path}`;
url = `${protocol}://${path}`;
} else {
// Default ntfy.sh
url = `https://ntfy.sh/${path}`;
Expand All @@ -312,7 +323,7 @@ async function sendNtfy(appriseUrl: string, payload: NotificationPayload): Promi
};

if (auth) {
headers['Authorization'] = `Basic ${auth}`;
headers['Authorization'] = auth;
}

try {
Expand Down