liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: auto-trim trailing slash from paths + illegal chars check during move

Browse Source
This commit is contained in:
NGPixel 2020-04-24 20:39:07 -04:00
parent 566043ec43
commit 7306fabdba
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/models/pages.js
View File

@ -214,10 +214,15 @@ module.exports = class Page extends Model {
*/ */
static async createPage(opts) { static async createPage(opts) {
// -> Validate path // -> Validate path
if (opts.path.indexOf('.') >= 0 || opts.path.indexOf(' ') >= 0) { if (opts.path.indexOf('.') >= 0 || opts.path.indexOf(' ') >= 0 || opts.path.index('\\') >= 0) {
throw new WIKI.Error.PageIllegalPath() throw new WIKI.Error.PageIllegalPath()
} }
// -> Remove trailing slash
if (opts.path.endsWidth('/')) {
opts.path = opts.path.slice(0, -1)
}
// -> Check for page access // -> Check for page access
if (!WIKI.auth.checkAccess(opts.user, ['write:pages'], { if (!WIKI.auth.checkAccess(opts.user, ['write:pages'], {
locale: opts.locale, locale: opts.locale,
@ -398,6 +403,16 @@ module.exports = class Page extends Model {
throw new WIKI.Error.PageNotFound() throw new WIKI.Error.PageNotFound()
} }
// -> Validate path
if (opts.destinationPath.indexOf('.') >= 0 || opts.destinationPath.indexOf(' ') >= 0 || opts.destinationPath.index('\\') >= 0) {
throw new WIKI.Error.PageIllegalPath()
}
// -> Remove trailing slash
if (opts.destinationPath.endsWidth('/')) {
opts.destinationPath = opts.destinationPath.slice(0, -1)
}
// -> Check for source page access // -> Check for source page access
if (!WIKI.auth.checkAccess(opts.user, ['manage:pages'], { if (!WIKI.auth.checkAccess(opts.user, ['manage:pages'], {
locale: page.localeCode, locale: page.localeCode,