Merge branch 'main' into jeongsoolee09/fix-ui5-fn

mbaluda · web-flow · commit 8db974b7de97 · 2025-10-30T17:59:46.000+01:00
diff --git a/javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/RemoteFlowSources.qll b/javascript/frameworks/ui5/lib/advanced_security/javascript/frameworks/ui5/RemoteFlowSources.qll
@@ -113,14 +113,16 @@ class ODataServiceModel extends UI5ExternalModel {
     )
     or
     /*
-     * A constructor call to `sap.ui.model.odata.v2.ODataModel`.
+     * A constructor call to sap.ui.model.odata.v2.ODataModel or sap.ui.model.odata.v4.ODataModel.
      */
 
     this instanceof NewNode and
     (
       exists(RequiredObject oDataModel |
         oDataModel.asSourceNode().flowsTo(this.getCalleeNode()) and
-        oDataModel.getDependency() = "sap/ui/model/odata/v2/ODataModel"
+        oDataModel.getDependency() in [
+            "sap/ui/model/odata/v2/ODataModel", "sap/ui/model/odata/v4/ODataModel"
+          ]
       )
       or
       this.getCalleeName() = "ODataModel"

Original file line number	Diff line number	Diff line change
`@@ -113,14 +113,16 @@ class ODataServiceModel extends UI5ExternalModel {`
`113`	`113`	`)`
`114`	`114`	`or`
`115`	`115`	`/*`
`116`		- * A constructor call to `sap.ui.model.odata.v2.ODataModel`.
	`116`	`+ * A constructor call to sap.ui.model.odata.v2.ODataModel or sap.ui.model.odata.v4.ODataModel.`
`117`	`117`	`*/`
`118`	`118`
`119`	`119`	`this instanceof NewNode and`
`120`	`120`	`(`
`121`	`121`	`exists(RequiredObject oDataModel \|`
`122`	`122`	`oDataModel.asSourceNode().flowsTo(this.getCalleeNode()) and`
`123`		`- oDataModel.getDependency() = "sap/ui/model/odata/v2/ODataModel"`
	`123`	`+ oDataModel.getDependency() in [`
	`124`	`+ "sap/ui/model/odata/v2/ODataModel", "sap/ui/model/odata/v4/ODataModel"`
	`125`	`+ ]`
`124`	`126`	`)`
`125`	`127`	`or`
`126`	`128`	`this.getCalleeName() = "ODataModel"`