Skip to content

Commit 26e9f4d

Browse files
committed
fix(deps): bump scram-client to 3.3
Signed-off-by: Jorge Solorzano <jorsol@gmail.com>
1 parent 5869727 commit 26e9f4d

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

vertx-pg-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>com.ongres.scram</groupId>
5353
<artifactId>scram-client</artifactId>
54-
<version>3.2</version>
54+
<version>3.3</version>
5555
</dependency>
5656

5757
<!-- Testing purposes -->

vertx-pg-client/src/main/java/io/vertx/pgclient/impl/auth/scram/ScramSessionImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

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

20+
import com.ongres.scram.client.ChannelBindingPolicy;
2021
import com.ongres.scram.client.ScramClient;
2122
import com.ongres.scram.common.StringPreparation;
2223
import com.ongres.scram.common.exception.ScramInvalidServerSignatureException;
@@ -32,6 +33,7 @@
3233
import javax.net.ssl.SSLException;
3334
import javax.net.ssl.SSLSession;
3435
import java.nio.charset.StandardCharsets;
36+
import java.security.NoSuchAlgorithmException;
3537
import java.security.cert.Certificate;
3638
import java.security.cert.CertificateEncodingException;
3739
import java.security.cert.X509Certificate;
@@ -73,6 +75,7 @@ public ScramClientInitialMessage createInitialSaslMessage(ByteBuf in, ChannelHan
7375
.username(username) // ignored by the server, use startup message
7476
.password(password)
7577
.stringPreparation(StringPreparation.POSTGRESQL_PREPARATION)
78+
.channelBindingPolicy(ChannelBindingPolicy.ALLOW)
7679
.channelBinding(TlsServerEndpoint.TLS_SERVER_END_POINT, channelBindingData)
7780
.build();
7881

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

0 commit comments

Comments
 (0)