Skip to content

HDDS-4576. TestDefaultCertificateClient misuses chars param of random() #1684

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

Merged
xiaoyuyao merged 1 commit into from
Dec 14, 2020
Merged

HDDS-4576. TestDefaultCertificateClient misuses chars param of random() #1684

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
39 changes: 19 additions & 20 deletions ...org/apache/hadoop/hdds/security/x509/certificate/client/TestDefaultCertificateClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.junit.Test;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -51,6 +50,7 @@
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.test.LambdaTestUtils;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.*;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_METADATA_DIR_NAME;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_NAMES;
Expand Down Expand Up @@ -201,7 +201,7 @@ private X509Certificate generateX509Cert(KeyPair keyPair) throws Exception {

@Test
public void testSignDataStream() throws Exception {
String data = RandomStringUtils.random(100, StandardCharsets.UTF_8.name());
String data = RandomStringUtils.random(100);
FileUtils.deleteQuietly(Paths.get(
omSecurityConfig.getKeyLocation(OM_COMPONENT).toString(),
omSecurityConfig.getPrivateKeyFileName()).toFile());
Expand All @@ -212,13 +212,12 @@ public void testSignDataStream() throws Exception {
// Expect error when there is no private key to sign.
LambdaTestUtils.intercept(IOException.class, "Error while " +
"signing the stream",
() -> omCertClient.signDataStream(IOUtils.toInputStream(data,
StandardCharsets.UTF_8)));
() -> omCertClient.signDataStream(IOUtils.toInputStream(data, UTF_8)));

generateKeyPairFiles();
byte[] sign = omCertClient.signDataStream(IOUtils.toInputStream(data,
StandardCharsets.UTF_8));
validateHash(sign, data.getBytes());
UTF_8));
validateHash(sign, data.getBytes(UTF_8));
}

/**
Expand All @@ -239,22 +238,22 @@ private void validateHash(byte[] hash, byte[] data)
*/
@Test
public void verifySignatureStream() throws Exception {
String data = RandomStringUtils.random(500, StandardCharsets.UTF_8.name());
String data = RandomStringUtils.random(500);
byte[] sign = omCertClient.signDataStream(IOUtils.toInputStream(data,
StandardCharsets.UTF_8));
UTF_8));

// Positive tests.
assertTrue(omCertClient.verifySignature(data.getBytes(), sign,
assertTrue(omCertClient.verifySignature(data.getBytes(UTF_8), sign,
x509Certificate));
assertTrue(omCertClient.verifySignature(
IOUtils.toInputStream(data, StandardCharsets.UTF_8),
IOUtils.toInputStream(data, UTF_8),
sign, x509Certificate));

// Negative tests.
assertFalse(omCertClient.verifySignature(data.getBytes(),
"abc".getBytes(), x509Certificate));
assertFalse(omCertClient.verifySignature(data.getBytes(UTF_8),
"abc".getBytes(UTF_8), x509Certificate));
assertFalse(omCertClient.verifySignature(IOUtils.toInputStream(data,
StandardCharsets.UTF_8), "abc".getBytes(), x509Certificate));
UTF_8), "abc".getBytes(UTF_8), x509Certificate));

}

Expand All @@ -263,21 +262,21 @@ public void verifySignatureStream() throws Exception {
*/
@Test
public void verifySignatureDataArray() throws Exception {
String data = RandomStringUtils.random(500, StandardCharsets.UTF_8.name());
byte[] sign = omCertClient.signData(data.getBytes());
String data = RandomStringUtils.random(500);
byte[] sign = omCertClient.signData(data.getBytes(UTF_8));

// Positive tests.
assertTrue(omCertClient.verifySignature(data.getBytes(), sign,
assertTrue(omCertClient.verifySignature(data.getBytes(UTF_8), sign,
x509Certificate));
assertTrue(omCertClient.verifySignature(
IOUtils.toInputStream(data, StandardCharsets.UTF_8),
IOUtils.toInputStream(data, UTF_8),
sign, x509Certificate));

// Negative tests.
assertFalse(omCertClient.verifySignature(data.getBytes(),
"abc".getBytes(), x509Certificate));
assertFalse(omCertClient.verifySignature(data.getBytes(UTF_8),
"abc".getBytes(UTF_8), x509Certificate));
assertFalse(omCertClient.verifySignature(IOUtils.toInputStream(data,
StandardCharsets.UTF_8), "abc".getBytes(), x509Certificate));
UTF_8), "abc".getBytes(UTF_8), x509Certificate));

}

Expand Down