Skip to content
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

fix: inline escaped SVG data-uri make canvas tainted in Safari between iOS 10-11.2 #2683

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: inline escaped SVG data-uri make canvas tainted in Safari between iOS 10-11.2 #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38ab9c1
Fix: inline svg image taint canva
emon100 Aug 23, 2021
b714d0d
test: case for ios 10.3-11.3 safari
emon100 Aug 27, 2021
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
4 changes: 1 addition & 3 deletions src/core/cache-storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class Cache {
img.onload = () => resolve(img);
img.onerror = reject;
//ios safari 10.3 taints canvas with data urls unless crossOrigin is set to anonymous
if (isInlineBase64Image(src) || useCORS) {
if (isInlineImage(src) || useCORS) {
img.crossOrigin = 'anonymous';
}
img.src = src;
Expand Down Expand Up @@ -166,12 +166,10 @@ export class Cache {
}

const INLINE_SVG = /^data:image\/svg\+xml/i;
const INLINE_BASE64 = /^data:image\/.*;base64,/i;
const INLINE_IMG = /^data:image\/.*/i;

const isRenderable = (src: string): boolean => FEATURES.SUPPORT_SVG_DRAWING || !isSVG(src);
const isInlineImage = (src: string): boolean => INLINE_IMG.test(src);
const isInlineBase64Image = (src: string): boolean => INLINE_BASE64.test(src);
const isBlobImage = (src: string): boolean => src.substr(0, 4) === 'blob';

const isSVG = (src: string): boolean => src.substr(-3).toLowerCase() === 'svg' || INLINE_SVG.test(src);
22 changes: 22 additions & 0 deletions tests/reftests/background/svg.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<html>
<head>
<title>Escaped SVG background tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript" src="../../test.js"></script>
<style>
.svg {
position: absolute;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='605' height='2'%3E%3Cpath stroke='%23F00' stroke-dasharray='11,11' d='M.25.25l604 .25'/%3E%3C/svg%3E");
background-size: contain;
background-repeat: no-repeat;
width: 500px;
height: 20px;
}
</style>
</head>
<body>
<div class='svg'>
</div>
</body>

</html>