Skip to content

fix: null-guard storage targets and page tags to prevent crashes #8005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
derekderie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: null-guard storage targets and page tags to prevent crashes #8005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/models/storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ module.exports = class Storage extends Model {

static async pageEvent({ event, page }) {
try {
for (let target of this.targets) {
for (let target of (this.targets || [])) {
await target.fn[event](page)
}
} catch (err) {
Expand All @@ -190,7 +190,7 @@ module.exports = class Storage extends Model {

static async assetEvent({ event, asset }) {
try {
for (let target of this.targets) {
for (let target of (this.targets || [])) {
await target.fn[`asset${_.capitalize(event)}`](asset)
}
} catch (err) {
Expand All @@ -201,7 +201,7 @@ module.exports = class Storage extends Model {

static async getLocalLocations({ asset }) {
const locations = []
const promises = this.targets.map(async (target) => {
const promises = (this.targets || []).map(async (target) => {
try {
const path = await target.fn.getLocalLocation(asset)
locations.push({
Expand Down
2 changes: 1 addition & 1 deletion server/modules/storage/disk/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ module.exports = {
id: currentPage.id,
title: _.get(pageData, 'title', currentPage.title),
description: _.get(pageData, 'description', currentPage.description) || '',
tags: newTags || currentPage.tags.map(t => t.tag),
tags: newTags || (currentPage.tags || []).map(t => t.tag),
isPublished: _.get(pageData, 'isPublished', currentPage.isPublished),
isPrivate: false,
content: pageData.content,
Expand Down