fix: correctly handle allowTaint canvas cloning (#2649)

niklasvh · Aug 13, 2021 · c378e22 · c378e22
1 parent 2b4de68
commit c378e22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/dom/document-cloner.ts b/src/dom/document-cloner.ts
@@ -24,6 +24,7 @@ import {Context} from '../core/context';
 export interface CloneOptions {
     ignoreElements?: (element: Element) => boolean;
     onclone?: (document: Document, element: HTMLElement) => void;
+    allowTaint?: boolean;
 }
 
 export interface WindowOptions {
@@ -201,14 +202,16 @@ export class DocumentCloner {
             const ctx = canvas.getContext('2d');
             const clonedCtx = clonedCanvas.getContext('2d');
             if (clonedCtx) {
-                if (ctx) {
+                if (!this.options.allowTaint && ctx) {
                     clonedCtx.putImageData(ctx.getImageData(0, 0, canvas.width, canvas.height), 0, 0);
                 } else {
                     clonedCtx.drawImage(canvas, 0, 0);
                 }
             }
             return clonedCanvas;
-        } catch (e) {}
+        } catch (e) {
+            this.context.logger.info(`Unable to clone canvas as it is tainted`);
+        }
 
         return clonedCanvas;
     }

diff --git a/src/index.ts b/src/index.ts
@@ -74,6 +74,7 @@ const renderElement = async (element: HTMLElement, opts: Partial<Options>): Prom
     const foreignObjectRendering = opts.foreignObjectRendering ?? false;
 
     const cloneOptions: CloneConfigurations = {
+        allowTaint: opts.allowTaint ?? false,
         onclone: opts.onclone,
         ignoreElements: opts.ignoreElements,
         inlineImages: foreignObjectRendering,