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.

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

OSSM-5001 Additions to support maistra/proxy build #128

Closed

Conversation

tedjpoole
Copy link
Contributor

@tedjpoole tedjpoole commented Nov 15, 2023

This PR:

  • adds a vendored & patched copy of the envoyproxy/envoy repository
  • configures bazel to build the vendored envoy against the bssl-compat layer instead of BoringSSL
  • adds some more functions to the bssl-compat layer to support envoy tests

Required when building in maistra-builder:2.5 (clang++13)

Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
Now checks for <openssl/types.h> instead of <openssl/ssl.h> because
<openssl/types.h> is only in OpenSSL 3.0.x. This ensures that if the host
only has OpenSSL 1.1.x headers, they will not be used.

Signed-off-by: Ted Poole <tpoole@redhat.com>
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch 3 times, most recently from 63159c0 to efdc85d Compare November 30, 2023 11:02
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch 5 times, most recently from 8d92df6 to c09fa3b Compare December 13, 2023 13:52
Signed-off-by: Ted Poole <tpoole@redhat.com>
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch from c09fa3b to de50633 Compare December 13, 2023 14:29
Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
The functions that were being used to check the loaded OpenSSL version were only available
in OpenSSL >= 3.0.0, so the check crashed if 1.1.1 libraries were loaded.

Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
There were some unnecessary files getting installed as part of the
bssl-compat installation process. In particular, the googletest headers
were being installed, which was upsetting the envoy build.

Signed-off-by: Ted Poole <tpoole@redhat.com>
…l-compat

Signed-off-by: Ted Poole <tpoole@redhat.com>
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch 5 times, most recently from 7414b59 to 70be25b Compare January 10, 2024 17:05
… suite spec

Signed-off-by: Ted Poole <tpoole@redhat.com>
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch from 70be25b to 574a176 Compare January 10, 2024 18:10
@tedjpoole tedjpoole marked this pull request as ready for review January 11, 2024 10:13
@tedjpoole tedjpoole requested a review from twghu January 11, 2024 10:13
…cate_cb

The test passes on BoringSSL but is skipped on bssl-compat pending a fix

Signed-off-by: Ted Poole <tpoole@redhat.com>
@clnperez
Copy link
Contributor

clnperez commented Feb 8, 2024

@tedjpoole have you talked to anyone about this PR outside of this thread? I'm just curious as to its fate since it doesn't have any comments and you submitted it in November :)

…e/v1.26 branch)

Signed-off-by: Ted Poole <tpoole@redhat.com>
SSL_CIPHER_get_min_version() would segv when called for a
cipher who's implementation engine wasn't loaded.

Signed-off-by: Ted Poole <tpoole@redhat.com>
…e callback

Signed-off-by: Ted Poole <tpoole@redhat.com>
…l::verifyCallback()

The SSL_get_peer_certificate() function doesn't work the same way in OpenSSL as it does
in BoringSSL, when called within a callback installed via SSL_CTX_set_cert_verify_callback().
Therefore, we replace it with calls to X509_STORE_CTX_get_current_cert() and
X509_STORE_CTX_get0_cert().

Signed-off-by: Ted Poole <tpoole@redhat.com>
Since we aren't supporting async certificate validation, ensure
that we only run the tests in "with_sync_cert_validation" mode.

Signed-off-by: Ted Poole <tpoole@redhat.com>
…quivalent

This allows the use of IANA cipher suite names as well as OpenSSL specific names,
which in turn means fewer patches to upstream source, expecially configs in test
code.

Signed-off-by: Ted Poole <tpoole@redhat.com>
… certificate callback

Signed-off-by: Ted Poole <tpoole@redhat.com>
Signed-off-by: Ted Poole <tpoole@redhat.com>
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch 2 times, most recently from b3cfefd to 48d297e Compare March 22, 2024 10:47
2 tests fail to build
3 tests fail to pass

Signed-off-by: Ted Poole <tpoole@redhat.com>
@tedjpoole tedjpoole force-pushed the OSSM-5001-integrate-into-proxy branch from 48d297e to 1c9a393 Compare March 22, 2024 10:48
@tedjpoole
Copy link
Contributor Author

Closing this PR because it has become out of date

@tedjpoole tedjpoole closed this May 21, 2024
@tedjpoole tedjpoole deleted the OSSM-5001-integrate-into-proxy branch July 2, 2024 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants