Accept newlines in Base64 encoded data urls (#268)

accept newlines in Base64 encoded data urls Co-authored-by: Anna-Lena Lumpp <anna-lena.lumpp@yworks.com> Co-authored-by: Lukas Holländer <lukas.hollaender@yworks.com>
yWorks · Aug 10, 2023 · 0598244 · 0598244
1 parent c24a4e4
commit 0598244
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/nodes/image.ts b/src/nodes/image.ts
@@ -10,8 +10,7 @@ import { Matrix } from 'jspdf'
 import { Viewport } from '../context/viewport'
 
 // groups: 1: mime-type (+ charset), 2: mime-type (w/o charset), 3: charset, 4: base64?, 5: body
-export const dataUriRegex = /^\s*data:(([^/,;]+\/[^/,;]+)(?:;([^,;=]+=[^,;=]+))?)?(?:;(base64))?,(.*\s*)$/i
-
+export const dataUriRegex = /^\s*data:(([^/,;]+\/[^/,;]+)(?:;([^,;=]+=[^,;=]+))?)?(?:;(base64))?,((?:.|\s)*)$/i
 export class ImageNode extends GraphicsNode {
   private readonly imageLoadingPromise: Promise<{ data: string; format: string }> | null = null
   private readonly imageUrl: string | null
@@ -87,7 +86,7 @@ export class ImageNode extends GraphicsNode {
       } catch (e) {
         typeof console === 'object' &&
           console.warn &&
-          console.warn(`Could not load image ${this.imageUrl}.\n${e}`)
+          console.warn(`Could not load image ${this.imageUrl}. \n${e}`)
       }
     }
   }
@@ -118,7 +117,9 @@ export class ImageNode extends GraphicsNode {
       format = mimeTypeParts[1]
 
       data = match[5]
+
       if (match[4] === 'base64') {
+        data = data.replace(/\s/g, '')
         data = atob(data)
       } else {
         data = decodeURIComponent(data)

diff --git a/test/common/tests.js b/test/common/tests.js
@@ -31,6 +31,7 @@ window.tests = [
   'gradient-units',
   'gradients-and-patterns-mixed',
   'hidden-clippath',
+  'image-data-urls-base64-spaces',
   'image-svg-urls',
   'line-default-coordinates',
   'markers',

diff --git a/test/specs/image-data-urls-base64-spaces/reference.pdf b/test/specs/image-data-urls-base64-spaces/reference.pdf
diff --git a/test/specs/image-data-urls-base64-spaces/spec.svg b/test/specs/image-data-urls-base64-spaces/spec.svg