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

Merge upstream #385

Merged
merged 5 commits into from
Jan 23, 2025
Merged

Conversation

sylwiaszunejko
Copy link
Collaborator

Merge upstream changes

tolbertam and others added 5 commits January 23, 2025 12:04
The existing certificates in testdata/pki expire on September 16 2024.

This commit includes a 'generate_certs.sh' script for regenerating
private keys and certificates as needed.

As I couldn't find the original steps used to generate these, it's
possible these certificates are generated differently, but they are
done in a nominal way.

One slight derivation with the original certificates is that I have
opted to use PKCS12 format instead of the propertiary java JKS format
for the .truststore and .keystore file.  The cassandra and gocql
certificates also embed a spiffe in the SAN so they can eventually
be used for mTLS authentication testing.

patch by Andy Tolbert; reviewed by Bret McGuire for CASSANDRA-19862
Currently gocql will only allow authenticating with authenticators
defined in defaultApprovedAuthenticators in conn.go.

There have been multiple occurrences of implementers needing to update
this list, either when a vendor would like to add their authenticator,
or a new authenticator being added.

It would probably reduce friction to just accept any authenticator
provided by the server. From what I know, other drivers behave in this
way.

If a user wanted to restrict this, they could use the existing
configuration PasswordAuthenticator.AllowedAuthenticators.

patch by Andy Tolbert; reviewed by Joao Reis, Lukasz Antoniak for CASSGO-19
Batch should behave like Query, and need to be created from a session.

patch by Oleksandr Luzhniy; reviewed by João Reis, Danylo Savchenko, Jackson Fleming, for CASSGO-15
NumConns doesn`t have a proper description,
so it could cause misunderstanding and confusion about this option.

patch by Mykyta Oleksiienko; reviewed by Joao Reis and Jackson Fleming for CASSGO-3
Exec() method for batch was added & Query() method was refactored.
Batch for now behaves the same way as query.

patch by Oleksandr Luzhniy; reviewed by João Reis, Danylo Savchenko, Bohdan Siryk, Jackson Fleming, for CASSGO-7
@sylwiaszunejko
Copy link
Collaborator Author

@dkropachev I am not sure, should I merge also the changes related to the license or donation to apache?

@dkropachev
Copy link
Collaborator

@dkropachev I am not sure, should I merge also the changes related to the license or donation to apache?

We need to review it first, better do it in a separate PR.

@sylwiaszunejko sylwiaszunejko marked this pull request as ready for review January 23, 2025 11:34
@sylwiaszunejko sylwiaszunejko merged commit d95cf2f into scylladb:master Jan 23, 2025
2 checks passed
@roydahan
Copy link
Collaborator

We could use the extended CI here to make sure it doesn't break anything...

@dkropachev
Copy link
Collaborator

We could use the extended CI here to make sure it doesn't break anything...

There are no changes in the code (except one line in the logic for authenticator approval), only tests.

@sylwiaszunejko
Copy link
Collaborator Author

sylwiaszunejko commented Jan 23, 2025

the extended CI failed due to spot instance termination

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants