Skip to content

fix(deps): bump scram-client to 3.3 #1671

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

Draft
jorsol wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Draft

fix(deps): bump scram-client to 3.3 #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion vertx-pg-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.ongres.scram</groupId>
<artifactId>scram-client</artifactId>
<version>3.2</version>
<version>3.3</version>
</dependency>

<!-- Testing purposes -->
Expand Down
7 changes: 5 additions & 2 deletions vertx-pg-client/src/main/java/io/vertx/pgclient/impl/auth/scram/ScramSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package io.vertx.pgclient.impl.auth.scram;

import com.ongres.scram.client.ChannelBindingPolicy;
import com.ongres.scram.client.ScramClient;
import com.ongres.scram.common.StringPreparation;
import com.ongres.scram.common.exception.ScramInvalidServerSignatureException;
Expand All @@ -32,6 +33,7 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
Expand Down Expand Up @@ -73,6 +75,7 @@ public ScramClientInitialMessage createInitialSaslMessage(ByteBuf in, ChannelHan
.username(username) // ignored by the server, use startup message
.password(password)
.stringPreparation(StringPreparation.POSTGRESQL_PREPARATION)
.channelBindingPolicy(ChannelBindingPolicy.ALLOW)
.channelBinding(TlsServerEndpoint.TLS_SERVER_END_POINT, channelBindingData)
.build();

Expand Down Expand Up @@ -128,10 +131,10 @@ private byte[] extractChannelBindingData(ChannelHandlerContext ctx) {
Certificate peerCert = certificates[0]; // First certificate is the peer's certificate
if (peerCert instanceof X509Certificate) {
X509Certificate cert = (X509Certificate) peerCert;
return TlsServerEndpoint.getChannelBindingData(cert);
return TlsServerEndpoint.getChannelBindingHash(cert);
}
}
} catch (CertificateEncodingException | SSLException e) {
} catch (CertificateEncodingException | SSLException | NoSuchAlgorithmException e) {
// Cannot extract X509Certificate from SSL session
// handle as no channel binding available
}
Expand Down
Loading