-
Notifications
You must be signed in to change notification settings - Fork 728
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.
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
Add tests to verify JITServer with SSL #18262
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
test/functional/cmdLineTests/jitserver/jitserversslconfig.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/bin/sh | ||
|
|
||
| # | ||
| # Copyright IBM Corp. and others 2023 | ||
| # | ||
| # 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 https://www.eclipse.org/legal/epl-2.0/ | ||
| # or the Apache License, Version 2.0 which accompanies this distribution and | ||
| # is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| # | ||
| # This Source Code may also be made available under the following | ||
| # Secondary Licenses when the conditions for such availability set | ||
| # forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| # General Public License, version 2 with the GNU Classpath | ||
| # Exception [1] and GNU General Public License, version 2 with the | ||
| # OpenJDK Assembly Exception [2]. | ||
| # | ||
| # [1] https://www.gnu.org/software/classpath/license.html | ||
| # [2] https://openjdk.org/legal/assembly-exception.html | ||
| # | ||
| # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 | ||
| # | ||
|
|
||
| echo "Creating SSL certificates"; | ||
|
|
||
| COMMON_NAME="localhost" | ||
| VALID_DAYS=365 | ||
|
|
||
| # Generate private key | ||
| openssl genrsa -out key.pem 2048 | ||
|
|
||
| # Generate self-signed certificate | ||
| openssl req -new -x509 -sha256 -key key.pem -out cert.pem -days $VALID_DAYS -subj "/CN=$COMMON_NAME" | ||
|
|
||
| # Generate another private key and self-signed certificate | ||
| openssl req -nodes -newkey rsa:2048 -keyout wrongKey.pem -x509 -days 365 -out wrongCert.pem -subj "/CN=localhost" | ||
|
|
||
| # Generate another self-signed certificate | ||
| openssl req -new -x509 -sha256 -key key.pem -out nosslserverCert.pem -days $VALID_DAYS -subj "/CN=$COMMON_NAME" | ||
|
|
||
| echo "Certificates generated"; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember discussing that the test succeeds when any of the
type="success"criteria is met.If that is the case, then "Successfully initialized SSL context" is sufficient to make the test pass, but in reality that is not enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this test we can make that condition
type="required"for "Successfully initialized SSL context" which will enforce the test to look for this condition and make the test pass only if the condition is met.However the test will only search for the condition "Successfully initialized SSL context" in the output of the test which includes logs from the server and the client and the test will pass if either client or server logs contain the text.
I can remove the
-Xjit:verbose={JITServer}from the server side to avoid checking the logs from the server and change few conditions in the test which currently expects server side logs.Or a better way might be to make the condition
JITServer::StreamFailure: Failed to SSL_connectasrequiredcondition in the failure scenario and for success scenario make theConnected to a serverasrequiredcondition.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have removed the server side verbose logging and modified the conditions to check if the connection was success/failure (based on the test criteria) as a
requiredcondition.