diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js index a066a0d32..8c8ad4770 100644 --- a/server/managers/RssFeedManager.js +++ b/server/managers/RssFeedManager.js @@ -299,7 +299,7 @@ class RssFeedManager { const feedExpanded = await Database.feedModel.createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions) if (feedExpanded) { Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`) - SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified()) + SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified(), (user) => user.checkCanAccessLibrary?.(libraryItem.libraryId)) } return feedExpanded } @@ -320,7 +320,7 @@ class RssFeedManager { const feedExpanded = await Database.feedModel.createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions) if (feedExpanded) { Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`) - SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified()) + SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified(), (user) => user.checkCanAccessLibrary?.(collectionExpanded.libraryId)) } return feedExpanded } @@ -341,7 +341,7 @@ class RssFeedManager { const feedExpanded = await Database.feedModel.createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions) if (feedExpanded) { Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`) - SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified()) + SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified(), (user) => user.checkCanAccessLibrary?.(seriesExpanded.libraryId)) } return feedExpanded } @@ -354,8 +354,11 @@ class RssFeedManager { */ async handleCloseFeed(feed) { if (!feed) return false + const entity = await feed.getEntity({ attributes: ['libraryId'] }) const wasRemoved = await Database.feedModel.removeById(feed.id) - SocketAuthority.emitter('rss_feed_closed', feed.toOldJSONMinified()) + if (entity?.libraryId) { + SocketAuthority.emitter('rss_feed_closed', feed.toOldJSONMinified(), (user) => user.checkCanAccessLibrary?.(entity.libraryId)) + } Logger.info(`[RssFeedManager] Closed RSS feed "${feed.feedURL}"`) return wasRemoved } diff --git a/server/scanner/AudioFileScanner.js b/server/scanner/AudioFileScanner.js index 2ba4230d8..95e5993d0 100644 --- a/server/scanner/AudioFileScanner.js +++ b/server/scanner/AudioFileScanner.js @@ -5,6 +5,7 @@ const { LogLevel } = require('../utils/constants') const { parseOverdriveMediaMarkersAsChapters } = require('../utils/parsers/parseOverdriveMediaMarkers') const parseNameString = require('../utils/parsers/parseNameString') const parseSeriesString = require('../utils/parsers/parseSeriesString') +const htmlSanitizer = require('../utils/htmlSanitizer') const LibraryItem = require('../models/LibraryItem') const AudioFile = require('../objects/files/AudioFile') @@ -461,6 +462,7 @@ class AudioFileScanner { if (value && typeof value === 'string') { value = value.trim() // Trim whitespace + if (mapping.key === 'description' || mapping.key === 'subtitle') value = htmlSanitizer.sanitize(value) if (mapping.key === 'pubDate') { const pubJsDate = new Date(value)