ghost 6.61.0 → 6.62.0

package/core/server/services/comments/comments-service.js

@@ -13,7 +13,9 @@ const messages = {
   alreadyDisliked: 'This comment was disliked already',
   replyToReply: 'Can not reply to a reply',
   commentsNotEnabled: 'Comments are not enabled for this site.',
+  postIdRequired: 'A post ID is required to read comments.',
   cannotCommentOnPost: 'You do not have permission to comment on this post.',
+  cannotReadComment: 'You do not have permission to read comments on this post',
   cannotEditComment: 'You do not have permission to edit comments',
   cannotPinReply: 'Replies cannot be pinned',
   cannotPinDeletedComment: 'Deleted comments cannot be pinned',
@@ -39,7 +41,7 @@ const COMMENT_STATUSES_IN_REPLY_TO = [COMMENT_STATUS_PUBLISHED, COMMENT_STATUS_H
 // new `comment.get(...)` call has one obvious place to register its column.
 const REPLY_PARENT_REQUIRED_COLUMNS = ['parent_id', 'post_id'];
 const IN_REPLY_TO_REQUIRED_COLUMNS = ['parent_id'];
-const OWNERSHIP_REQUIRED_COLUMNS = ['member_id'];
+const OWNERSHIP_REQUIRED_COLUMNS = ['member_id', 'post_id'];
 const REPORT_REQUIRED_COLUMNS = ['post_id', 'member_id', 'html', 'created_at'];
 
 function getColumnList(columns) {
@@ -167,11 +169,14 @@ class CommentsService {
   }
 
   /** @private */
-  checkPostAccess(postModel, memberModel) {
-    const access = this.contentGating.checkPostAccess(postModel.toJSON(), memberModel.toJSON());
+  checkPostAccess(postModel, memberModel, { action = 'comment' } = {}) {
+    const access = this.contentGating.checkPostAccess(
+      postModel.toJSON(),
+      memberModel ? memberModel.toJSON() : null,
+    );
     if (access === this.contentGating.BLOCK_ACCESS) {
       throw new errors.NoPermissionError({
-        message: tpl(messages.cannotCommentOnPost),
+        message: tpl(action === 'read' ? messages.cannotReadComment : messages.cannotCommentOnPost),
       });
     }
   }
@@ -189,6 +194,32 @@ class CommentsService {
     });
   }
 
+  async #checkPostAccessForRead(postId, options) {
+    if (options.isAdmin) {
+      return;
+    }
+
+    if (!postId) {
+      throw new errors.ValidationError({ message: tpl(messages.postIdRequired) });
+    }
+
+    const postModel = await this.models.Post.findOne(
+      { id: postId },
+      { require: true, transacting: options.transacting, withRelated: ['tiers'] },
+    );
+
+    let memberModel = null;
+    const memberId = options.context?.member?.id;
+    if (memberId) {
+      memberModel = await this.models.Member.findOne(
+        { id: memberId },
+        { require: true, transacting: options.transacting, withRelated: ['products'] },
+      );
+    }
+
+    this.checkPostAccess(postModel, memberModel, { action: 'read' });
+  }
+
   /**
    * Primary comment lookup: a single keyed fetch with the allowed statuses
    * applied in the query (`WHERE id = ? AND status IN (...)`), optionally locked
@@ -520,6 +551,7 @@ class CommentsService {
    */
   async getComments(options) {
     this.checkEnabled();
+    await this.#checkPostAccessForRead(options.post_id, options);
     const page = await this.models.Comment.findPage(
       withPinnedSelect({ ...options, parentId: null, pinnedFirst: true }),
     );
@@ -659,6 +691,17 @@ class CommentsService {
    */
   async getReplies(id, options, { includeHidden = false } = {}) {
     this.checkEnabled();
+
+    const parentComment = await this.#fetchCommentByID(id, options, {
+      requiredColumns: ['post_id'],
+    });
+
+    if (!parentComment) {
+      throw new errors.NotFoundError({ message: tpl(messages.commentNotFound) });
+    }
+
+    await this.#checkPostAccessForRead(parentComment.get('post_id'), options);
+
     const page = await this.models.Comment.findPage(
       withPinnedSelect({ ...options, parentId: id }, { includeHidden }),
     );
@@ -740,7 +783,9 @@ class CommentsService {
   async getCommentByID(id, options = {}) {
     this.checkEnabled();
 
-    return await this.#getReadableCommentByID(id, options);
+    const model = await this.#getReadableCommentByID(id, options, ['post_id']);
+    await this.#checkPostAccessForRead(model.get('post_id'), options);
+    return model;
   }
 
   /**
@@ -908,6 +953,9 @@ class CommentsService {
       });
     }
 
+    // Mutation responses include replies, so they require the same post access as reads.
+    await this.#checkPostAccessForRead(existingComment.get('post_id'), options);
+
     const model = await this.models.Comment.edit(
       {
         status: COMMENT_STATUS_DELETED,
@@ -943,6 +991,8 @@ class CommentsService {
       });
     }
 
+    await this.#checkPostAccessForRead(existingComment.get('post_id'), options);
+
     if (!comment) {
       return existingComment;
     }

package/core/server/services/content-import/csv/formula.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripFormulaGuard = stripFormulaGuard;
+const FORMULA_TRIGGERS = ['=', '+', '-', '@', '\t', '\r'];
+// Report files prefix formula-shaped cells with an apostrophe. Remove exactly
+// that guard during re-import so repeated fixes do not change publisher data.
+function stripFormulaGuard(cell) {
+    if (cell.charAt(0) === "'" && FORMULA_TRIGGERS.includes(cell.charAt(1))) {
+        return cell.slice(1);
+    }
+    return cell;
+}

package/core/server/services/content-import/csv/index.js

@@ -3,6 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
+exports.stripFormulaGuard = exports.serialize = exports.parseWithSource = exports.parse = void 0;
 var parse_1 = require("./parse");
 Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return __importDefault(parse_1).default; } });
+Object.defineProperty(exports, "parseWithSource", { enumerable: true, get: function () { return parse_1.parseWithSource; } });
+var serialize_1 = require("./serialize");
+Object.defineProperty(exports, "serialize", { enumerable: true, get: function () { return __importDefault(serialize_1).default; } });
+var formula_1 = require("./formula");
+Object.defineProperty(exports, "stripFormulaGuard", { enumerable: true, get: function () { return formula_1.stripFormulaGuard; } });

package/core/server/services/content-import/csv/parse.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = parse;
+exports.parseWithSource = parseWithSource;
 const papaparse_1 = __importDefault(require("papaparse"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const formula_1 = require("./formula");
 const errors = require('@tryghost/errors');
 // A column named after an Object.prototype member is unsafe as a key.
 function isSafeColumnName(name) {
@@ -17,44 +19,63 @@ function isSafeColumnName(name) {
 function isFatal(error) {
     return error.type === 'Quotes';
 }
+function isEmptyRow(row) {
+    return !Object.values(row).some((value) => {
+        if (Array.isArray(value)) {
+            return value.some((cell) => typeof cell === 'string' && cell.trim().length > 0);
+        }
+        return value.trim().length > 0;
+    });
+}
 // headerMapping renames headers to the columns they emit under; unmapped columns
 // carry through, and one mapped to an empty target is dropped.
 async function parse(path, headerMapping) {
+    const parsed = await parseWithSource(path, headerMapping);
+    return parsed.rows.map(({ data }) => data);
+}
+async function parseWithSource(path, headerMapping) {
     // Buffered rather than streamed: files are bounded by the interim row cap, and
     // papaparse's stream mode drops results.errors, which is what catches a
     // malformed quoted field before it imports as garbage.
     const content = (await fs_extra_1.default.readFile(path, 'utf8')).replace(/^\ufeff/, '');
     const parsed = papaparse_1.default.parse(content, {
         header: true,
-        skipEmptyLines: true,
+        // Empty records stay in the parser output long enough to contribute to the
+        // publisher-visible spreadsheet line number, then are dropped below.
+        skipEmptyLines: false,
     });
     const fatal = parsed.errors.find(isFatal);
     if (fatal) {
         throw new errors.ValidationError({ message: `${fatal.code}: ${fatal.message}` });
     }
     const rows = [];
-    for (const parsedRow of parsed.data) {
+    for (const [index, parsedRow] of parsed.data.entries()) {
+        if (isEmptyRow(parsedRow)) {
+            continue;
+        }
         const row = {};
+        const source = Object.create(null);
         for (const [header, value] of Object.entries(parsedRow)) {
             // non-string values are papaparse's __parsed_extra overflow from ragged rows
             if (typeof value !== 'string') {
                 continue;
             }
+            source[header] = value;
             // hasOwn: a prototype-named header must not match an inherited method on the mapping
             if (headerMapping && Object.hasOwn(headerMapping, header)) {
                 if (!headerMapping[header]) {
                     continue;
                 }
-                row[headerMapping[header]] = value;
+                row[headerMapping[header]] = (0, formula_1.stripFormulaGuard)(value);
             }
             else if (isSafeColumnName(header)) {
-                row[header] = value;
+                row[header] = (0, formula_1.stripFormulaGuard)(value);
             }
         }
         if (!Object.keys(row).length) {
             continue;
         }
-        rows.push(row);
+        rows.push({ data: row, source, line: index + 2 });
     }
-    return rows;
+    return { columns: parsed.meta.fields ?? [], rows };
 }

package/core/server/services/content-import/csv/serialize.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = serialize;
+const papaparse_1 = __importDefault(require("papaparse"));
+// Import reports are opened in spreadsheets, so formula-shaped cells must never
+// be emitted verbatim. Papa Parse prefixes them with an apostrophe when this
+// option is enabled.
+function serialize(rows, { columns, header = true } = {}) {
+    return papaparse_1.default.unparse(rows, { columns, header, escapeFormulae: true });
+}

package/core/server/services/content-import/import/completion-email.js

@@ -0,0 +1,164 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = buildCompletionEmail;
+const report_1 = __importDefault(require("./report"));
+const errors_file_1 = __importDefault(require("./errors-file"));
+const { slugify } = require('@tryghost/string');
+const IMPORTED_POST_PREVIEW_LIMIT = 10;
+function escapeHTML(value) {
+    return value
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;');
+}
+function countsFor(run) {
+    const counts = {
+        created: 0,
+        updated: 0,
+        skipped: 0,
+        failed: 0,
+        warningRows: 0,
+    };
+    for (const row of run.rows) {
+        counts[row.status] += 1;
+        if (row.warnings?.length) {
+            counts.warningRows += 1;
+        }
+    }
+    return counts;
+}
+function headingFor(run, counts) {
+    if (run.status === 'failed') {
+        return 'Your content import could not be completed';
+    }
+    if (counts.failed > 0 && counts.created + counts.updated === 0) {
+        return 'Your content import was unsuccessful';
+    }
+    return 'Your content import is complete';
+}
+function formatNumber(value) {
+    return value.toLocaleString();
+}
+function summaryItems(counts, hasErrorsFile) {
+    const items = [
+        ['Created', counts.created],
+        ['Updated', counts.updated],
+        ['Skipped', counts.skipped],
+        ['Failed', counts.failed],
+    ];
+    return items
+        .map(([label, count]) => {
+        const attachmentCopy = label === 'Failed' && hasErrorsFile ? ' (see attached errors.csv)' : '';
+        return `<li style="margin-bottom: 6px;"><strong>${label}:</strong> ${formatNumber(count)}${attachmentCopy}</li>`;
+    })
+        .join('');
+}
+function importTagSlug(runId) {
+    // Internal tag slugs replace the leading # with "hash-" in the model layer.
+    return slugify(`#Import Run ${runId}`.replace(/^#/, 'hash-'));
+}
+function importedPostLinks(run, adminUrl) {
+    const importedRows = run.rows.filter((row) => row.status === 'created' || row.status === 'updated');
+    if (!importedRows.length) {
+        return '';
+    }
+    const rows = importedRows.filter((row) => row.url);
+    const previewRows = rows.slice(0, IMPORTED_POST_PREVIEW_LIMIT);
+    const hasPages = importedRows.some((row) => row.postType === 'page');
+    const hasPosts = importedRows.some((row) => row.postType !== 'page');
+    const links = previewRows
+        .map((row) => {
+        const title = escapeHTML(row.title || `Row ${row.line}`);
+        return `<li style="margin-bottom: 6px;"><a href="${escapeHTML(row.url)}" style="color: #3A464C;">${title}</a></li>`;
+    })
+        .join('');
+    const remaining = importedRows.length - previewRows.length;
+    const remainingCopy = remaining
+        ? `<p style="font-size: 16px; line-height: 25px; color: #3A464C;">Including ${formatNumber(remaining)} more.</p>`
+        : '';
+    const tag = encodeURIComponent(importTagSlug(run.id));
+    const postsUrl = escapeHTML(new URL(`#/posts?tag=${tag}`, adminUrl).href);
+    const pagesUrl = escapeHTML(new URL(`#/pages?tag=${tag}`, adminUrl).href);
+    let heading = 'Imported posts';
+    if (hasPages) {
+        heading = hasPosts ? 'Imported posts and pages' : 'Imported pages';
+    }
+    const filteredLinks = [
+        hasPosts ? `<a href="${postsUrl}" style="color: #3A464C;">View imported posts</a>` : '',
+        hasPages ? `<a href="${pagesUrl}" style="color: #3A464C;">View imported pages</a>` : '',
+    ]
+        .filter(Boolean)
+        .join(' · ');
+    const preview = links
+        ? `<ul style="font-size: 16px; line-height: 25px; color: #3A464C; padding-left: 24px;">${links}</ul>`
+        : '';
+    return `<h2 style="color: #15212A; font-size: 18px; line-height: 24px; margin: 32px 0 12px;">${heading}</h2>
+      ${preview}
+      ${remainingCopy}
+      <p style="font-size: 16px; line-height: 25px; color: #3A464C;">${filteredLinks}</p>`;
+}
+function renderCompletionEmail(run, recipient, adminUrl, hasErrorsFile) {
+    const counts = countsFor(run);
+    const heading = headingFor(run, counts);
+    const warningCopy = counts.warningRows
+        ? `<p style="font-size: 16px; line-height: 25px; color: #3A464C;"><strong>${formatNumber(counts.warningRows)}</strong> ${counts.warningRows === 1 ? 'post has' : 'posts have'} warnings.</p>`
+        : '';
+    const failureCopy = run.status === 'failed'
+        ? '<p style="font-size: 16px; line-height: 25px; color: #3A464C;">Something went wrong on our end before the import could finish. There is nothing wrong with your file, and it is safe to try again.</p>'
+        : '';
+    const escapedRecipient = escapeHTML(recipient);
+    return `<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>${heading}</title>
+  </head>
+  <body style="background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif; color: #3A464C; margin: 0; padding: 0;">
+    <div style="box-sizing: border-box; margin: 0 auto; max-width: 540px; padding: 40px 20px;">
+      <img src="https://static.ghost.org/v4.0.0/images/ghost-orb-4.png" width="60" height="60" alt="Ghost" style="display: block; margin: 0 auto 40px;" />
+      <h1 style="color: #15212A; font-size: 21px; line-height: 25px; margin: 0 0 24px;">${heading}</h1>
+      ${failureCopy}
+      <p style="font-size: 16px; line-height: 25px; color: #3A464C;">The import processed ${formatNumber(run.total)} ${run.total === 1 ? 'row' : 'rows'}:</p>
+      <ul style="font-size: 16px; line-height: 25px; color: #3A464C; padding-left: 24px;">${summaryItems(counts, hasErrorsFile)}</ul>
+      ${warningCopy}
+      ${importedPostLinks(run, adminUrl)}
+      <p style="color: #738A94; font-size: 11px; line-height: 18px; margin-top: 64px;">This email was sent to <a href="mailto:${escapedRecipient}" style="color: #738A94;">${escapedRecipient}</a>.</p>
+    </div>
+  </body>
+</html>`;
+}
+function buildCompletionEmail(run, recipient, adminUrl) {
+    const counts = countsFor(run);
+    const report = (0, report_1.default)(run);
+    const errorsFile = (0, errors_file_1.default)(run);
+    const attachments = [];
+    if (report) {
+        attachments.push({
+            filename: 'report.csv',
+            content: report,
+            contentType: 'text/csv',
+            contentDisposition: 'attachment',
+        });
+    }
+    if (errorsFile) {
+        attachments.push({
+            filename: 'errors.csv',
+            content: errorsFile,
+            contentType: 'text/csv',
+            contentDisposition: 'attachment',
+        });
+    }
+    return {
+        to: recipient,
+        subject: headingFor(run, counts),
+        html: renderCompletionEmail(run, recipient, adminUrl, Boolean(errorsFile)),
+        forceTextContent: true,
+        attachments,
+    };
+}

package/core/server/services/content-import/import/errors-file.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = buildErrorsFile;
+const csv_1 = require("../csv");
+const ANNOTATION_NAMES = ['import_status', 'import_reason', 'import_media_failures'];
+function isActionable(row) {
+    return Boolean(row.source) && row.status === 'failed';
+}
+function uniqueColumnName(preferred, used) {
+    let candidate = preferred;
+    let suffix = 2;
+    while (used.has(candidate)) {
+        candidate = `${preferred}_${suffix}`;
+        suffix += 1;
+    }
+    used.add(candidate);
+    return candidate;
+}
+function buildErrorsFile(run) {
+    const rows = run.rows.filter(isActionable);
+    if (!rows.length) {
+        return undefined;
+    }
+    const usedColumns = new Set(run.sourceColumns);
+    const [outcomeColumn, reasonColumn, mediaFailuresColumn] = ANNOTATION_NAMES.map((name) => uniqueColumnName(name, usedColumns));
+    const columns = [outcomeColumn, reasonColumn, mediaFailuresColumn, ...run.sourceColumns];
+    return (0, csv_1.serialize)(rows.map((row) => {
+        const sourceCells = Object.fromEntries(run.sourceColumns.map((column) => [column, row.source?.[column] ?? '']));
+        return {
+            ...sourceCells,
+            [outcomeColumn]: row.status,
+            [reasonColumn]: row.reason ?? '',
+            [mediaFailuresColumn]: row.mediaFailures?.length ? JSON.stringify(row.mediaFailures) : '',
+        };
+    }), { columns });
+}