@sapui5/sap.ushell 1.124.8 → 1.124.10

package/src/main/js/sap/ushell/appRuntime/ui5/services/Extension/Item.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines a generic interface for extension items in ShellAreas.
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService"

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ushell/bootstrap/_SchedulingAgent/logger",

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",

package/src/main/js/sap/ushell/bootstrap/common/common.util.js

@@ -12,6 +12,8 @@ sap.ui.define([
 ) {
     "use strict";
 
+    const OBJECT_PROTOTYPE_KEYS = Object.getOwnPropertyNames(Object.prototype);
+
     /**
      * The method will fail if the given object has a cyclic reference.
      *
@@ -91,6 +93,11 @@ sap.ui.define([
         oActualConfigToMerge = bCloneConfigToMerge ? JSON.parse(JSON.stringify(oConfigToMerge)) : oConfigToMerge;
 
         Object.keys(oActualConfigToMerge).forEach(function (sKey) {
+            // Prevent overriding of object prototype properties to avoid prototype pollution attacks
+            if (OBJECT_PROTOTYPE_KEYS.includes(sKey)) {
+                return;
+            }
+
             if (typeof oMutatedBaseConfig[sKey] === "object" && typeof oActualConfigToMerge[sKey] === "object") {
                 mergeConfig(oMutatedBaseConfig[sKey], oActualConfigToMerge[sKey], false);
                 return;

package/src/main/js/sap/ushell/bootstrap/sandbox2.js

@@ -4,9 +4,11 @@
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  * This is the version that creates spaces/pages runtime environment.
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
+const OBJECT_PROTOTYPE_KEYS = Object.getOwnPropertyNames(Object.prototype);
+
 /* eslint-disable quote-props */
 (function () {
     "use strict";
@@ -63,6 +65,11 @@
                     const oConfigToMerge = bCloneCustom ? JSON.parse(JSON.stringify(oCustomConfig)) : oCustomConfig;
 
                     Object.entries(oConfigToMerge).forEach(([sKey, oValue]) => {
+                        // Prevent overriding of object prototype properties to avoid prototype pollution attacks
+                        if (OBJECT_PROTOTYPE_KEYS.includes(sKey)) {
+                            return;
+                        }
+
                         if (Object.prototype.toString.apply(oBaseConfig[sKey]) === "[object Object]" &&
                             Object.prototype.toString.apply(oValue) === "[object Object]") {
                             mergeConfig(oBaseConfig[sKey], oValue, false);

package/src/main/js/sap/ushell/components/appfinder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/Element",
@@ -233,9 +233,7 @@ sap.ui.define([
             var oStorageEntry = Storage.get(sAppId);
 
             if (oStorageEntry) {
-                RelatedServices.store(oStorageEntry.service);
                 Application.store(oStorageEntry);
-                AppMeta.store(oStorageEntry.meta);
                 oStorageEntry.stateStored = true;
             }
         };
@@ -324,10 +322,10 @@ sap.ui.define([
             var oStorageEntry = Storage.get(sAppId);
 
             if (oStorageEntry && oStorageEntry.stateStored === true) {
-                Application.restore(oStorageEntry);
                 RelatedServices.restore(oStorageEntry.service);
                 this.setBackNavigationChanged(true);
                 AppMeta.restore();
+                Application.restore(oStorageEntry);
             }
         };
 
@@ -384,7 +382,7 @@ sap.ui.define([
                 if (BlueBoxHandler.isStatefulContainer(oFrom)) {
                     oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
 
-                //STATELESS
+                    //STATELESS
                 } else if (Storage.get(sFromId)) {
                     // Back Navigation Case
                     if (RelatedServices.isBackNavigation() === true && !isHomePage) {
@@ -397,7 +395,7 @@ sap.ui.define([
                             oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
                         }
 
-                    // Forward Navigation Cases
+                        // Forward Navigation Cases
                     } else if (oFrom.getApplicationType() === "UI5") {
                         // Wait until navigation's source app has been started completey, so that a later back navigation finds a proper app that
                         // can be re-enabled (keep-alive scenario)
@@ -407,13 +405,13 @@ sap.ui.define([
                     }
                     EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
 
-                // LEGACY STATEFUL (WebGUI)
+                    // LEGACY STATEFUL (WebGUI)
                 } else if (oFrom.getStatefulType && oFrom.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
                     if (isHomePage) {
                         oPromiseAppClose = PostMessageUtils.postMessageToIframeApp(oFrom, "sap.gui", "triggerCloseSessionImmediately");
                     }
 
-                // THE REST...
+                    // THE REST...
                 } else {
                     bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oFrom.getApplicationType) >= 0;
 
@@ -545,6 +543,35 @@ sap.ui.define([
             return false;
         };
 
+        /**
+         * Stores the state of the current application
+         *  - back navigation
+         *  - title, hierarchy, relatedApps
+         *  - currentState, controlManager
+         * @returns {Promise} Resolves when the store is done.
+         *
+         * @since 1.128.0
+         * @private
+         */
+        this.storeAppExtensions = async function () {
+            const oCurrentApp = this.getCurrentApplication();
+            if (!oCurrentApp) {
+                return;
+            }
+            const sAppId = oCurrentApp.appId;
+
+            const oStorageEntry = Storage.get(sAppId);
+
+            if (!oStorageEntry) {
+                return;
+            }
+
+            // back navigation
+            RelatedServices.store(oStorageEntry.service);
+            // title, hierarchy, relatedApps
+            AppMeta.store(oStorageEntry.meta);
+        };
+
         this.isAppOfTypeCached = function (appId, bIsAppOfTypeCachable, oKeepAliveMode) {
             var sKeepAlive;
 
@@ -891,10 +918,10 @@ sap.ui.define([
                                         }
                                     }
                                     if (oSetup.isIframeValid === true) {
-                                        arrCap.push({action: "iframeIsValid", service: "sap.ushell.appRuntime"});
+                                        arrCap.push({ action: "iframeIsValid", service: "sap.ushell.appRuntime" });
                                     }
                                     if (oSetup.session && oSetup.session.bLogoutSupport === true) {
-                                        arrCap.push({action: "logout", service: "sap.ushell.sessionHandler"});
+                                        arrCap.push({ action: "logout", service: "sap.ushell.sessionHandler" });
                                     }
                                     if (arrCap.length > 0) {
                                         BlueBoxHandler.addCapabilities(oServiceParams.oContainer, arrCap);
@@ -999,6 +1026,10 @@ sap.ui.define([
             return oCurrentApplication;
         };
 
+        this.unsetCurrentApplication = function () {
+            oCurrentApplication = {};
+        };
+
         this.setApplicationFullWidth = function (bIsFull) {
             var oCurrent = this.getCurrentApplication();
 
@@ -1253,7 +1284,7 @@ sap.ui.define([
         };
 
         this.handleOpenStateful = function (bIsInitial, bIsInCache, sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode,
-                                            bNavigationInSameStatefullContainer, bReturnedFromKeepAlivePoolFLPV2) {
+            bNavigationInSameStatefullContainer, bReturnedFromKeepAlivePoolFLPV2) {
             var that = this,
                 oPromise;
 
@@ -1365,7 +1396,7 @@ sap.ui.define([
             //    of containers to it can be used again for the upcomming opened app)
             bReuseStatefulContainer = BlueBoxHandler.isStatefulContainer(oCurrentAppContainer);
             var bSourceIsKeepAliveFromPool = BlueBoxHandler.isStatefulContainerInKeepAlivePool(oCurrentAppContainer) &&
-                    oCurrentAppContainer.getCurrentAppId && (oCurrentAppContainer.getCurrentAppId().length > 0);
+                oCurrentAppContainer.getCurrentAppId && (oCurrentAppContainer.getCurrentAppId().length > 0);
             if (bReuseStatefulContainer || bSourceIsKeepAliveFromPool) {
                 oPromiseAppClose = this.handleExitApplication(sOldFullAppId, oCurrentAppContainer, undefined, undefined, false, false);
                 if (oCurrentAppContainer === oTargetAppContainer) {
@@ -1553,6 +1584,22 @@ sap.ui.define([
                                 // Activate container before showing it (start reacting to postMessage calls)
                                 that.activeContainer(oInnerControl);
                             }
+                            /*
+                             * The oCurrentApplication object does not reflect the currently opened application.
+                             * This leads to store/restore calls on the wrong application.
+                             * Create application that is not persisted and not cashed as a fallback.
+                             *
+                             * This issue occurs for iframe applications reusing the iframe.
+                             */
+                            if (oCurrentApplication.appId !== sFullAppId) {
+                                oCurrentApplication = {
+                                    appId: sFullAppId,
+                                    stt: "loading",
+                                    container: oInnerControl,
+                                    meta: AppConfiguration.getMetadata(oTarget),
+                                    app: undefined
+                                };
+                            }
                             oDeferredOpenApp.resolve();
                         });
                     });

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.124.8
+ * @version 1.124.10
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/contentFinder/Component.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

package/src/main/js/sap/ushell/components/contentFinder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/contentFinderStandalone/Component.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder standalone Component
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinderStandalone/controller/ContentFinderStandalone.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog standalone root view
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/contentFinderStandalone/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinderStandalone",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "ach": "CA-FLP-FE-UI",
         "type": "component",

package/src/main/js/sap/ushell/components/contentFinderStandalone/manifestAppSearch.json

@@ -3,7 +3,7 @@
   "sap.app": {
     "id": "sap.ushell.components.contentFinder",
     "applicationVersion": {
-      "version": "1.124.8"
+      "version": "1.124.10"
     },
     "i18n": "../contentFinder/resources/resources.properties",
     "ach": "CA-FLP-FE-UI",

package/src/main/js/sap/ushell/components/factsheet/Component.js

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.124.8",
+            version: "1.124.10",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -20,7 +20,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.124.8
+ * @version 1.124.10
  *
  * @deprecated since 1.112
  */

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.124.8
+ * @version 1.124.10
  *
  * @deprecated since 1.112
  * @private

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.124.8
+ * @version 1.124.10
  * @since 1.35.0
  *
  * @deprecated since 1.112

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.124.8
+ * @version 1.124.10
  * @since 1.35.0
  *
  * @deprecated since 1.112

package/src/main/js/sap/ushell/components/homepage/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.homepage",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/Component.js

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.124.8
+ * @version 1.124.10
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.124.8
+ * @version 1.124.10
  */
 sap.ui.define([
     "sap/ui/core/Element",

package/src/main/js/sap/ushell/components/pages/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.124.8
+ * @version 1.124.10
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",

package/src/main/js/sap/ushell/components/runtimeSwitcher/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.124.8
+ * @version 1.124.10
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/Notifications/Component.js

@@ -48,7 +48,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.124.8",
+            version: "1.124.10",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/ProductSwitch/Component.js

@@ -33,7 +33,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.124.8",
+            version: "1.124.10",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Search/manifest.json

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.124.8"
+            "version": "1.124.10"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SearchCEP/Component.js

@@ -31,7 +31,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.124.8",
+            version: "1.124.10",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]