marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-13 12:29:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added sanitization for gitGraph

Browse Source
This commit is contained in:
ashishj
2022-03-31 20:12:06 +02:00
parent 3ccf027f42
commit 51e9a6b3aa
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/diagrams/git/gitGraphAst.js
View File

@@ -2,6 +2,7 @@ import { log } from '../../logger';
import { random } from '../../utils'; import { random } from '../../utils';
import mermaidAPI from '../../mermaidAPI'; import mermaidAPI from '../../mermaidAPI';
import * as configApi from '../../config'; import * as configApi from '../../config';
import common from '../common/common';
let commits = {}; let commits = {};
let head = null; let head = null;
let branches = { main: head }; let branches = { main: head };
@@ -89,6 +90,10 @@ export const getOptions = function () {
}; };
export const commit = function (msg, id, type, tag) { export const commit = function (msg, id, type, tag) {
log.debug('Entering commit:', msg, id, type, tag);
id = common.sanitizeText(id, configApi.getConfig());
msg = common.sanitizeText(msg, configApi.getConfig());
tag = common.sanitizeText(tag, configApi.getConfig());
const commit = { const commit = {
id: id ? id : seq + '-' + getId(), id: id ? id : seq + '-' + getId(),
message: msg, message: msg,
@@ -105,6 +110,7 @@ export const commit = function (msg, id, type, tag) {
}; };
export const branch = function (name) { export const branch = function (name) {
name = common.sanitizeText(name, configApi.getConfig());
if (typeof branches[name] === 'undefined') { if (typeof branches[name] === 'undefined') {
branches[name] = head != null ? head.id : null; branches[name] = head != null ? head.id : null;
checkout(name); checkout(name);
@@ -127,6 +133,7 @@ export const branch = function (name) {
}; };
export const merge = function (otherBranch) { export const merge = function (otherBranch) {
otherBranch = common.sanitizeText(otherBranch, configApi.getConfig());
const currentCommit = commits[branches[curBranch]]; const currentCommit = commits[branches[curBranch]];
const otherCommit = commits[branches[otherBranch]]; const otherCommit = commits[branches[otherBranch]];
if (curBranch === otherBranch) { if (curBranch === otherBranch) {
@@ -212,6 +219,7 @@ export const merge = function (otherBranch) {
}; };
export const checkout = function (branch) { export const checkout = function (branch) {
branch = common.sanitizeText(branch, configApi.getConfig());
console.info(branches); console.info(branches);
if (typeof branches[branch] === 'undefined') { if (typeof branches[branch] === 'undefined') {
let error = new Error( let error = new Error(