mirror of
https://github.com/advplyr/audiobookshelf.git
synced 2026-11-21 08:01:34 +01:00
When accessAll permission is false and allow list is empty then treat as dont allow any
This commit is contained in:
1 parent
1d89e3a58c
commit
95aa00af90
5 files changed
+18
-6
No files matched your search
@@ -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))
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user