Skip to content

Commit 0e62cc8

Browse files
svats0001svats0001
committed
Changed RSA to Rsa and fixed test
Signed-off-by: S V <vats02581@gmail.com>
1 parent dbc6d7c commit 0e62cc8

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/InitFlow.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ final class InitFlow {
130130
*/
131131
static Mono<Void> initHandshake(Client client, SslMode sslMode, String database, String user,
132132
@Nullable CharSequence password, Set<CompressionAlgorithm> compressionAlgorithms, int zstdCompressionLevel,
133-
@Nullable String serverRSAPublicKeyFile) {
133+
@Nullable String serverRsaPublicKeyFile) {
134134
return client.exchange(new HandshakeExchangeable(
135135
client,
136136
sslMode,
@@ -139,7 +139,7 @@ static Mono<Void> initHandshake(Client client, SslMode sslMode, String database,
139139
password,
140140
compressionAlgorithms,
141141
zstdCompressionLevel,
142-
serverRSAPublicKeyFile
142+
serverRsaPublicKeyFile
143143
)).then();
144144
}
145145

@@ -514,11 +514,11 @@ final class HandshakeExchangeable extends FluxExchangeable<Void> {
514514
private boolean sslCompleted;
515515

516516
@Nullable
517-
private String serverRSAPublicKeyFile;
517+
private String serverRsaPublicKeyFile;
518518

519519
HandshakeExchangeable(Client client, SslMode sslMode, String database, String user,
520520
@Nullable CharSequence password, Set<CompressionAlgorithm> compressions,
521-
int zstdCompressionLevel, @Nullable String serverRSAPublicKeyFile) {
521+
int zstdCompressionLevel, @Nullable String serverRsaPublicKeyFile) {
522522
this.client = client;
523523
this.sslMode = sslMode;
524524
this.database = database;
@@ -527,7 +527,7 @@ final class HandshakeExchangeable extends FluxExchangeable<Void> {
527527
this.compressions = compressions;
528528
this.zstdCompressionLevel = zstdCompressionLevel;
529529
this.sslCompleted = sslMode == SslMode.TUNNEL;
530-
this.serverRSAPublicKeyFile = serverRSAPublicKeyFile;
530+
this.serverRsaPublicKeyFile = serverRsaPublicKeyFile;
531531
}
532532

533533
@Override
@@ -611,9 +611,9 @@ private AuthResponse createAuthResponse(String phase) {
611611
MySqlAuthProvider authProvider = getAndNextProvider();
612612

613613
if (authProvider.isSslNecessary() && !sslCompleted) {
614-
if (serverRSAPublicKeyFile != null && sslMode.equals(SslMode.DISABLED)) {
614+
if (serverRsaPublicKeyFile != null && sslMode.equals(SslMode.DISABLED)) {
615615
return new AuthResponse(MySqlAuthProvider.rsaEncryption(authProvider.authentication(
616-
password, salt, client.getContext().getClientCollation()), serverRSAPublicKeyFile));
616+
password, salt, client.getContext().getClientCollation()), serverRsaPublicKeyFile));
617617
}
618618
throw new R2dbcPermissionDeniedException(authFails(authProvider.getType(), phase), CLI_SPECIFIC);
619619
}
@@ -719,14 +719,14 @@ private MySqlAuthProvider getAndNextProvider() {
719719
private HandshakeResponse createHandshakeResponse(Capability capability) {
720720
MySqlAuthProvider authProvider = getAndNextProvider();
721721

722-
if (authProvider.isSslNecessary() && !sslCompleted && serverRSAPublicKeyFile == null) {
722+
if (authProvider.isSslNecessary() && !sslCompleted && serverRsaPublicKeyFile == null) {
723723
throw new R2dbcPermissionDeniedException(authFails(authProvider.getType(), "handshake"), CLI_SPECIFIC);
724724
}
725725

726726
byte[] authorization = authProvider.authentication(password, salt, client.getContext().getClientCollation());
727727

728728
if (authProvider.isSslNecessary() && !sslCompleted && sslMode.equals(SslMode.DISABLED)) {
729-
authorization = MySqlAuthProvider.rsaEncryption(authorization, serverRSAPublicKeyFile);
729+
authorization = MySqlAuthProvider.rsaEncryption(authorization, serverRsaPublicKeyFile);
730730
}
731731

732732
String authType = authProvider.getType();

‎r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/MySqlConnectionConfiguration.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public final class MySqlConnectionConfiguration {
137137
private final boolean tinyInt1isBit;
138138

139139
@Nullable
140-
private final String serverRSAPublicKeyFile;
140+
private final String serverRsaPublicKeyFile;
141141

142142
private MySqlConnectionConfiguration(
143143
boolean isHost, String domain, int port, MySqlSslConfiguration ssl,
@@ -156,7 +156,7 @@ private MySqlConnectionConfiguration(
156156
Extensions extensions, @Nullable Publisher<String> passwordPublisher,
157157
@Nullable AddressResolverGroup<?> resolver,
158158
boolean metrics,
159-
boolean tinyInt1isBit, @Nullable String serverRSAPublicKeyFile) {
159+
boolean tinyInt1isBit, @Nullable String serverRsaPublicKeyFile) {
160160
this.isHost = isHost;
161161
this.domain = domain;
162162
this.port = port;
@@ -188,7 +188,7 @@ private MySqlConnectionConfiguration(
188188
this.resolver = resolver;
189189
this.metrics = metrics;
190190
this.tinyInt1isBit = tinyInt1isBit;
191-
this.serverRSAPublicKeyFile = serverRSAPublicKeyFile;
191+
this.serverRsaPublicKeyFile = serverRsaPublicKeyFile;
192192
}
193193

194194
/**
@@ -333,8 +333,8 @@ boolean isTinyInt1isBit() {
333333
}
334334

335335
@Nullable
336-
String getServerRSAPublicKeyFile() {
337-
return serverRSAPublicKeyFile;
336+
String getServerRsaPublicKeyFile() {
337+
return serverRsaPublicKeyFile;
338338
}
339339

340340
@Override
@@ -377,7 +377,7 @@ public boolean equals(Object o) {
377377
Objects.equals(resolver, that.resolver) &&
378378
metrics == that.metrics &&
379379
tinyInt1isBit == that.tinyInt1isBit &&
380-
serverRSAPublicKeyFile.equals(that.serverRSAPublicKeyFile);
380+
serverRsaPublicKeyFile.equals(that.serverRsaPublicKeyFile);
381381
}
382382

383383
@Override
@@ -393,7 +393,7 @@ public int hashCode() {
393393
queryCacheSize, prepareCacheSize,
394394
compressionAlgorithms, zstdCompressionLevel,
395395
loopResources, extensions, passwordPublisher, resolver, metrics, tinyInt1isBit,
396-
serverRSAPublicKeyFile);
396+
serverRsaPublicKeyFile);
397397
}
398398

399399
@Override
@@ -430,7 +430,7 @@ private String buildCommonToStringPart() {
430430
", resolver=" + resolver +
431431
", metrics=" + metrics +
432432
", tinyInt1isBit=" + tinyInt1isBit +
433-
", serverRSAPublicKeyFile=" + serverRSAPublicKeyFile;
433+
", serverRsaPublicKeyFile=" + serverRsaPublicKeyFile;
434434
}
435435

436436
/**
@@ -535,7 +535,7 @@ public static final class Builder {
535535
private boolean tinyInt1isBit = true;
536536

537537
@Nullable
538-
private String serverRSAPublicKeyFile;
538+
private String serverRsaPublicKeyFile;
539539

540540
/**
541541
* Builds an immutable {@link MySqlConnectionConfiguration} with current options.
@@ -572,7 +572,7 @@ public MySqlConnectionConfiguration build() {
572572
localInfileBufferSize, queryCacheSize, prepareCacheSize,
573573
compressionAlgorithms, zstdCompressionLevel, loopResources,
574574
Extensions.from(extensions, autodetectExtensions), passwordPublisher, resolver, metrics, tinyInt1isBit,
575-
serverRSAPublicKeyFile);
575+
serverRsaPublicKeyFile);
576576
}
577577

578578
/**
@@ -1260,8 +1260,8 @@ public Builder tinyInt1isBit(boolean tinyInt1isBit) {
12601260
* @return this {@link Builder}
12611261
* @since 1.4.2
12621262
*/
1263-
public Builder serverRSAPublicKeyFile(@Nullable String serverRSAPublicKeyFile) {
1264-
this.serverRSAPublicKeyFile = serverRSAPublicKeyFile;
1263+
public Builder serverRsaPublicKeyFile(@Nullable String serverRsaPublicKeyFile) {
1264+
this.serverRsaPublicKeyFile = serverRsaPublicKeyFile;
12651265
return this;
12661266
}
12671267

‎r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/MySqlConnectionFactoryProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ static MySqlConnectionConfiguration setup(ConnectionFactoryOptions options) {
448448
mapper.optional(TINY_INT_1_IS_BIT).asBoolean()
449449
.to(builder::tinyInt1isBit);
450450
mapper.optional(SERVER_RSA_PUBLIC_KEY_FILE).asString()
451-
.to(builder::serverRSAPublicKeyFile);
451+
.to(builder::serverRsaPublicKeyFile);
452452

453453
return builder.build();
454454
}

‎r2dbc-mysql/src/main/java/io/asyncer/r2dbc/mysql/authentication/MySqlAuthProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ static MySqlAuthProvider build(String type) {
148148
* @param serverRSAPublicKeyFile the file path on the local system of the database server's RSA Public Key
149149
* @return the encrypted bytes
150150
*/
151-
static byte[] rsaEncryption(byte[] bytesToEncrypt, String serverRSAPublicKeyFile) {
151+
static byte[] rsaEncryption(byte[] bytesToEncrypt, String serverRsaPublicKeyFile) {
152152
try {
153-
String key = new String(Files.readAllBytes(Paths.get(serverRSAPublicKeyFile)), Charset.defaultCharset());
153+
String key = new String(Files.readAllBytes(Paths.get(serverRsaPublicKeyFile)), Charset.defaultCharset());
154154

155155
String publicKeyPEM = key
156156
.replace("-----BEGIN PUBLIC KEY-----", "")

‎r2dbc-mysql/src/test/java/io/asyncer/r2dbc/mysql/MySqlConnectionConfigurationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ private static MySqlConnectionConfiguration filledUp() {
282282
.lockWaitTimeout(Duration.ofSeconds(5))
283283
.statementTimeout(Duration.ofSeconds(10))
284284
.autodetectExtensions(false)
285-
.serverRSAPublicKeyFile("/path/to/mysql/serverRSAPublicKey.pem")
285+
.serverRsaPublicKeyFile("/path/to/mysql/serverRSAPublicKey.pem")
286286
.build();
287287
}
288288
}

‎r2dbc-mysql/src/test/java/io/asyncer/r2dbc/mysql/MySqlConnectionFactoryProviderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,15 +532,15 @@ void sessionVariables(String input, List<String> expected) {
532532
}
533533

534534
@Test
535-
void validServerRSAPublicKeyFile() {
535+
void validServerRsaPublicKeyFile() {
536536
ConnectionFactoryOptions options = ConnectionFactoryOptions.builder()
537537
.option(DRIVER, "mysql")
538538
.option(HOST, "127.0.0.1")
539539
.option(USER, "root")
540540
.option(SERVER_RSA_PUBLIC_KEY_FILE, "/path/to/mysql/serverRSAPublicKey.pem")
541541
.build();
542542

543-
assertThat(ConnectionFactories.get(options)).isExactlyInstanceOf(MySqlConnectionFactory.class);
543+
assertThat(MySqlConnectionFactoryProvider.setup(options).getServerRsaPublicKeyFile()).isEqualTo("/path/to/mysql/serverRSAPublicKey.pem");
544544
}
545545

546546
static Stream<Arguments> sessionVariables() {

‎r2dbc-mysql/src/test/java/io/asyncer/r2dbc/mysql/RsaEncryptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void rsaEnabledSslDisabledTest() {
5252
.password(TestServerUtil.getPassword())
5353
.database(TestServerUtil.getDatabase())
5454
.sslMode(SslMode.DISABLED)
55-
.serverRSAPublicKeyFile("/path/to/mysql/serverRSAPublicKey.pem")
55+
.serverRsaPublicKeyFile("/path/to/mysql/serverRSAPublicKey.pem")
5656
.build();
5757

5858
assertThrows(IllegalArgumentException.class, () -> MySqlConnectionFactory.from(configuration2));

0 commit comments

Comments
 (0)