Merge pull request #2175 from ballerina-platform/fix-add-header-5.x

[2201.5.x] Fix `Content-Type` header duplication via `addHeader` method
ballerina-platform · Oct 16, 2024 · 915c96e · 915c96e
2 parents 8637581 + 29a14a0
commit 915c96e
Show file tree

Hide file tree

Showing 34 changed files with 121 additions and 81 deletions.
diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Create lib directory if not exists
         run: mkdir -p ballerina/lib
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@0.23.0
         with:
           scan-type: 'rootfs'
           scan-ref: '/github/workspace/ballerina/lib'

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Create lib directory if not exists
         run: mkdir -p ballerina/lib
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@0.23.0
         with:
           scan-type: 'rootfs'
           scan-ref: '/github/workspace/ballerina/lib'

diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Create lib directory if not exists
         run: mkdir -p ballerina/lib
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@0.23.0
         with:
           scan-type: 'rootfs'
           scan-ref: '/github/workspace/ballerina/lib'

diff --git a/.trivyignore b/.trivyignore
@@ -2,3 +2,4 @@ CVE-2024-34447
 CVE-2024-29857
 CVE-2024-30171
 CVE-2024-30172
+CVE-2024-7254
diff --git a/ballerina-tests/build.gradle b/ballerina-tests/build.gradle
@@ -244,7 +244,7 @@ task startLdapServer() {
             if (!stdOut.toString().contains("openldap-server")) {
                 println "Starting LDAP server."
                 exec {
-                    commandLine 'sh', '-c', "docker-compose -f $project.projectDir/resources/openldap/docker-compose.yml up -d"
+                    commandLine 'sh', '-c', "docker compose -f $project.projectDir/resources/openldap/compose.yml up -d"
                     standardOutput = stdOut
                 }
                 println stdOut.toString()

diff --git a/ballerina-tests/http-advanced-tests/Ballerina.toml b/ballerina-tests/http-advanced-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_advanced_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-advanced-tests/Dependencies.toml b/ballerina-tests/http-advanced-tests/Dependencies.toml
@@ -73,7 +73,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -105,7 +105,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_advanced_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "file"},
@@ -125,7 +125,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/http-client-tests/Ballerina.toml b/ballerina-tests/http-client-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_client_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-client-tests/Dependencies.toml b/ballerina-tests/http-client-tests/Dependencies.toml
@@ -70,7 +70,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -102,7 +102,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_client_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "http"},
@@ -121,7 +121,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/http-dispatching-tests/Ballerina.toml b/ballerina-tests/http-dispatching-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_dispatching_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-dispatching-tests/Dependencies.toml b/ballerina-tests/http-dispatching-tests/Dependencies.toml
@@ -67,7 +67,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_dispatching_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "http_test_common"},
@@ -120,7 +120,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/http-interceptor-tests/Ballerina.toml b/ballerina-tests/http-interceptor-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_interceptor_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-interceptor-tests/Dependencies.toml b/ballerina-tests/http-interceptor-tests/Dependencies.toml
@@ -67,7 +67,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_interceptor_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "http_test_common"},
@@ -115,7 +115,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/http-misc-tests/Ballerina.toml b/ballerina-tests/http-misc-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_misc_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-misc-tests/Dependencies.toml b/ballerina-tests/http-misc-tests/Dependencies.toml
@@ -67,7 +67,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_misc_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "http_test_common"},
@@ -118,7 +118,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/http-misc-tests/tests/http_header_test.bal b/ballerina-tests/http-misc-tests/tests/http_header_test.bal
@@ -14,6 +14,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+import ballerina/mime;
 import ballerina/test;
 import ballerina/http;
 import ballerina/http_test_common as common;
@@ -276,3 +277,24 @@ function testPassthruWithBody() returns error? {
     }
 }
 
+@test:Config {}
+function testAddHeaderWithContentType() returns error? {
+    http:Request req = new;
+    check req.setContentType(mime:APPLICATION_JSON);
+    test:assertEquals(check req.getHeaders(http:CONTENT_TYPE), [mime:APPLICATION_JSON]);
+    req.addHeader(http:CONTENT_TYPE, mime:APPLICATION_XML);
+    test:assertEquals(check req.getHeaders(http:CONTENT_TYPE), [mime:APPLICATION_XML]);
+
+    http:Response res = new;
+    check res.setContentType(mime:APPLICATION_JSON);
+    test:assertEquals(check res.getHeaders(http:CONTENT_TYPE), [mime:APPLICATION_JSON]);
+    res.addHeader(http:CONTENT_TYPE, mime:APPLICATION_XML);
+    test:assertEquals(check res.getHeaders(http:CONTENT_TYPE), [mime:APPLICATION_XML]);
+
+    http:PushPromise pushPromise = new;
+    pushPromise.addHeader(http:CONTENT_TYPE, mime:APPLICATION_JSON);
+    test:assertEquals(pushPromise.getHeaders(http:CONTENT_TYPE), [mime:APPLICATION_JSON]);
+    pushPromise.addHeader(http:CONTENT_TYPE, mime:APPLICATION_XML);
+    test:assertEquals(pushPromise.getHeaders(http:CONTENT_TYPE), [mime:APPLICATION_XML]);
+}
+
diff --git a/ballerina-tests/http-resiliency-tests/Ballerina.toml b/ballerina-tests/http-resiliency-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_resiliency_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-resiliency-tests/Dependencies.toml b/ballerina-tests/http-resiliency-tests/Dependencies.toml
@@ -67,7 +67,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_resiliency_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "http_test_common"},
@@ -116,7 +116,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},

diff --git a/ballerina-tests/http-security-tests/Ballerina.toml b/ballerina-tests/http-security-tests/Ballerina.toml
@@ -1,14 +1,14 @@
 [package]
 org = "ballerina"
 name = "http_security_tests"
-version = "2.7.7"
+version = "2.7.8"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.7.7"
+version = "2.7.8"
 
 [[platform.java11.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.7.7.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.7.8-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-security-tests/Dependencies.toml b/ballerina-tests/http-security-tests/Dependencies.toml
@@ -70,7 +70,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "auth"},
@@ -102,7 +102,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_security_tests"
-version = "2.7.7"
+version = "2.7.8"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "http"},
@@ -121,7 +121,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.7.7"
+version = "2.7.8"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "lang.string"},