Mirrors/audiobookshelf
Mirrors/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-04-20 01:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2245 from mikiher/watcher-fixes

Browse Source 
Fix incorrect subpath checks in server/watcher.js
This commit is contained in:
advplyr 2023-10-23 17:28:44 -05:00 committed by GitHub
commit 0ee6336b02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/Watcher.js
View File

@ -6,7 +6,7 @@ const LibraryScanner = require('./scanner/LibraryScanner')
const Task = require('./objects/Task') const Task = require('./objects/Task')
const TaskManager = require('./managers/TaskManager') const TaskManager = require('./managers/TaskManager')
const { filePathToPOSIX } = require('./utils/fileUtils') const { filePathToPOSIX, isSameOrSubPath } = require('./utils/fileUtils')
/** /**
* @typedef PendingFileUpdate * @typedef PendingFileUpdate
@ -183,7 +183,7 @@ class FolderWatcher extends EventEmitter {
} }
// Get file folder // Get file folder
const folder = libwatcher.folders.find(fold => path.startsWith(filePathToPOSIX(fold.fullPath))) const folder = libwatcher.folders.find(fold => isSameOrSubPath(fold.fullPath, path))
if (!folder) { if (!folder) {
Logger.error(`[Watcher] New file folder not found in library "${libwatcher.name}" with path "${path}"`) Logger.error(`[Watcher] New file folder not found in library "${libwatcher.name}" with path "${path}"`)
return return
@ -233,7 +233,7 @@ class FolderWatcher extends EventEmitter {
checkShouldIgnorePath(path) { checkShouldIgnorePath(path) {
return !!this.ignoreDirs.find(dirpath => { return !!this.ignoreDirs.find(dirpath => {
return filePathToPOSIX(path).startsWith(dirpath) return isSameOrSubPath(dirpath, path)
}) })
} }

19
server/utils/fileUtils.js
View File

@ -19,6 +19,25 @@ const filePathToPOSIX = (path) => {
} }
module.exports.filePathToPOSIX = filePathToPOSIX module.exports.filePathToPOSIX = filePathToPOSIX
/**
* Check path is a child of or equal to another path
*
* @param {string} parentPath
* @param {string} childPath
* @returns {boolean}
*/
function isSameOrSubPath(parentPath, childPath) {
parentPath = filePathToPOSIX(parentPath)
childPath = filePathToPOSIX(childPath)
if (parentPath === childPath) return true
const relativePath = Path.relative(parentPath, childPath)
return (
relativePath === '' // Same path (e.g. parentPath = '/a/b/', childPath = '/a/b')
|| !relativePath.startsWith('..') && !Path.isAbsolute(relativePath) // Sub path
)
}
module.exports.isSameOrSubPath = isSameOrSubPath
async function getFileStat(path) { async function getFileStat(path) {
try { try {
var stat = await fs.stat(path) var stat = await fs.stat(path)