marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-19 15:30:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source 
Conflicts:
	cypress/platform/xss7.html
This commit is contained in:
Knut Sveidqvist
2021-09-29 08:51:54 +02:00
parent 75b79e1b23 f91920ab90
commit 35d8f33542
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -6,7 +6,7 @@
**Thanks to all involved, people committing pull requests, people answering questions! 🙏** **Thanks to all involved, people committing pull requests, people answering questions! 🙏**
<a href="https://mermaid-js.github.io/mermaid/landing/" alt="Link to landing page for the book The Official Guide To mermaid.js"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/img/book-banner-pre-release.jpg"></a> <a href="https://mermaid-js.github.io/mermaid/landing/" alt="Link to landing page for the book The Official Guide To mermaid.js"><img src="https://github.com/mermaid-js/mermaid/blob/master/docs/img/book-banner-post-release.jpg"></a>
## About ## About

16
cypress/platform/xss7.html
View File

@@ -54,7 +54,11 @@
// themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}', // themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}',
logLevel: 0, logLevel: 0,
state: { state: {
<<<<<<< HEAD
defaultRenderer: 'dagre-d3', defaultRenderer: 'dagre-d3',
=======
defaultRenderer: 'dagre-wrapper',
>>>>>>> master
}, },
flowchart: { flowchart: {
// defaultRenderer: 'dagre-wrapper', // defaultRenderer: 'dagre-wrapper',
@@ -68,9 +72,9 @@
// fontFamily: 'courier', // fontFamily: 'courier',
fontSize: 18, fontSize: 18,
curve: 'basis', curve: 'basis',
securityLevel: 'antiscript',
startOnLoad: false, startOnLoad: false,
secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize'], secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize']
securityLevel: 'loose',
// themeVariables: {relationLabelColor: 'red'} // themeVariables: {relationLabelColor: 'red'}
}); });
function callback(){alert('It worked');} function callback(){alert('It worked');}
@@ -82,10 +86,10 @@
document.getElementsByTagName('body')[0].appendChild(div); document.getElementsByTagName('body')[0].appendChild(div);
throw new Error('XSS Succeded'); throw new Error('XSS Succeded');
} }
var diagram = "graph LR\n";
diagram += " B(<a href='<";
var diagram = "stateDiagram-v2\n"; diagram += "script></";
diagram += "<img/src='1'/onerror=xssAttack()> --> B"; diagram += "script>Javascript:xssAttack`1`'>Click)";
// diagram += "script\u003aalert\u0028document.domain\u0029\` src=x>\"\);\n"; // diagram += "script\u003aalert\u0028document.domain\u0029\` src=x>\"\);\n";
console.log(diagram); console.log(diagram);
// document.querySelector('#diagram').innerHTML = diagram; // document.querySelector('#diagram').innerHTML = diagram;

4
docs/index.html
View File

@@ -8,8 +8,8 @@
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<!-- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css"> --> <!-- <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css"> -->
<link rel="stylesheet" href="theme.css"> <link rel="stylesheet" href="theme.css">
<!-- <script src="//cdn.jsdelivr.net/npm/mermaid@8.12.0/dist/mermaid.min.js"></script> --> <script src="//cdn.jsdelivr.net/npm/mermaid@8.13.0/dist/mermaid.min.js"></script>
<script src="http://localhost:9000/mermaid.js"></script> <!-- <script src="http://localhost:9000/mermaid.js"></script> -->
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

11
src/diagrams/common/common.js
View File

@@ -29,10 +29,11 @@ export const removeScript = (txt) => {
} }
} }
rs = rs.replace(/javascript:/g, '#'); rs = rs.replace(/script>/gi, '#');
rs = rs.replace(/onerror=/g, 'onerror:'); rs = rs.replace(/script>/gi, '#');
rs = rs.replace(/<iframe/g, ''); rs = rs.replace(/javascript:/gi, '#');
rs = rs.replace(/onerror=/gi, 'onerror:');
rs = rs.replace(/<iframe/gi, '');
return rs; return rs;
}; };
@@ -64,7 +65,7 @@ const sanitizeMore = (text, config) => {
}; };
export const sanitizeText = (text, config) => { export const sanitizeText = (text, config) => {
const txt = sanitizeMore(DOMPurify.sanitize(text), config); const txt = DOMPurify.sanitize(sanitizeMore(text, config));
return txt; return txt;
}; };