Skip to content

fix: validate subscription endpoint before persisting it #89

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

fix: validate subscription endpoint before persisting it #89

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
33 changes: 30 additions & 3 deletions lib/subscriptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,32 @@
'use strict';

const db = nodebb.require('./src/database');
const request = nodebb.require('./src/request');

const Subscriptions = module.exports;

// The endpoint is caller-supplied and is later POSTed to by the server on every
// notification, so it has to be checked before it is persisted.
Subscriptions.isValidEndpoint = async (endpoint) => {
let url;
try {
url = new URL(endpoint);
} catch (e) {
return false;
}

if (url.protocol !== 'https:') {
return false;
}

try {
const { ok } = await request.check(url.href);
return ok;
} catch (e) {
return false;
}
};

Subscriptions.count = async uid => await db.sortedSetCard(`uid:${uid}:web-push:subscriptions`);

Subscriptions.getUsers = async () => {
Expand Down Expand Up @@ -32,8 +55,12 @@ Subscriptions.list = async (uids) => {
};

Subscriptions.add = async (uid, subscription, device) => {
const { endpoint } = subscription;
const entry = { ...subscription, ...(device || {}) };
const endpoint = typeof subscription?.endpoint === 'string' ? subscription.endpoint.trim() : '';
if (!await Subscriptions.isValidEndpoint(endpoint)) {
throw new Error('[[error:invalid-url]]');
}

const entry = { ...subscription, ...(device || {}), endpoint };
await Promise.all([
db.sortedSetAdd(`uid:${uid}:web-push:subscriptions`, Date.now(), endpoint),
db.setObject(`web-push:subscriptions:${endpoint}`, entry),
Expand All @@ -42,7 +69,7 @@ Subscriptions.add = async (uid, subscription, device) => {
};

Subscriptions.remove = async (uid, subscription) => {
const { endpoint } = subscription;
const endpoint = typeof subscription?.endpoint === 'string' ? subscription.endpoint.trim() : '';
await Promise.all([
db.sortedSetRemove(`uid:${uid}:web-push:subscriptions`, endpoint),
db.delete(`web-push:subscriptions:${endpoint}`),
Expand Down