Merge branch 'ws-security-policies' of https://github.com/Nuvindu/mod…

…ule-ballerina-soap into ws-security-policies
ballerina-platform · Oct 13, 2023 · 0d9c804 · 0d9c804
2 parents 5970f3c + 6f98be1
commit 0d9c804
Show file tree

Hide file tree

Showing 40 changed files with 114 additions and 126 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ public function main() returns error? {
                             </quer:Add>
                             </soap:Body>
                         </soap:Envelope>`;
-    xml|mime:Entity[] response = check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
+    check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
 }
 ```
 

diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -184,6 +184,9 @@ version = "0.0.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
+modules = [
+	{org = "ballerina", packageName = "lang.regexp", moduleName = "lang.regexp"}
+]
 
 [[package]]
 org = "ballerina"
@@ -264,18 +267,6 @@ dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
-[[package]]
-org = "ballerina"
-name = "regex"
-version = "1.4.3"
-dependencies = [
-	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "lang.string"}
-]
-modules = [
-	{org = "ballerina", packageName = "regex", moduleName = "regex"}
-]
-
 [[package]]
 org = "ballerina"
 name = "soap"
@@ -285,8 +276,8 @@ dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.regexp"},
 	{org = "ballerina", name = "mime"},
-	{org = "ballerina", name = "regex"},
 	{org = "ballerina", name = "test"},
 	{org = "ballerinai", name = "observe"}
 ]

