mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-11-25 11:16:31 -05:00
Prevent subdirectories in user export
This commit also refactors the code a bit, and adds a '-' separator between a filename and its duplicate index. This commit fixes #1079. Signed-off-by: Daan Sprenkels <hello@dsprenkels.com>
This commit is contained in:
parent
8bace89cab
commit
9fba268288
1 changed files with 11 additions and 9 deletions
|
@ -90,18 +90,20 @@ UserRouter.get('/me/export', function (req, res) {
|
|||
ownerId: user.id
|
||||
}
|
||||
}).then(function (notes) {
|
||||
let list = []
|
||||
let filenames = {}
|
||||
async.each(notes, function (note, callback) {
|
||||
let title
|
||||
let extension = ''
|
||||
let basename = note.title.replace(/\//g, '-') // Prevent subdirectories
|
||||
let filename
|
||||
let suffix = ''
|
||||
do {
|
||||
title = note.title + extension
|
||||
extension++
|
||||
} while (list.indexOf(title) !== -1)
|
||||
let seperator = typeof suffix === 'number' ? '-' : ''
|
||||
filename = basename + seperator + suffix + '.md'
|
||||
suffix++
|
||||
} while (filenames[filename])
|
||||
filenames[filename] = true
|
||||
|
||||
list.push(title)
|
||||
logger.debug('Write: ' + title + '.md')
|
||||
archive.append(Buffer.from(note.content), { name: title + '.md', date: note.lastchangeAt })
|
||||
logger.debug('Write: ' + filename)
|
||||
archive.append(Buffer.from(note.content), { name: filename, date: note.lastchangeAt })
|
||||
callback(null, null)
|
||||
}, function (err) {
|
||||
if (err) {
|
||||
|
|
Loading…
Reference in a new issue