From c5e6e463e44de153006ea5aa739021d9a769e82b Mon Sep 17 00:00:00 2001 From: advplyr Date: Fri, 13 Nov 2026 16:17:58 -0600 Subject: [PATCH] When accessAll permission is false and allow list is empty then treat as dont allow any --- server/controllers/LibraryController.js | 6 ++++-- server/utils/queries/libraryFilters.js | 4 +++- server/utils/queries/libraryItemsBookFilters.js | 5 ++++- server/utils/queries/libraryItemsPodcastFilters.js | 5 ++++- server/utils/queries/seriesFilters.js | 4 +++- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js index 6bf36a7b4..ac23b683f 100644 --- a/server/controllers/LibraryController.js +++ b/server/controllers/LibraryController.js @@ -188,8 +188,10 @@ class LibraryController { async findAll(req, res) { let libraries = await Database.libraryModel.getAllWithFolders() - const librariesAccessible = req.user.permissions?.librariesAccessible || [] - if (librariesAccessible.length) { + // accessAllLibraries is stored with an empty librariesAccessible list. An empty list + // with access to all libraries turned off means the user can see no libraries. + if (!req.user.permissions?.accessAllLibraries) { + const librariesAccessible = req.user.permissions?.librariesAccessible || [] libraries = libraries.filter((lib) => librariesAccessible.includes(lib.id)) } diff --git a/server/utils/queries/libraryFilters.js b/server/utils/queries/libraryFilters.js index 240e33451..e8efe8c30 100644 --- a/server/utils/queries/libraryFilters.js +++ b/server/utils/queries/libraryFilters.js @@ -242,7 +242,9 @@ module.exports = { if (!user.canAccessExplicitContent) { attrQuery += ' AND b.explicit = 0' } - if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { + if (!user.permissions?.accessAllTags && !user.permissions?.selectedTagsNotAccessible && !user.permissions?.itemTagsSelected?.length) { + attrQuery += ' AND 0' + } else if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { if (user.permissions.selectedTagsNotAccessible) { attrQuery += ' AND (SELECT count(*) FROM json_each(tags) WHERE json_valid(tags) AND json_each.value IN (:userTagsSelected)) = 0' } else { diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js index cac9a7d17..d78ad2d99 100644 --- a/server/utils/queries/libraryItemsBookFilters.js +++ b/server/utils/queries/libraryItemsBookFilters.js @@ -24,7 +24,10 @@ module.exports = { explicit: false }) } - if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { + if (!user.permissions?.accessAllTags && !user.permissions?.selectedTagsNotAccessible && !user.permissions?.itemTagsSelected?.length) { + // Empty allow-list: the per-item check denies every item. An empty block-list denies nothing. + bookWhere.push(Sequelize.where(Sequelize.literal('1'), 0)) + } else if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { replacements['userTagsSelected'] = user.permissions.itemTagsSelected if (user.permissions.selectedTagsNotAccessible) { bookWhere.push(Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM json_each(tags) WHERE json_valid(tags) AND json_each.value IN (:userTagsSelected))`), 0)) diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js index 8bb5dc110..3866fd61b 100644 --- a/server/utils/queries/libraryItemsPodcastFilters.js +++ b/server/utils/queries/libraryItemsPodcastFilters.js @@ -21,7 +21,10 @@ module.exports = { }) } - if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { + if (!user.permissions?.accessAllTags && !user.permissions?.selectedTagsNotAccessible && !user.permissions?.itemTagsSelected?.length) { + // Empty allow-list: the per-item check denies every item. An empty block-list denies nothing. + podcastWhere.push(Sequelize.where(Sequelize.literal('1'), 0)) + } else if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { replacements['userTagsSelected'] = user.permissions.itemTagsSelected if (user.permissions.selectedTagsNotAccessible) { podcastWhere.push(Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM json_each(tags) WHERE json_valid(tags) AND json_each.value IN (:userTagsSelected))`), 0)) diff --git a/server/utils/queries/seriesFilters.js b/server/utils/queries/seriesFilters.js index c8ebb0d77..1e235b029 100644 --- a/server/utils/queries/seriesFilters.js +++ b/server/utils/queries/seriesFilters.js @@ -102,7 +102,9 @@ module.exports = { if (!user.canAccessExplicitContent) { attrQuery += ' AND b.explicit = 0' } - if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { + if (!user.permissions?.accessAllTags && !user.permissions?.selectedTagsNotAccessible && !user.permissions?.itemTagsSelected?.length) { + attrQuery += ' AND 0' + } else if (!user.permissions?.accessAllTags && user.permissions?.itemTagsSelected?.length) { if (user.permissions.selectedTagsNotAccessible) { attrQuery += ' AND (SELECT count(*) FROM json_each(tags) WHERE json_valid(tags) AND json_each.value IN (:userTagsSelected)) = 0' } else {