diff --git a/ballerina/Module.md b/ballerina/Module.md
@@ -67,7 +67,7 @@ public function main() returns error? {
                             </quer:Add>
                             </soap:Body>
                         </soap:Envelope>`;
-    xml|mime:Entity[] response = check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
+    check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
 }
 ```
 ## Security

diff --git a/ballerina/Package.md b/ballerina/Package.md
@@ -67,7 +67,7 @@ public function main() returns error? {
                             </quer:Add>
                             </soap:Body>
                         </soap:Envelope>`;
-    xml|mime:Entity[] response = check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
+    check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
 }
 ```
 ## Security

diff --git a/ballerina/configs.bal b/ballerina/configs.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/constants.bal b/ballerina/constants.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/error.bal b/ballerina/error.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/soap11/Module.md b/ballerina/modules/soap11/Module.md
@@ -59,7 +59,7 @@ public function main() returns error? {
                             </quer:Add>
                             </soap:Body>
                         </soap:Envelope>`;
-    xml|mime:Entity[] response = check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
+    check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
 }
 ```
 ## Security

diff --git a/ballerina/modules/soap11/error.bal b/ballerina/modules/soap11/error.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/soap11/soap11.bal b/ballerina/modules/soap11/soap11.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/soap11/tests/soap11_client_test.bal b/ballerina/modules/soap11/tests/soap11_client_test.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/soap12/Module.md b/ballerina/modules/soap12/Module.md
@@ -59,7 +59,7 @@ public function main() returns error? {
                             </quer:Add>
                             </soap:Body>
                         </soap:Envelope>`;
-    xml|mime:Entity[] response = check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
+    check soapClient->sendOnly(envelope, "http://tempuri.org/Add");
 }
 ```
 ## Security

diff --git a/ballerina/modules/soap12/error.bal b/ballerina/modules/soap12/error.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/soap12/soap12.bal b/ballerina/modules/soap12/soap12.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/soap12/tests/soap12_client_test.bal b/ballerina/modules/soap12/tests/soap12_client_test.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except
@@ -20,11 +20,11 @@ import ballerina/test;
 import ballerina/crypto;
 import soap.wssec;
 
-const string KEY_ALIAS = "wss40";
-const string KEY_PASSWORD = "security";
-const string KEY_STORE_PATH = "modules/wssec/tests/resources/wss40.p12";
-const string X509_KEY_STORE_PATH = "modules/wssec/tests/resources/x509_certificate.p12";
-const string X509_KEY_STORE_PATH_2 = "modules/wssec/tests/resources/x509_certificate_2.p12";
+const KEY_ALIAS = "wss40";
+const KEY_PASSWORD = "security";
+const KEY_STORE_PATH = "modules/wssec/tests/resources/wss40.p12";
+const X509_KEY_STORE_PATH = "modules/wssec/tests/resources/x509_certificate.p12";
+const X509_KEY_STORE_PATH_2 = "modules/wssec/tests/resources/x509_certificate_2.p12";
 const wssec:TransportBindingConfig TRANSPORT_BINDING = "TransportBinding";
 const wssec:NoPolicy NO_POLICY = "NoPolicy";
 
@@ -45,7 +45,7 @@ function testSendOnly12() returns error? {
 
     Client soapClient = check new ("http://www.dneonline.com/calculator.asmx?WSDL");
 
-    _ = check soapClient->sendOnly(body, "http://tempuri.org/Add");
+    check soapClient->sendOnly(body, "http://tempuri.org/Add");
 }
 
 @test:Config {
@@ -134,7 +134,7 @@ function testSendOnly12WithoutSoapAction() returns error? {
 
     Client soapClient = check new ("http://www.dneonline.com/calculator.asmx?WSDL");
 
-    _ = check soapClient->sendOnly(body);
+    check soapClient->sendOnly(body);
 }
 
 @test:Config {

diff --git a/ballerina/modules/wssec/document.bal b/ballerina/modules/wssec/document.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/encryption.bal b/ballerina/modules/wssec/encryption.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/error.bal b/ballerina/modules/wssec/error.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/init.bal b/ballerina/modules/wssec/init.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/records.bal b/ballerina/modules/wssec/records.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/sec_header.bal b/ballerina/modules/wssec/sec_header.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/signature.bal b/ballerina/modules/wssec/signature.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/tests/test_utils.bal b/ballerina/modules/wssec/tests/test_utils.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except
@@ -15,19 +15,19 @@
 // under the License.
 import ballerina/test;
 
-const string USERNAME = "username";
-const string PASSWORD = "password";
+const USERNAME = "username";
+const PASSWORD = "password";
 
-const string KEY_ALIAS = "wss40";
-const string KEY_PASSWORD = "security";
+const KEY_ALIAS = "wss40";
+const KEY_PASSWORD = "security";
 
-const string PUBLIC_KEY_PATH = "modules/wssec/tests/resources/public_key.cer";
-const string PRIVATE_KEY_PATH = "modules/wssec/tests/resources/private_key.pem";
-const string KEY_STORE_PATH = "modules/wssec/tests/resources/wss40.p12";
-const string X509_PUBLIC_CERT_PATH = "modules/wssec/tests/resources/x509_certificate.crt";
-const string X509_PUBLIC_CERT_PATH_2 = "modules/wssec/tests/resources/x509_certificate_2.crt";
-const string X509_KEY_STORE_PATH = "modules/wssec/tests/resources/x509_certificate.p12";
-const string X509_KEY_STORE_PATH_2 = "modules/wssec/tests/resources/x509_certificate_2.p12";
+const PUBLIC_KEY_PATH = "modules/wssec/tests/resources/public_key.cer";
+const PRIVATE_KEY_PATH = "modules/wssec/tests/resources/private_key.pem";
+const KEY_STORE_PATH = "modules/wssec/tests/resources/wss40.p12";
+const X509_PUBLIC_CERT_PATH = "modules/wssec/tests/resources/x509_certificate.crt";
+const X509_PUBLIC_CERT_PATH_2 = "modules/wssec/tests/resources/x509_certificate_2.crt";
+const X509_KEY_STORE_PATH = "modules/wssec/tests/resources/x509_certificate.p12";
+const X509_KEY_STORE_PATH_2 = "modules/wssec/tests/resources/x509_certificate_2.p12";
 
 function assertTimestampToken(string envelopeString) {
     string:RegExp ts_token = re `<wsu:Timestamp wsu:Id=".*">`;

diff --git a/ballerina/modules/wssec/tests/ws_security_tests.bal b/ballerina/modules/wssec/tests/ws_security_tests.bal
@@ -1,5 +1,4 @@
-import ballerina/crypto;
-// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 LLC. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except
@@ -14,8 +13,9 @@ import ballerina/crypto;
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+import ballerina/crypto;
 import ballerina/test;
-import ballerina/regex;
+import ballerina/lang.regexp;
 
 @test:Config {
     groups: ["timestamp_token"]
@@ -522,11 +522,11 @@ function testSymmetricBindingWithOutboundConfig() returns error? {
     };
 
     crypto:PrivateKey|crypto:PublicKey? privateKey = outboundConfig.decryptionKey;
-    if privateKey !is () {
+    if privateKey is crypto:PrivateKey|crypto:PublicKey {
         byte[] encData = check getEncryptedData(securedEnvelope);
         byte[] decryptDataResult = check decryptData(encData, RSA_ECB, privateKey);
         string decryptedBody = "<soap:Body >" + check string:fromBytes(decryptDataResult) + "</soap:Body>";
-        envelopeString = regex:replace(envelopeString, string`<soap:Body .*>.*</soap:Body>`, decryptedBody);
+        envelopeString = regexp:replace(re `<soap:Body .*>.*</soap:Body>`, envelopeString, decryptedBody);
         securedEnvelope = check xml:fromString(envelopeString);
     }
     byte[] signedData = check getSignatureData(securedEnvelope);
@@ -893,11 +893,11 @@ function testAsymmetricBindingWithOutboundConfig() returns error? {
     xml securedEnvelope = check applyAsymmetricBinding(envelope, asymmetricBinding);
     string envelopeString = securedEnvelope.toString();
     crypto:PrivateKey|crypto:PublicKey? privateKey = outboundConfig.decryptionKey;
-    if privateKey !is () {
+    if privateKey is crypto:PrivateKey|crypto:PublicKey {
         byte[] encData = check getEncryptedData(securedEnvelope);
         byte[] decryptDataResult = check decryptData(encData, RSA_ECB, privateKey);
         string decryptedBody = "<soap:Body >" + check string:fromBytes(decryptDataResult) + "</soap:Body>";
-        envelopeString = regex:replace(envelopeString, string`<soap:Body .*>.*</soap:Body>`, decryptedBody);
+        envelopeString = regexp:replace(re `<soap:Body .*>.*</soap:Body>`, envelopeString, decryptedBody);
         securedEnvelope = check xml:fromString(envelopeString);
     }
     byte[] signedData = check getSignatureData(securedEnvelope);

diff --git a/ballerina/modules/wssec/types.bal b/ballerina/modules/wssec/types.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except

diff --git a/ballerina/modules/wssec/ws_security.bal b/ballerina/modules/wssec/ws_security.bal
@@ -1,4 +1,4 @@
-// Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+// Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com) All Rights Reserved.
 //
 // WSO2 Inc. licenses this file to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file except