Merge branch 'eclipse-tractusx:main' into feat/Extend-error-states-v6

kunyao-cofinity-x · Nov 20, 2024 · 6c101eb · 6c101eb
2 parents e044b0b + 28e8a3f
commit 6c101eb
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,7 +38,9 @@ For changes to the BPDM Helm charts please consult the [changelog](charts/bpdm/C
 - BPDM Gate: Fixed construction logic for states and identifiers by enabling business partner type ([#1067](https://github.com/eclipse-tractusx/bpdm/pull/1067))
 - BPDM Pool: When processing golden record tasks the Pool now ignores isCatenaXMemberData field if it is set to null. ([#1069](https://github.com/eclipse-tractusx/bpdm/issues/1069))
 - BPDM Gate: Fixed gate output logic to provide states based on business partner type. ([#1097](https://github.com/eclipse-tractusx/bpdm/pull/1097))
-- BPDM Cleaning Service Dummy: Removed assignment of uncategorized identifier while performing cleaning task process. ([#1098](https://github.com/eclipse-tractusx/bpdm/pull/1098))  
+- BPDM Cleaning Service Dummy: Removed assignment of uncategorized identifier while performing cleaning task process. ([#1098](https://github.com/eclipse-tractusx/bpdm/pull/1098))
+- BPDM Pool: Fix error querying legal forms when non-gleif legacy legal forms are present in the database ([#1107](https://github.com/eclipse-tractusx/bpdm/issues/1107))
+- BPDM: Fix denial of service attack vulnerability CVE-2024-47535 ([#1112](https://github.com/eclipse-tractusx/bpdm/issues/1112))
 
 ## [6.1.0] - [2024-07-15]
 

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -60,7 +60,7 @@ maven/mavencentral/io.netty/netty-codec-http/4.1.114.Final, Apache-2.0 AND BSD-3
 maven/mavencentral/io.netty/netty-codec-http2/4.1.114.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec-socks/4.1.114.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-codec/4.1.114.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-common/4.1.114.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-common/4.1.115.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
 maven/mavencentral/io.netty/netty-handler-proxy/4.1.114.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-handler/4.1.114.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.114.Final, Apache-2.0, approved, #6367
@@ -229,11 +229,11 @@ maven/mavencentral/org.springframework/spring-tx/6.1.14, Apache-2.0, approved, #
 maven/mavencentral/org.springframework/spring-web/6.1.14, Apache-2.0, approved, #15188
 maven/mavencentral/org.springframework/spring-webflux/6.1.14, Apache-2.0, approved, #12593
 maven/mavencentral/org.springframework/spring-webmvc/6.1.14, Apache-2.0, approved, #15182
-maven/mavencentral/org.testcontainers/database-commons/1.20.2, Apache-2.0, approved, #16630
-maven/mavencentral/org.testcontainers/jdbc/1.20.2, Apache-2.0, approved, #16621
-maven/mavencentral/org.testcontainers/junit-jupiter/1.20.2, MIT, approved, #16552
-maven/mavencentral/org.testcontainers/postgresql/1.20.2, MIT, approved, #16627
-maven/mavencentral/org.testcontainers/testcontainers/1.20.2, MIT, approved, #15747
+maven/mavencentral/org.testcontainers/database-commons/1.20.3, Apache-2.0, approved, #16630
+maven/mavencentral/org.testcontainers/jdbc/1.20.3, Apache-2.0, approved, #16621
+maven/mavencentral/org.testcontainers/junit-jupiter/1.20.3, MIT, approved, #16552
+maven/mavencentral/org.testcontainers/postgresql/1.20.3, MIT, approved, #16627
+maven/mavencentral/org.testcontainers/testcontainers/1.20.3, MIT, approved, #15747
 maven/mavencentral/org.webjars/swagger-ui/5.17.14, Apache-2.0 AND MIT, approved, #15701
 maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272
 maven/mavencentral/org.yaml/snakeyaml/2.2, Apache-2.0 AND (Apache-2.0 OR BSD-3-Clause OR EPL-1.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later), approved, #10232
diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerService.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerService.kt
@@ -97,10 +97,10 @@ class BusinessPartnerService(
         logger.debug { "Executing upsertBusinessPartnersOutput() with parameters $requests" }
 
         val existingOutputs = businessPartnerRepository.findBySharingStateInAndStage(requests.map { it.sharingState }, StageType.Output)
-        val existingOutputsByExternalId = existingOutputs.associateBy { it.sharingState.externalId }
+        val existingOutputsBySharingStateId = existingOutputs.associateBy { it.sharingState.id }
 
         val updatedEntities = requests.map { request ->
-            val existingOutput = existingOutputsByExternalId[request.sharingState.externalId]
+            val existingOutput = existingOutputsBySharingStateId[request.sharingState.id]
             val updatedData = outputUpsertMappings.toEntity(request.upsertData, request.sharingState)
 
             upsertFromEntity(existingOutput, updatedData)

diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/entity/LegalFormDb.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/entity/LegalFormDb.kt
@@ -54,7 +54,7 @@ class LegalFormDb(
     @JoinColumn(name = "region_id")
     val administrativeArea: RegionDb?,
 
-    @Column(name = "is_active")
+    @Column(name = "is_active", nullable = false)
     val isActive: Boolean
 
 ) : BaseEntity()
diff --git a/bpdm-pool/src/main/resources/db/migration/V6_2_0_4__make_legal_form_active_not_nullable.sql b/bpdm-pool/src/main/resources/db/migration/V6_2_0_4__make_legal_form_active_not_nullable.sql
@@ -0,0 +1,6 @@
+UPDATE legal_forms
+SET is_active = false
+WHERE is_active IS NULL;
+
+ALTER TABLE legal_forms
+ALTER COLUMN is_active SET NOT NULL;
diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml
@@ -22,8 +22,8 @@ apiVersion: v2
 name: bpdm
 type: application
 description: A Helm chart for Kubernetes that deploys the BPDM applications
-version: 5.2.0-SNAPSHOT
-appVersion: "6.2.0-SNAPSHOT"
+version: 5.2.0-rc4
+appVersion: "6.2.0-rc4"
 home: https://github.com/eclipse-tractusx/bpdm
 sources:
   - https://github.com/eclipse-tractusx/bpdm
@@ -33,19 +33,19 @@ maintainers:
 
 dependencies:
   - name: bpdm-gate
-    version: 6.2.0-SNAPSHOT
+    version: 6.2.0-rc4
     alias: bpdm-gate
     condition: bpdm-gate.enabled
   - name: bpdm-pool
-    version: 7.2.0-SNAPSHOT
+    version: 7.2.0-rc4
     alias: bpdm-pool
     condition: bpdm-pool.enabled
   - name: bpdm-cleaning-service-dummy
-    version: 3.2.0-SNAPSHOT
+    version: 3.2.0-rc4
     alias: bpdm-cleaning-service-dummy
     condition: bpdm-cleaning-service-dummy.enabled
   - name: bpdm-orchestrator
-    version: 3.2.0-SNAPSHOT
+    version: 3.2.0-rc4
     alias: bpdm-orchestrator
     condition: bpdm-orchestrator.enabled
   - name: bpdm-common

diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-cleaning-service-dummy
-appVersion: "6.2.0-SNAPSHOT"
-version: 3.2.0-SNAPSHOT
+appVersion: "6.2.0-rc4"
+version: 3.2.0-rc4
 description: A Helm chart for deploying the BPDM cleaning service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:

diff --git a/charts/bpdm/charts/bpdm-gate/Chart.yaml b/charts/bpdm/charts/bpdm-gate/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-gate
-appVersion: "6.2.0-SNAPSHOT"
-version: 6.2.0-SNAPSHOT
+appVersion: "6.2.0-rc4"
+version: 6.2.0-rc4
 description: A Helm chart for deploying the BPDM gate service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:

diff --git a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-orchestrator
-appVersion: "6.2.0-SNAPSHOT"
-version: 3.2.0-SNAPSHOT
+appVersion: "6.2.0-rc4"
+version: 3.2.0-rc4
 description: A Helm chart for deploying the BPDM Orchestrator service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:

diff --git a/charts/bpdm/charts/bpdm-pool/Chart.yaml b/charts/bpdm/charts/bpdm-pool/Chart.yaml
@@ -21,8 +21,8 @@
 apiVersion: v2
 type: application
 name: bpdm-pool
-appVersion: "6.2.0-SNAPSHOT"
-version: 7.2.0-SNAPSHOT
+appVersion: "6.2.0-rc4"
+version: 7.2.0-rc4
 description: A Helm chart for deploying the BPDM pool service
 home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View
 sources:

diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
     </modules>
 
     <properties>
-        <revision>6.2.0-SNAPSHOT</revision>
+        <revision>6.2.0-rc4</revision>
         <java.version>21</java.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
@@ -162,6 +162,12 @@
                 <artifactId>opencsv</artifactId>
                 <version>${opencsv.version}</version>
             </dependency>
+            <!-- overwrite with newer version to fix vulnerability  -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-common</artifactId>
+                <version>4.1.115.Final</version>
+            </dependency>
 
             <!-- Test -->
             <dependency>