@devvit/shared-types 0.10.23-next-2024-06-11-e174d5815.0 → 0.10.23-next-2024-06-11-a1863df2d.0

package/imageUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageUtil.d.ts","sourceRoot":"","sources":["../src/imageUtil.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAChD,eAAO,MAAM,YAAY,oBAAoB,CAAC;AAC9C,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,wBAAwB,EAAE,SAAS,MAAM,EAA2C,CAAC;AAClG,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAK/C,CAAC;AAoBF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAgBzD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiCrE"}
+{"version":3,"file":"imageUtil.d.ts","sourceRoot":"","sources":["../src/imageUtil.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAChD,eAAO,MAAM,YAAY,oBAAoB,CAAC;AAC9C,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,wBAAwB,EAAE,SAAS,MAAM,EAA2C,CAAC;AAClG,eAAO,MAAM,kBAAkB,EAAE,SAAS,MAAM,EAK/C,CAAC;AAoBF;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAgBzD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA8DrE"}

package/imageUtil.js

@@ -57,9 +57,9 @@ export function isValidImageURL(imageUrl) {
 export function sanitizeImageURL(imageUrl) {
     try {
         const url = new URL(imageUrl);
-        // nothing to sanitize for http(s)
-        if (url.protocol.startsWith('http')) {
-            return url.toString();
+        // nothing to sanitize
+        if (url.protocol.startsWith('http') || url.protocol.startsWith('blob')) {
+            return imageUrl;
         }
         const [mediaType, data] = url.pathname.split(',');
         const [mimetype] = mediaType.split(';');
@@ -68,14 +68,41 @@ export function sanitizeImageURL(imageUrl) {
             return imageUrl;
         }
         const base64 = mediaType.split(';').at(-1) === 'base64';
+        let svgData;
+        // don't do this on base64 content! `=` => `%3D`!
+        if (!base64) {
+            /**
+             * In data url land there are characters that need to be encoded that
+             * a user may have passed in like hex-code colors that will break
+             * the image without giving any relevant messages.
+             *
+             * - `#` and '?' are special separators in the path segment of a URL
+             * - a data URL utilizes the path segment for the entirety of its contents
+             * - parsing a data URL with those special characters will break up the data
+             *   between path, hash, and query
+             *
+             * URL {
+             *   href: 'data:text/text;charset=UTF-8,Hello, how are you? May I borrow your #2 pencil?',
+             *   protocol: 'data:',
+             *   pathname: 'text/text;charset=UTF-8,Hello, how are you',
+             *   search: '?%20May%20I%20borrow%20your%20',
+             *   hash: '#2%20pencil?'
+             * }
+             */
+            // get the data from the original string since URL() may have messed things up
+            svgData = imageUrl.slice(imageUrl.indexOf(',') + 1);
+        }
+        else {
+            svgData = atob(data);
+        }
         // extract SVG
-        const svg = decodeURIComponent(base64 ? atob(data) : data);
+        const svg = decodeURIComponent(svgData);
         // sanitize
         const safeSvg = sanitizeSvg(svg);
         if (safeSvg === undefined) {
             return undefined;
         }
-        // repack in the same way it came in
+        // URI encode if we're not base64 encoding to ensure the img tag doesn't choke on `#` and `?` characters
         const safeData = base64 ? btoa(safeSvg) : encodeURIComponent(safeSvg);
         return `data:${mediaType},${safeData}`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/shared-types",
-  "version": "0.10.23-next-2024-06-11-e174d5815.0",
+  "version": "0.10.23-next-2024-06-11-a1863df2d.0",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -23,12 +23,12 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.10.23-next-2024-06-11-e174d5815.0"
+    "@devvit/protos": "0.10.23-next-2024-06-11-a1863df2d.0"
   },
   "devDependencies": {
     "@devvit/eslint-config": "0.10.22",
     "@devvit/repo-tools": "0.10.22",
-    "@devvit/tsconfig": "0.10.23-next-2024-06-11-e174d5815.0",
+    "@devvit/tsconfig": "0.10.23-next-2024-06-11-a1863df2d.0",
     "@types/redis-mock": "0.17.1",
     "eslint": "8.9.0",
     "lit": "2.2.8",
@@ -41,5 +41,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "e853b4bd24243df244166f7e85c23e750a134278"
+  "gitHead": "e6fc1cf72a27729540706a5f45ff5cbaab3b0a28"
 }