@oracle/oraclejet 20.1.1 → 20.1.3

package/dist/js/libs/oj/debug/ojhtmlutils.js

@@ -20,6 +20,20 @@ define(['exports'], function (exports) { 'use strict';
    * the input to prevent unsafe content from being added to the page.</p>
    */
   const HtmlUtils = {};
+  const _ESCAPED_TAGS = [
+    'table',
+    'caption',
+    'colgroup',
+    'col',
+    'thead',
+    'tfoot',
+    'th',
+    'tbody',
+    'tr',
+    'td',
+    'template',
+    'p'
+  ];
 
   /**
    * Utility that will parse an HTML string into an array of DOM Nodes.
@@ -30,20 +44,7 @@ define(['exports'], function (exports) { 'use strict';
    */
   HtmlUtils.stringToNodeArray = function (html) {
     // escape html for the predefined tags
-    var tags = [
-      'table',
-      'caption',
-      'colgroup',
-      'col',
-      'thead',
-      'tfoot',
-      'th',
-      'tbody',
-      'tr',
-      'td',
-      'template',
-      'p'
-    ];
+    var tags = _ESCAPED_TAGS;
     var i;
 
     for (i = 0; i < tags.length; i++) {
@@ -122,25 +123,21 @@ define(['exports'], function (exports) { 'use strict';
       const BIND_REPLACE = 'oj-bind-replace-';
       if (nodeName.substr(0, 16) === BIND_REPLACE) {
         var replName = nodeName.substr(16);
-        replNode = document.createElement(replName); // @HTMLUpdateOK
-        for (j = 0; j < child.attributes.length; j++) {
-          attr = child.attributes[j];
-          replNode.setAttribute(attr.name, attr.value); // @HTMLUpdateOK
+        if (_ESCAPED_TAGS.indexOf(replName) !== -1) {
+          replNode = document.createElement(replName); // @HTMLUpdateOK
+          for (j = 0; j < child.attributes.length; j++) {
+            attr = child.attributes[j];
+            replNode.setAttribute(attr.name, attr.value); // @HTMLUpdateOK
+          }
+          var childHolder = replNode.content ? replNode.content : replNode;
+          for (j = 0; child.childNodes.length > 0; ) {
+            childHolder.appendChild(child.childNodes[0]);
+          }
+          parent.replaceChild(replNode, child);
         }
-        var childHolder = replNode.content ? replNode.content : replNode;
-        for (j = 0; child.childNodes.length > 0; ) {
-          childHolder.appendChild(child.childNodes[0]);
-        }
-        parent.replaceChild(replNode, child);
       } else if (nodeName === 'script' || nodeName === 'style') {
-        replNode = document.createElement(nodeName); // @HTMLUpdateOK
-        for (j = 0; j < child.attributes.length; j++) {
-          attr = child.attributes[j];
-          replNode.setAttribute(attr.name, attr.value); // @HTMLUpdateOK
-        }
-        var origHTML = child.innerHTML; // @HTMLUpdateOK
-        replNode.innerHTML = origHTML.replace(new RegExp(BIND_REPLACE, 'g'), ''); // @HTMLUpdateOK
-        parent.replaceChild(replNode, child);
+        var origText = child.textContent || '';
+        child.textContent = origText.replace(new RegExp(BIND_REPLACE, 'g'), '');
       } else if (child.nodeType === 8) {
         // comment node
         var origValue = child.nodeValue;

package/dist/js/libs/oj/debug/ojkoshared.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['ojs/ojcore-base', 'knockout', 'ojs/ojconfig', 'ojs/ojlogger', 'ojs/ojhtmlutils'], function (oj, ko, Config, Logger, HtmlUtils) { 'use strict';
+define(['ojs/ojcore-base', 'knockout', 'ojs/ojconfig', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcspexpressionevaluator-internal'], function (oj, ko, Config, Logger, HtmlUtils, ojcspexpressionevaluatorInternal) { 'use strict';
 
   oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
 
@@ -196,19 +196,16 @@ define(['ojs/ojcore-base', 'knockout', 'ojs/ojconfig', 'ojs/ojlogger', 'ojs/ojht
           return evaluate([$context.$data || {}, $context]);
         };
       }
-
-      var evaluator;
-      try {
-        /* jslint evil:true */
-        // eslint-disable-next-line no-new-func
-        evaluator = new Function( // @HTMLUpdateOK
-          '$context',
-          'with($context){with($data||{}){return ' + expressionText + ';}}'
-        ); // binding expression evaluation
-      } catch (e) {
-        throw new Error(e.message + ' in expression "' + expressionText + '"');
+      var fallbackEvaluator = Config.getFallbackExpressionEvaluator();
+      if (fallbackEvaluator) {
+        return fallbackEvaluator.createBindingExpressionEvaluator(expressionText);
       }
-      return evaluator;
+      var defaultEvaluate = new ojcspexpressionevaluatorInternal.CspExpressionEvaluatorInternal().createEvaluator(
+        expressionText
+      ).evaluate;
+      return function ($context) {
+        return defaultEvaluate([$context.$data || {}, $context]);
+      };
     };
 
     this.createEvaluator = function (expression, bindingContext) {
@@ -431,20 +428,16 @@ define(['ojs/ojcore-base', 'knockout', 'ojs/ojconfig', 'ojs/ojlogger', 'ojs/ojht
           return evaluate([$context, $context.$data || {}, { $element: $element }]);
         };
       }
-
-      var evaluator;
-      try {
-        /* jslint evil:true */
-        // eslint-disable-next-line no-new-func
-        evaluator = new Function( // @HTMLUpdateOK
-          '$context',
-          '$element',
-          'with($context.$data||{}){with($context){return ' + expressionText + '}}'
-        ); // binding expression evaluation
-      } catch (e) {
-        throw new Error(e.message + ' in expression "' + expressionText + '"');
+      var fallbackEvaluator = Config.getFallbackExpressionEvaluator();
+      if (fallbackEvaluator) {
+        return fallbackEvaluator.createReplacementEvaluatorForExtend(expressionText);
       }
-      return evaluator;
+      var defaultEvaluate = new ojcspexpressionevaluatorInternal.CspExpressionEvaluatorInternal().createEvaluator(
+        expressionText
+      ).evaluate;
+      return function ($context, $element) {
+        return defaultEvaluate([$context, $context.$data || {}, { $element: $element }]);
+      };
     }
 
     function _createEvaluatorViaCache(factory, expr, bindingContext) {
@@ -516,7 +509,10 @@ define(['ojs/ojcore-base', 'knockout', 'ojs/ojconfig', 'ojs/ojlogger', 'ojs/ojht
     return function (bindingsString, bindingContext, node, options) {
       var factory = Config.getExpressionEvaluator();
       if (!factory) {
-        return original(bindingsString, bindingContext, node, options);
+        if (Config.getFallbackExpressionEvaluator()) {
+          return original(bindingsString, bindingContext, node, options);
+        }
+        factory = new ojcspexpressionevaluatorInternal.CspExpressionEvaluatorInternal();
       }
       var evaluate = _createKoEvaluatorViaCache(bindingsString, options, factory, cache);
       return evaluate([bindingContext.$data || {}, bindingContext, { $element: node }]);

package/dist/js/libs/oj/debug/ojlabel.js

@@ -403,11 +403,14 @@ define(['ojs/ojcore', 'ojs/ojjquery-hammer', 'ojs/ojcomponentcore', 'ojs/ojpopup
          * and holds the help icon on a mobile device. No formatted text is available for
          * help definition attribute.</li>
          * <li><code class="prettyprint">source</code> - this is the help source url.
-         * If present, a help icon will
-         * render next to the label. For security reasons
-         *  we only support urls with protocol http: or https:.
-         * If the url doesn't comply we ignore it and throw an error.
-         * Pass in an encoded URL since we do not encode the URL.
+         * If present, a help icon will render next to the label.
+         * <p><b>Note:</b> For security, JET validates the URL protocol before navigation
+         * and currently supports <code class="prettyprint">http:</code> and
+         * <code class="prettyprint">https:</code> protocols. If the url doesn't
+         * comply we ignore it and throw an error. JET does not validate whether
+         * the URL is trusted for the application. Applications are responsible
+         * for providing sanitized URLs and enforcing any required origin or host
+         * allowlist. Pass in an encoded URL since we do not encode the URL.</p>
          * </ul>
          *
          * @expose
@@ -1399,6 +1402,7 @@ define(['ojs/ojcore', 'ojs/ojjquery-hammer', 'ojs/ojcomponentcore', 'ojs/ojpopup
         helpIconAnchor = document.createElement('a');
         helpIconAnchor.setAttribute('tabindex', '0');
         helpIconAnchor.setAttribute('target', '_blank');
+        helpIconAnchor.setAttribute('rel', 'noopener noreferrer');
         helpIconAnchor.className =
           'oj-label-help-icon-anchor oj-label-help-icon oj-component-icon oj-clickable-icon-nocontext';
         if (source) {

package/dist/js/libs/oj/debug/ojlistview.js

@@ -2016,7 +2016,7 @@ var __oj_list_view_metadata =
                   // if event target is within listview, but not around items, e.g. the padding
                   var active = self.m_active && self.m_active.elem;
                   if (active == null && self.element.attr('tabIndex') === '0') {
-                    self.element.focus();
+                    self._initFocus(event, true);
                   } else if (active != null) {
                     self._makeFocusable(active);
                     self.HighlightActive();
@@ -7636,7 +7636,9 @@ var __oj_list_view_metadata =
        */
       ActiveAndFocus: function (item, event, skipFocus, preventScroll) {
         // make sure that it is visible
-        this._scrollToVisible(item[0]);
+        if (!preventScroll) {
+          this._scrollToVisible(item[0]);
+        }
 
         // unhighlight any previous active item
         this.UnhighlightActive();

package/dist/js/libs/oj/debug/ojlogger.js

@@ -25,11 +25,12 @@ define(['exports', '@oracle/oraclejet-preact/utils/UNSAFE_logger'], function (ex
    *
    * <p>If the logging options are changed at a later point, the Logger will use the modified options for the subsequent log operations.
    *
-   * <p>The logging level can be overridden via sessionStorage.setItem() call for the current browser session.
+   * <p>In debug builds, the logging level can be overridden via sessionStorage.setItem() call for the current browser session.
    * Use 'ojet.logLevel' as the key with one of the following values: 'none' (least verbose), 'error', 'warning', 'info', 'log' (most verbose).
    * Set the value in the browser console and refresh the browser in order for the value to take effect.
+   * Production builds ignore this key.
    * </p>
-   * <h3> Session storage usage : </h3>
+   * <h3> Session storage usage in debug builds : </h3>
    * <pre class="prettyprint">
    * <code>
    * // override logging level for the current session

package/dist/js/libs/oj/debug/ojmessage.js

@@ -32,6 +32,34 @@ define(['require', 'exports', 'ojs/ojcore', 'ojs/ojknockout', 'ojs/ojbutton', 'o
 
   const ojMessage = {};
 
+  const ALLOWED_AUDIO_URL_PROTOCOLS = ['http:', 'https:', 'data:', 'blob:'];
+
+  function encodeCssUrlControlCharacter(char) {
+    var hex = char.charCodeAt(0).toString(16).toUpperCase();
+    return '%' + (hex.length < 2 ? '0' + hex : hex);
+  }
+
+  function escapeCssUrlString(url) {
+    var escapedUrl = '';
+    var urlString = String(url);
+    for (var i = 0; i < urlString.length; i++) {
+      var char = urlString.charAt(i);
+      var charCode = char.charCodeAt(0);
+      if (char === '"' || char === '\\') {
+        escapedUrl += '\\' + char;
+      } else if (charCode <= 0x1f || charCode === 0x7f) {
+        escapedUrl += encodeCssUrlControlCharacter(char);
+      } else {
+        escapedUrl += char;
+      }
+    }
+    return escapedUrl;
+  }
+
+  function getCssUrl(url) {
+    return 'url("' + escapeCssUrlString(url) + '")';
+  }
+
   /**
    * @ojcomponent oj.ojMessage
    * @since 5.0.0
@@ -69,10 +97,13 @@ define(['require', 'exports', 'ojs/ojcore', 'ojs/ojknockout', 'ojs/ojbutton', 'o
    *
    * <p>The {@link oj.ojMessage#message.sound} property is an accessibility feature for playing a
    * sound when a message is opened. This property defaults to "none", and can be enabled by setting
-   * it to "defaults" or by providing URL to an audio file of a format that the browser supports. An
-   * accessible application must provide a way for users to enable sound on a settings or preferences
-   * page. Some browsers will have auto-play disabled by default, enabling it may require adjusting
-   * the browser settings.</p>
+   * it to "defaults" or by providing a URL to an audio file of a format that the browser supports.
+   * Custom sound URLs are validated before playback. Relative URLs and URLs that resolve to
+   * <code class="prettyprint">http:</code>, <code class="prettyprint">https:</code>,
+   * <code class="prettyprint">data:</code>, or <code class="prettyprint">blob:</code> are
+   * supported. An accessible application must provide a way for users to enable sound on a settings
+   * or preferences page. Some browsers will have auto-play disabled by default, enabling it may
+   * require adjusting the browser settings.</p>
    *
    * <h3 id="touch-section">
    *   Touch End User Information
@@ -424,9 +455,12 @@ define(['require', 'exports', 'ojs/ojcore', 'ojs/ojknockout', 'ojs/ojbutton', 'o
    * required for low vision users who view a zoomed section of the UI. Because messages may be shown
    * outside of the zoomed section, such users require sound to be played to notify of new messages.</p>
    *
-   * <p>This attribute can take a URL of the audio file for the custom sound to be played. The
-   * supported formats are mp3, wav and ogg. Browser support should also be considered while choosing
-   * the format of the audio file. Literal string values
+   * <p>This attribute can take a URL of the audio file for the custom sound to be played. Custom
+   * sound URLs are validated before playback. Relative URLs and URLs that resolve to
+   * <code class="prettyprint">http:</code>, <code class="prettyprint">https:</code>,
+   * <code class="prettyprint">data:</code>, or <code class="prettyprint">blob:</code> are
+   * supported. The supported formats are mp3, wav and ogg. Browser support should also be considered
+   * while choosing the format of the audio file. Literal string values
    * <code class="prettyprint">"defaults"</code> and <code class="prettyprint">"none"</code> can also
    * be used for this attribute. If the value is set to "none", then the sound will be disabled. If
    * the value is set to "defaults", then a default sound is played.<p>
@@ -1260,7 +1294,7 @@ define(['require', 'exports', 'ojs/ojcore', 'ojs/ojknockout', 'ojs/ojbutton', 'o
       return undefined;
     }
 
-    return ["url('", message.icon, "') no-repeat"].join('');
+    return getCssUrl(message.icon) + ' no-repeat';
   };
 
   MessageViewModel.prototype._computeIconClass = function () {
@@ -1493,6 +1527,13 @@ define(['require', 'exports', 'ojs/ojcore', 'ojs/ojknockout', 'ojs/ojbutton', 'o
   MessageViewModel.prototype._playSound = function (sound) {
     // Custom URL was specified for the sound, using <audio> element is simple and best for this case.
     if (sound !== 'defaults') {
+      try {
+        DomUtils.validateURL(sound, ALLOWED_AUDIO_URL_PROTOCOLS);
+      } catch (error) {
+        Logger.info(`JET oj-message: Invalid URL in message.sound='${sound}'. Error: ${error}`);
+        return;
+      }
+
       var audio = document.createElement('AUDIO');
       audio.src = sound;
 

package/dist/js/libs/oj/debug/ojmessagebanner.js

@@ -1357,9 +1357,12 @@ define(['exports', 'preact/jsx-runtime', 'preact/hooks', 'preact', 'ojs/ojconfig
      * <p>The <code class="prettyprint">MessageBannerItem["sound"]</code> property is an accessibility
      * feature for playing a sound when a message is opened. This property defaults to "none", and can
      * be enabled by setting it to "default" or by providing a URL to an audio file of a format that the
-     * browser supports. An accessible application must provide a way for users to enable sound on a
-     * settings or preferences page. Some browsers will have auto-play disabled by default, enabling
-     * it may require adjusting the browser settings.</p>
+     * browser supports. Custom sound URLs are validated before playback. Relative URLs and URLs that
+     * resolve to <code class="prettyprint">http:</code>, <code class="prettyprint">https:</code>,
+     * <code class="prettyprint">data:</code>, or <code class="prettyprint">blob:</code> are
+     * supported. An accessible application must provide a way for users to enable sound on a settings
+     * or preferences page. Some browsers will have auto-play disabled by default, enabling it may
+     * require adjusting the browser settings.</p>
      *
      * <h3 id="keyboard-section">
      *   Keyboard End User Information

package/dist/js/libs/oj/debug/ojmetadatautils.js

@@ -159,7 +159,15 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojcustomelement-utils'], function (ex
     if (subProp) {
       const namePath = propPath.split('.');
       for (let i = 0; i < namePath.length; i++) {
-        subProp = subProp[namePath[i]];
+        const propName = namePath[i];
+        if (
+          oj.CollectionUtils._isBlockedKey(propName) ||
+          !Object.prototype.hasOwnProperty.call(subProp, propName)
+        ) {
+          subProp = undefined;
+        } else {
+          subProp = subProp[propName];
+        }
         if (i === 0) {
           prop = subProp;
         }