fix: SD-9364 Use CDN Original images for webdav - cache control

Author: christensenep

helpers/lib/cdnify.js

@@ -56,7 +56,14 @@ module.exports = globals => {
             }
 
             if (protocol === 'webdav:') {
-                return [cdnUrl, 'content', path].join('/');
+                const supportedImageExtensions = ['jpg', 'jpeg', 'gif', 'png'];
+                const unsupportedPathSyntaxes = ['../', './'];
+                const searchParamIgnoredPath = path.split('?')[0];
+                const isImage = supportedImageExtensions.some(ext => searchParamIgnoredPath.toLowerCase().endsWith(ext));
+                const isTraversedPathUsed = unsupportedPathSyntaxes.some(syntax => searchParamIgnoredPath.startsWith(syntax));
+                // to avoid breaking changes, we keep paths for webdav content unchanged if the path is traversed
+                const prefix = isImage && !isTraversedPathUsed ? 'images/stencil/original/content' : 'content'
+                return [cdnUrl, prefix, path].join('/');
             }
 
             if (cdnSettings) {

spec/helpers/cdn.js

@@ -194,19 +194,60 @@ describe('cdn helper', function () {
         ], done);
     });
 
-    it('should return a webDav asset if webdav protocol specified', function (done) {
+    it('should return an original cdn img asset if webdav protocol specified but file type indicates it is an image', function (done) {
         runTestCases([
             {
                 input: '{{cdn "webdav:img/image.jpg"}}',
-                output: 'https://cdn.bcapp/3dsf74g/content/img/image.jpg',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.jpg',
             },
             {
-                input: '{{cdn "webdav:/img/image.jpg"}}',
-                output: 'https://cdn.bcapp/3dsf74g/content/img/image.jpg',
+                input: '{{cdn "webdav:/img/image.jpeg"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.jpeg',
             },
             {
-                input: '{{cdn "webdav://img/image.jpg"}}',
-                output: 'https://cdn.bcapp/3dsf74g/content/img/image.jpg',
+                input: '{{cdn "webdav://img/image.gif"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.gif',
+            },
+            {
+                input: '{{cdn "webdav://img/image.png"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.png',
+            },
+            {
+                input: '{{cdn "webdav:img/image.jpg?040620250934"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.jpg?040620250934',
+            },
+            {
+                input: '{{cdn "webdav:img/image.png?cache_bust=1749005114992"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.png?cache_bust=1749005114992',
+            },
+            {
+                input: '{{cdn "webdav:img/image.png?040620250934&cache_bust=1749005114992"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.png?040620250934&cache_bust=1749005114992',
+            },
+            {
+                input: '{{cdn "webdav:img/image.png?foo=bar&cache_bust=1749005114992"}}',
+                output: 'https://cdn.bcapp/3dsf74g/images/stencil/original/content/img/image.png?foo=bar&cache_bust=1749005114992',
+            },
+        ], done);
+    });
+
+    it('should return a webDav asset if webdav protocol specified but is not a supported image type', function (done) {
+        runTestCases([
+            {
+                input: '{{cdn "webdav:img/image.pdf"}}',
+                output: 'https://cdn.bcapp/3dsf74g/content/img/image.pdf',
+            },
+            {
+                input: '{{cdn "webdav:/img/image.pdf"}}',
+                output: 'https://cdn.bcapp/3dsf74g/content/img/image.pdf',
+            },
+            {
+                input: '{{cdn "webdav://img/image.pdf"}}',
+                output: 'https://cdn.bcapp/3dsf74g/content/img/image.pdf',
+            },
+            {
+                input: '{{cdn "webdav://gifts/image.pdf"}}',
+                output: 'https://cdn.bcapp/3dsf74g/content/gifts/image.pdf',
             },
         ], done);
     });