Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Check document ID when parsing pasted references

Browse Source 
Summary: Add doc-id attribute to copied HTML columns next to column type. Only use the raw value (rather than the display value) when the parsed doc-id from pasted HTML matches the current document ID, similar to ensuring that the type matches. This only applies to references and reflists.

Test Plan: Extended CopyPaste.ts

Reviewers: dsagal

Reviewed By: dsagal

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D3154
This commit is contained in:
Alex Hall
2021-11-29 21:38:05 +02:00
parent 482ce0e4c4
commit 551ea28fc4
3 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/client/lib/tableUtil.ts
View File

@@ -1,6 +1,7 @@
import type {CopySelection} from 'app/client/components/CopySelection';
import {get as getBrowserGlobals} from 'app/client/lib/browserGlobals';
import type {KoArray} from 'app/client/lib/koArray';
import {simpleStringHash} from 'app/client/lib/textUtils';
import type {ViewFieldRec} from 'app/client/models/DocModel';
import type {BulkUpdateRecord} from 'app/common/DocActions';
import {safeJsonParse} from 'app/common/gutil';
@@ -78,6 +79,15 @@ export function makePasteText(tableData: TableData, selection: CopySelection) {
return tsvEncode(values);
}
/**
* Hash of the current docId to allow checking if copying and pasting is happening in the same document,
* without leaking the actual docId which may allow others to access the document.
*/
export function getDocIdHash(): string {
const docId = (window as any).gristDocPageModel.currentDocId.get();
return simpleStringHash(docId);
}
/**
* Returns an html table of containing the cells denoted by the cross product of
* the given rows and columns, styled by the given table/row/col style dictionaries.
@@ -90,7 +100,8 @@ export function makePasteHtml(tableData: TableData, selection: CopySelection, in
const rowStyle = selection.rowStyle || {}; // Maps rowId to style object.
const colStyle = selection.colStyle || {}; // Maps colId to style object.
const elem = dom('table', {border: '1', cellspacing: '0', style: 'white-space: pre'},
const elem = dom('table',
{border: '1', cellspacing: '0', style: 'white-space: pre', 'data-grist-doc-id-hash': getDocIdHash()},
dom('colgroup', selection.colIds.map(colId =>
dom('col', {
style: _styleAttr(colStyle[colId]),
@@ -121,6 +132,7 @@ export function makePasteHtml(tableData: TableData, selection: CopySelection, in
export interface RichPasteObject {
displayValue: string;
docIdHash?: string|null;
colType?: string|null; // Column type of the source column.
rawValue?: unknown; // Optional rawValue that should be used if colType matches destination.
}
@@ -134,13 +146,14 @@ export function parsePasteHtml(data: string): RichPasteObject[][] {
const parser = new G.DOMParser() as DOMParser;
const doc = parser.parseFromString(data, 'text/html');
const table = doc.querySelector('table');
const docIdHash = table?.getAttribute('data-grist-doc-id-hash');
const colTypes = Array.from(table!.querySelectorAll('col'), col =>
col.getAttribute('data-grist-col-type'));
const result = Array.from(table!.querySelectorAll('tr'), (row, rowIdx) =>
Array.from(row.querySelectorAll('td, th'), (cell, colIdx) => {
const o: RichPasteObject = { displayValue: cell.textContent! };
const o: RichPasteObject = {displayValue: cell.textContent!, docIdHash};
// If there's a column type, add it to the object
if (colTypes[colIdx]) {