Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test wssecurity-1.1 with updated config between checkpoint/restore #30580

Merged
merged 2 commits into from
Jan 23, 2025
+69 −22
Merged

Test wssecurity-1.1 with updated config between checkpoint/restore #30580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e468b8
Test wsSecurity with updated config between checkpoint and restore
anjumfatima90 Jan 17, 2025
fb91a06
Temporarily disabling CRIU security provider until CRIU security prov…
anjumfatima90 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 52 additions & 10 deletions ....wssecurity_fat.wsscxf.1/fat/src/com/ibm/ws/wssecurity/fat/cxf/sample/CxfSampleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020, 2024 IBM Corporation and others.
* Copyright (c) 2020, 2025 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand All @@ -13,13 +13,20 @@

package com.ibm.ws.wssecurity.fat.cxf.sample;

import static componenttest.annotation.SkipForRepeat.CHECKPOINT_RULE;
import static java.util.Collections.emptyMap;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;

import org.junit.ClassRule;
Expand All @@ -39,7 +46,6 @@

import componenttest.annotation.CheckpointTest;
import componenttest.annotation.Server;
import componenttest.annotation.SkipForRepeat;
import componenttest.custom.junit.runner.FATRunner;
import componenttest.rules.repeater.CheckpointRule;
import componenttest.rules.repeater.CheckpointRule.ServerMode;
Expand Down Expand Up @@ -71,12 +77,20 @@ public class CxfSampleTests {

@ClassRule
public static CheckpointRule checkpointRule = new CheckpointRule()
.setConsoleLogName(CxfSampleTests.class.getSimpleName()+ ".log")
.setServerSetup(CxfSampleTests::serverSetUp)
.setServerStart(CxfSampleTests::serverStart)
.setServerTearDown(CxfSampleTests::serverTearDown)
.addUnsupportedRepeatIDs(EmptyAction.ID, RepeatWithEE7cbh20.ID)
.addCheckpointRegexIgnoreMessages("CWWKG0101W", "SRVE0274W");
.setConsoleLogName(CxfSampleTests.class.getSimpleName()+ ".log")
.setServerSetup(CxfSampleTests::serverSetUp)
.setServerStart(CxfSampleTests::serverStart)
.setServerTearDown(CxfSampleTests::serverTearDown)
.addUnsupportedRepeatIDs(EmptyAction.ID, RepeatWithEE7cbh20.ID)
.addCheckpointRegexIgnoreMessages("CWWKG0101W", "SRVE0274W")
.setPostCheckpointLambda(server -> {
try {
configureBeforeRestore();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
});

public static LibertyServer serverSetUp(ServerMode mode) throws Exception {
//issue 23060
Expand Down Expand Up @@ -109,9 +123,36 @@ public static LibertyServer serverSetUp(ServerMode mode) throws Exception {
JakartaEEAction.transformApp(WSSampleSei_archive);
}

//Environment variable values are not set before checkpoint.
if (CheckpointRule.isActive()) {
configureEnvVariable(server, emptyMap());
//Temporarily disabling CRIU security provider until CRIU security provider in OpenJ9 is enhanced to support wsSecurity
List<String> options = new ArrayList<>();
options.add("-XX:-CRIUSecProvider");
server.setJvmOptions(options);
}
return server;
}

private static void configureBeforeRestore() throws Exception {
Map<String, String> config = new HashMap<>();
config.put("WS_SECURITY_PWD", "security");
config.put("CLIENT_SIGNATURE_PWD", "LibertyX509Client");
config.put("CLIENT_SIGNATURE_KEYSTORE", "x509ClientDefault.jks");
config.put("PROVIDER_ENCRYPTION_KEYSTORE", "x509ServerDefault.jks");
config.put("PROVIDER_ENCRYPTION_PWD", "LibertyX509Server");
configureEnvVariable(server, config);
}

private static void configureEnvVariable(LibertyServer server, Map<String, String> newEnv) throws Exception {
Properties serverEnvProperties = new Properties();
serverEnvProperties.putAll(newEnv);
File serverEnvFile = new File(server.getFileFromLibertyServerRoot("server.env").getAbsolutePath());
try (OutputStream out = new FileOutputStream(serverEnvFile)) {
serverEnvProperties.store(out, "");
}
}

public static void serverStart(ServerMode mode, LibertyServer server) throws Exception {
String thisMethod = "serverStart";
String defaultPort = "8010";
Expand All @@ -127,6 +168,8 @@ public static void serverStart(ServerMode mode, LibertyServer server) throws Exc
server.addInstalledAppForValidation("webcontent");
}

//LibertyX509Client

server.startServer(); // check CWWKS0008I: The security service is ready.
SharedTools.waitForMessageInLog(server, "CWWKS0008I");

Expand Down Expand Up @@ -244,7 +287,6 @@ public void testEchoService() throws Exception {
}

@Test
@SkipForRepeat({ CHECKPOINT_RULE })
public void testEcho4Service() throws Exception {
String thisMethod = "testEcho4Service";

Expand Down
5 changes: 5 additions & 0 deletions ...bm.ws.wssecurity_fat.wsscxf.1/publish/servers/com.ibm.ws.wssecurity_fat.sample/server.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
WS_SECURITY_PWD=security
CLIENT_SIGNATURE_KEYSTORE=x509ClientDefault.jks
CLIENT_SIGNATURE_PWD=LibertyX509Client
PROVIDER_ENCRYPTION_KEYSTORE=x509ServerDefault.jks
PROVIDER_ENCRYPTION_PWD=LibertyX509Server
12 changes: 6 additions & 6 deletions ....wssecurity_fat.wsscxf.1/publish/servers/com.ibm.ws.wssecurity_fat.sample/server_asym.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020, 2021 IBM Corporation and others.
Copyright (c) 2020, 2025 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -89,7 +89,7 @@
<!-- provide WebServiceClient user-ID and password -->
<wsSecurityClient
id="default"
ws-security.password="security"
ws-security.password="${ws_security_pwd}"
ws-security.username="user1"
ws-security.callback-handler="com.ibm.ws.wssecurity.example.cbh.CommonPasswordCallback"
>
Expand All @@ -98,9 +98,9 @@
<signatureProperties
signatureAlgorithm="sha256"
org.apache.ws.security.crypto.merlin.keystore.type="jks"
org.apache.ws.security.crypto.merlin.keystore.password="LibertyX509Client"
org.apache.ws.security.crypto.merlin.keystore.password="${client_signature_pwd}"
org.apache.ws.security.crypto.merlin.keystore.alias="x509ClientDefault"
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/x509ClientDefault.jks" />
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/${client_signature_keystore}" />
<encryptionProperties
org.apache.ws.security.crypto.merlin.keystore.type="jks"
org.apache.ws.security.crypto.merlin.keystore.password="LibertyX509Client2"
Expand All @@ -122,9 +122,9 @@
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/x509ServerSecond.jks" />
<encryptionProperties
org.apache.ws.security.crypto.merlin.keystore.type="jks"
org.apache.ws.security.crypto.merlin.keystore.password="LibertyX509Server"
org.apache.ws.security.crypto.merlin.keystore.password="${provider_encryption_pwd}"
org.apache.ws.security.crypto.merlin.keystore.alias="x509ClientDefaultCert"
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/x509ServerDefault.jks" />
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/${provider_encryption_keystore}" />
</wsSecurityProvider>

<include location="imports/java2Permissions.xml" />
Expand Down
12 changes: 6 additions & 6 deletions ...urity_fat.wsscxf.1/publish/servers/com.ibm.ws.wssecurity_fat.sample/server_asym_wss4j.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020, 2022 IBM Corporation and others.
Copyright (c) 2020, 2025 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -89,7 +89,7 @@
<!-- provide WebServiceClient user-ID and password -->
<wsSecurityClient
id="default"
ws-security.password="security"
ws-security.password="${ws_security_pwd}"
ws-security.username="user1"
ws-security.callback-handler="com.ibm.ws.wssecurity.example.cbhwss4j.CommonPasswordCallbackWss4j"
>
Expand All @@ -98,9 +98,9 @@
<signatureProperties
signatureAlgorithm="sha256"
org.apache.ws.security.crypto.merlin.keystore.type="jks"
org.apache.ws.security.crypto.merlin.keystore.password="LibertyX509Client"
org.apache.ws.security.crypto.merlin.keystore.password="${client_signature_pwd}"
org.apache.ws.security.crypto.merlin.keystore.alias="x509ClientDefault"
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/x509ClientDefault.jks" />
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/${client_signature_keystore}" />
<encryptionProperties
org.apache.ws.security.crypto.merlin.keystore.type="jks"
org.apache.ws.security.crypto.merlin.keystore.password="LibertyX509Client2"
Expand All @@ -122,9 +122,9 @@
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/x509ServerSecond.jks" />
<encryptionProperties
org.apache.ws.security.crypto.merlin.keystore.type="jks"
org.apache.ws.security.crypto.merlin.keystore.password="LibertyX509Server"
org.apache.ws.security.crypto.merlin.keystore.password="${provider_encryption_pwd}"
org.apache.ws.security.crypto.merlin.keystore.alias="x509ClientDefaultCert"
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/x509ServerDefault.jks" />
org.apache.ws.security.crypto.merlin.file="${server.config.dir}/${provider_encryption_keystore}" />
</wsSecurityProvider>

<include location="imports/java2Permissions.xml" />
Expand Down