mirror of
https://github.com/MichMich/MagicMirror.git
synced 2026-05-11 15:04:14 +00:00
## Release Notes Thanks to: @cgillinger, @khassel, @KristjanESPERANTO, @sonnyb9 > ⚠️ This release needs nodejs version >=22.21.1 <23 || >=24 (no change to previous release) [Compare to previous Release v2.35.0](https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.35.0...v2.36.0) This release falls outside the quarterly schedule. We opted for an early release due to: - Security fix for the internal cors proxy - API change of the weather provider smi - Several bug fixes ### Breaking Changes The cors proxy is now disabled by default. If required, it must be explicitly enabled in the `config.js` file. See the [documentation](https://docs.magicmirror.builders/configuration/cors.html). ### ⚠️ Security You can find several publicly accessible MagicMirror² instances. This should never be done. Doing so makes your entire configuration, including secrets and API keys, publicly visible. Furthermore, it allows attackers to target the host; this is only prevented beginning with this release. Public MagicMirror² instances should always run behind a reverse proxy with authentication. ### [core] - Prepare Release 2.36.0 (#4126) - Allow HTTPFetcher to pass through 304 responses (#4120) - fix(http-fetcher): fall back to reloadInterval after retries exhausted (#4113) - config endpoint must handle functions in module configs (#4106) - fix replaceSecretPlaceholder (#4104) - restrict replaceSecretPlaceholder to cors with allowWhitelist (#4102) - fix: prevent crash when config is undefined in socket handler (#4096) - fix cors function for alpine linux (#4091) - fix(cors): prevent SSRF via DNS rebinding (#4090) - add option to disable or restrict cors endpoint (#4087) - fix: prevent SSRF via /cors endpoint by blocking private/reserved IPs (#4084) - chore: add permissions section to enforce pull-request rules workflow (#4079) - update version for develop ### [dependencies] - update dependencies (#4124) - chore: update dependencies (#4088) - refactor: enable ESLint rule "no-unused-vars" and handle related issues (#4080) ### [modules/newsfeed] - fix(newsfeed): prevent duplicate parse error callback when using pipeline (#4083) ### [modules/updatenotification] - fix(updatenotification): harden git command execution + simplify checkUpdates (#4115) - fix(tests): correct import path for git_helper module in updatenotification tests (#4078) ### [modules/weather] - fix(weather): use nearest openmeteo hourly data (#4123) - fix(weather): avoid loading state after reconnect (#4121) - weather: fix UV index display and add WeatherFlow precipitation (#4108) - fix(weather): restore OpenWeatherMap v2.5 support (#4101) - fix(weather): use stable instanceId to prevent duplicate fetchers (#4092) - SMHI: migrate to SNOW1gv1 API (replace deprecated PMP3gv2) (#4082) ### [testing] - ci(actions): set explicit token permissions (#4114) - fix(http_fetcher): use undici.fetch when dispatcher is present (#4097) - ci(codeql): also scan develop branch on push and PR (#4086) - refactor: replace implicit global config with explicit global.config (#4085) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: sam detweiler <sdetweil@gmail.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <gitkraken@veeck.de> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: DevIncomin <56730075+Developer-Incoming@users.noreply.github.com> Co-authored-by: Nathan <n8nyoung@gmail.com> Co-authored-by: mixasgr <mixasgr@users.noreply.github.com> Co-authored-by: Savvas Adamtziloglou <savvas-gr@greeklug.gr> Co-authored-by: Konstantinos <geraki@gmail.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: BugHaver <43462320+bughaver@users.noreply.github.com> Co-authored-by: BugHaver <43462320+lsaadeh@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: Koen Konst <koenspero@gmail.com> Co-authored-by: Koen Konst <c.h.konst@avisi.nl> Co-authored-by: dathbe <github@beffa.us> Co-authored-by: Marcel <m-idler@users.noreply.github.com> Co-authored-by: Kevin G. <crazylegstoo@gmail.com> Co-authored-by: Jboucly <33218155+jboucly@users.noreply.github.com> Co-authored-by: Jboucly <contact@jboucly.fr> Co-authored-by: Jarno <54169345+jarnoml@users.noreply.github.com> Co-authored-by: Jordan Welch <JordanHWelch@gmail.com> Co-authored-by: Blackspirits <blackspirits@gmail.com> Co-authored-by: Samed Ozdemir <samed@xsor.io> Co-authored-by: in-voker <58696565+in-voker@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com> Co-authored-by: cgillinger <christian.gillinger@gmail.com> Co-authored-by: Sonny B <43247590+sonnyb9@users.noreply.github.com> Co-authored-by: sonnyb9 <sonnyb9@users.noreply.github.com>
277 lines
9.1 KiB
JavaScript
277 lines
9.1 KiB
JavaScript
/**
|
|
* @external Moment
|
|
*/
|
|
const moment = require("moment-timezone");
|
|
const ical = require("node-ical");
|
|
|
|
const Log = require("logger");
|
|
|
|
const CalendarFetcherUtils = {
|
|
|
|
/**
|
|
* Determine based on the title of an event if it should be excluded from the list of events
|
|
* @param {object} config the global config
|
|
* @param {string} title the title of the event
|
|
* @returns {object} excluded: true if the event should be excluded, false otherwise
|
|
* until: the date until the event should be excluded.
|
|
*/
|
|
shouldEventBeExcluded (config, title) {
|
|
for (const filterConfig of config.excludedEvents) {
|
|
const match = CalendarFetcherUtils.checkEventAgainstFilter(title, filterConfig);
|
|
if (match) {
|
|
return {
|
|
excluded: !match.until,
|
|
until: match.until
|
|
};
|
|
}
|
|
}
|
|
|
|
return {
|
|
excluded: false,
|
|
until: null
|
|
};
|
|
},
|
|
|
|
/**
|
|
* Get local timezone.
|
|
* This method makes it easier to test if different timezones cause problems by changing this implementation.
|
|
* @returns {string} timezone
|
|
*/
|
|
getLocalTimezone () {
|
|
return moment.tz.guess();
|
|
},
|
|
|
|
/**
|
|
* Filter the events from ical according to the given config
|
|
* @param {object} data the calendar data from ical
|
|
* @param {object} config The configuration object
|
|
* @returns {object[]} the filtered events
|
|
*/
|
|
filterEvents (data, config) {
|
|
const newEvents = [];
|
|
|
|
Log.debug(`There are ${Object.entries(data).length} calendar entries.`);
|
|
|
|
const now = moment();
|
|
const pastLocalMoment = config.includePastEvents ? now.clone().startOf("day").subtract(config.maximumNumberOfDays, "days") : now;
|
|
const futureLocalMoment
|
|
= now
|
|
.clone()
|
|
.startOf("day")
|
|
.add(config.maximumNumberOfDays, "days")
|
|
// Subtract 1 second so that events that start on the middle of the night will not repeat.
|
|
.subtract(1, "seconds");
|
|
|
|
Object.values(data).forEach((event) => {
|
|
if (event.type !== "VEVENT") {
|
|
return;
|
|
}
|
|
|
|
const title = CalendarFetcherUtils.getTitleFromEvent(event);
|
|
Log.debug(`title: ${title}`);
|
|
|
|
// Return quickly if event should be excluded.
|
|
const { excluded, until: eventFilterUntil } = CalendarFetcherUtils.shouldEventBeExcluded(config, title);
|
|
if (excluded) {
|
|
return;
|
|
}
|
|
|
|
Log.debug(`Event: ${title} | start: ${event.start} | end: ${event.end} | recurring: ${!!event.rrule}`);
|
|
|
|
const location = CalendarFetcherUtils.unwrapParameterValue(event.location) || false;
|
|
const geo = event.geo || false;
|
|
const description = CalendarFetcherUtils.unwrapParameterValue(event.description) || false;
|
|
|
|
let instances;
|
|
try {
|
|
instances = CalendarFetcherUtils.expandRecurringEvent(event, pastLocalMoment, futureLocalMoment);
|
|
} catch (error) {
|
|
Log.error(`Could not expand event "${title}": ${error.message}`);
|
|
return;
|
|
}
|
|
|
|
for (const instance of instances) {
|
|
const { event: instanceEvent, startMoment, endMoment, isRecurring, isFullDay } = instance;
|
|
|
|
// Filter logic
|
|
if (endMoment.isBefore(pastLocalMoment) || startMoment.isAfter(futureLocalMoment)) {
|
|
continue;
|
|
}
|
|
|
|
if (CalendarFetcherUtils.timeFilterApplies(now, endMoment, eventFilterUntil)) {
|
|
continue;
|
|
}
|
|
|
|
const instanceTitle = CalendarFetcherUtils.getTitleFromEvent(instanceEvent);
|
|
|
|
Log.debug(`saving event: ${instanceTitle}, start: ${startMoment.toDate()}, end: ${endMoment.toDate()}`);
|
|
newEvents.push({
|
|
title: instanceTitle,
|
|
startDate: startMoment.format("x"),
|
|
endDate: endMoment.format("x"),
|
|
fullDayEvent: isFullDay,
|
|
recurringEvent: isRecurring,
|
|
class: event.class,
|
|
firstYear: event.start.getFullYear(),
|
|
location: CalendarFetcherUtils.unwrapParameterValue(instanceEvent.location) || location,
|
|
geo: instanceEvent.geo || geo,
|
|
description: CalendarFetcherUtils.unwrapParameterValue(instanceEvent.description) || description
|
|
});
|
|
}
|
|
});
|
|
|
|
newEvents.sort(function (a, b) {
|
|
return a.startDate - b.startDate;
|
|
});
|
|
|
|
return newEvents;
|
|
},
|
|
|
|
/**
|
|
* Gets the title from the event.
|
|
* @param {object} event The event object to check.
|
|
* @returns {string} The title of the event, or "Event" if no title is found.
|
|
*/
|
|
getTitleFromEvent (event) {
|
|
return CalendarFetcherUtils.unwrapParameterValue(event.summary || event.description) || "Event";
|
|
},
|
|
|
|
/**
|
|
* Extracts the string value from a node-ical ParameterValue object ({val, params})
|
|
* or returns the value as-is if it is already a plain string.
|
|
* This handles ICS properties with parameters, e.g. DESCRIPTION;LANGUAGE=de:Text.
|
|
* @param {string|object} value The raw value from node-ical
|
|
* @returns {string|object} The unwrapped string value, or the original value if not a ParameterValue
|
|
*/
|
|
unwrapParameterValue (value) {
|
|
if (value && typeof value === "object" && typeof value.val !== "undefined") {
|
|
return value.val;
|
|
}
|
|
return value;
|
|
},
|
|
|
|
/**
|
|
* Determines if the user defined time filter should apply
|
|
* @param {moment.Moment} now Date object using previously created object for consistency
|
|
* @param {moment.Moment} endDate Moment object representing the event end date
|
|
* @param {string} filter The time to subtract from the end date to determine if an event should be shown
|
|
* @returns {boolean} True if the event should be filtered out, false otherwise
|
|
*/
|
|
timeFilterApplies (now, endDate, filter) {
|
|
if (filter) {
|
|
const until = filter.split(" "),
|
|
value = parseInt(until[0]),
|
|
increment = until[1].slice(-1) === "s" ? until[1] : `${until[1]}s`, // Massage the data for moment js
|
|
filterUntil = moment(endDate.format()).subtract(value, increment);
|
|
|
|
return now.isBefore(filterUntil);
|
|
}
|
|
|
|
return false;
|
|
},
|
|
|
|
/**
|
|
* Determines if the user defined title filter should apply
|
|
* @param {string} title the title of the event
|
|
* @param {string} filter the string to look for, can be a regex also
|
|
* @param {boolean} useRegex true if a regex should be used, otherwise it just looks for the filter as a string
|
|
* @param {string} regexFlags flags that should be applied to the regex
|
|
* @returns {boolean} True if the title should be filtered out, false otherwise
|
|
*/
|
|
titleFilterApplies (title, filter, useRegex, regexFlags) {
|
|
if (useRegex) {
|
|
let regexFilter = filter;
|
|
// Assume if leading slash, there is also trailing slash
|
|
if (filter[0] === "/") {
|
|
// Strip leading and trailing slashes
|
|
regexFilter = filter.slice(1, -1);
|
|
}
|
|
return new RegExp(regexFilter, regexFlags).test(title);
|
|
} else {
|
|
return title.includes(filter);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Expands a recurring event into individual event instances using node-ical.
|
|
* Handles RRULE expansion, EXDATE filtering, RECURRENCE-ID overrides, and ongoing events.
|
|
* @param {object} event The recurring event object
|
|
* @param {moment.Moment} pastLocalMoment The past date limit
|
|
* @param {moment.Moment} futureLocalMoment The future date limit
|
|
* @returns {object[]} Array of event instances with startMoment/endMoment in the local timezone
|
|
*/
|
|
expandRecurringEvent (event, pastLocalMoment, futureLocalMoment) {
|
|
const localTimezone = CalendarFetcherUtils.getLocalTimezone();
|
|
|
|
return ical
|
|
.expandRecurringEvent(event, {
|
|
from: pastLocalMoment.toDate(),
|
|
to: futureLocalMoment.toDate(),
|
|
includeOverrides: true,
|
|
excludeExdates: true,
|
|
expandOngoing: true
|
|
})
|
|
.map((inst) => {
|
|
let startMoment, endMoment;
|
|
if (inst.isFullDay) {
|
|
startMoment = moment.tz([inst.start.getFullYear(), inst.start.getMonth(), inst.start.getDate()], localTimezone);
|
|
endMoment = moment.tz([inst.end.getFullYear(), inst.end.getMonth(), inst.end.getDate()], localTimezone);
|
|
} else {
|
|
startMoment = moment(inst.start).tz(localTimezone);
|
|
endMoment = moment(inst.end).tz(localTimezone);
|
|
}
|
|
// Events without DTEND (e.g. reminders) get start === end from node-ical;
|
|
// extend to end-of-day so they remain visible on the calendar.
|
|
if (startMoment.valueOf() === endMoment.valueOf()) endMoment = endMoment.endOf("day");
|
|
return { event: inst.event, startMoment, endMoment, isRecurring: inst.isRecurring, isFullDay: inst.isFullDay };
|
|
});
|
|
},
|
|
|
|
/**
|
|
* Checks if an event title matches a specific filter configuration.
|
|
* @param {string} title The event title to check
|
|
* @param {string|object} filterConfig The filter configuration (string or object)
|
|
* @returns {object|null} Object with {until: string|null} if matched, null otherwise
|
|
*/
|
|
checkEventAgainstFilter (title, filterConfig) {
|
|
let filter = filterConfig;
|
|
let testTitle = title.toLowerCase();
|
|
let until = null;
|
|
let useRegex = false;
|
|
let regexFlags = "g";
|
|
|
|
if (filter instanceof Object) {
|
|
if (typeof filter.until !== "undefined") {
|
|
until = filter.until;
|
|
}
|
|
|
|
if (typeof filter.regex !== "undefined") {
|
|
useRegex = filter.regex;
|
|
}
|
|
|
|
if (filter.caseSensitive) {
|
|
filter = filter.filterBy;
|
|
testTitle = title;
|
|
} else if (useRegex) {
|
|
filter = filter.filterBy;
|
|
testTitle = title;
|
|
regexFlags += "i";
|
|
} else {
|
|
filter = filter.filterBy.toLowerCase();
|
|
}
|
|
} else {
|
|
filter = filter.toLowerCase();
|
|
}
|
|
|
|
if (CalendarFetcherUtils.titleFilterApplies(testTitle, filter, useRegex, regexFlags)) {
|
|
return { until };
|
|
}
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
if (typeof module !== "undefined") {
|
|
module.exports = CalendarFetcherUtils;
|
|
}
|