Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-02-07 13:59:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated uploadController.js

Browse Source 
scanFiles() will now remove delete allocated identifiers from cache if the files are dirty.
This commit is contained in:
Bobby Wibowo 2018-12-08 10:56:23 +07:00
parent f9bdb7b88c
commit 9eb9ac288d
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
controllers/uploadController.js
View File

@ -204,7 +204,7 @@ uploadsController.actuallyUpload = async (req, res, user, albumid) => {
}) })
if (config.uploads.scan && config.uploads.scan.enabled) { if (config.uploads.scan && config.uploads.scan.enabled) {
const scan = await uploadsController.scanFiles(req.app.get('clam-scanner'), infoMap) const scan = await uploadsController.scanFiles(req, infoMap)
if (scan) { return erred(scan) } if (scan) { return erred(scan) }
} }
@ -290,7 +290,7 @@ uploadsController.actuallyUploadByUrl = async (req, res, user, albumid) => {
iteration++ iteration++
if (iteration === urls.length) { if (iteration === urls.length) {
if (config.uploads.scan && config.uploads.scan.enabled) { if (config.uploads.scan && config.uploads.scan.enabled) {
const scan = await uploadsController.scanFiles(req.app.get('clam-scanner'), infoMap) const scan = await uploadsController.scanFiles(req, infoMap)
if (scan) { return erred(scan) } if (scan) { return erred(scan) }
} }
@ -415,7 +415,7 @@ uploadsController.actuallyFinishChunks = async (req, res, user, albumid) => {
iteration++ iteration++
if (iteration === files.length) { if (iteration === files.length) {
if (config.uploads.scan && config.uploads.scan.enabled) { if (config.uploads.scan && config.uploads.scan.enabled) {
const scan = await uploadsController.scanFiles(req.app.get('clam-scanner'), infoMap) const scan = await uploadsController.scanFiles(req, infoMap)
if (scan) { return erred(scan) } if (scan) { return erred(scan) }
} }
@ -542,10 +542,10 @@ uploadsController.formatInfoMap = (req, res, user, infoMap) => {
timestamp: Math.floor(Date.now() / 1000) timestamp: Math.floor(Date.now() / 1000)
}) })
} else { } else {
const identifier = info.data.filename.split('.')[0]
utils.deleteFile(info.data.filename).catch(console.error) utils.deleteFile(info.data.filename).catch(console.error)
const set = req.app.get('uploads-set') const set = req.app.get('uploads-set')
if (set) { if (set) {
const identifier = info.data.filename.split('.')[0]
set.delete(identifier) set.delete(identifier)
// console.log(`Removed ${identifier} from identifiers cache (formatInfoMap)`) // console.log(`Removed ${identifier} from identifiers cache (formatInfoMap)`)
} }
@ -561,8 +561,9 @@ uploadsController.formatInfoMap = (req, res, user, infoMap) => {
}) })
} }
uploadsController.scanFiles = (scanner, infoMap) => { uploadsController.scanFiles = (req, infoMap) => {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const scanner = req.app.get('clam-scanner')
let iteration = 0 let iteration = 0
for (const info of infoMap) { for (const info of infoMap) {
scanner.scanFile(info.path).then(reply => { scanner.scanFile(info.path).then(reply => {
@ -581,12 +582,22 @@ uploadsController.scanFiles = (scanner, infoMap) => {
} }
}).then(virus => { }).then(virus => {
if (!virus) { return false } if (!virus) { return false }
// If there is at least one dirty file, delete all files // If there is at least one dirty file, then delete all files
infoMap.forEach(info => utils.deleteFile(info.data.filename).catch(console.error)) const set = req.app.get('uploads-set')
infoMap.forEach(info => {
utils.deleteFile(info.data.filename).catch(console.error)
if (set) {
const identifier = info.data.filename.split('.')[0]
set.delete(identifier)
// console.log(`Removed ${identifier} from identifiers cache (formatInfoMap)`)
}
})
// Unfortunately, we will only be returning name of the first virus
// even if the current session was made up by multiple virus types
return `Virus detected: ${virus}.` return `Virus detected: ${virus}.`
}).catch(error => { }).catch(error => {
console.error(`ClamAV: ${error.toString()}.`) console.error(`ClamAV: ${error.toString()}.`)
return `ClamAV: ${error.code}, please contact sysadmin.` return `ClamAV: ${error.code}, please contact site owner.`
}) })
} }