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.

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

Jump to bottom

[#6243] Ensure "node-to-node" tls is enabled in order to use "client-to-node" tls during create universe testcase #6910

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[#6243] Ensure "node-to-node" tls is enabled in order to use "client-to-node" tls during create universe testcase #6910

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions managed/src/main/java/com/yugabyte/yw/controllers/UniverseController.java
View file
Open in desktop
Expand Up @@ -121,11 +121,15 @@ public UniverseController(YBClientService service) {
}

private boolean validateEncryption(ObjectNode formData) {
JsonNode clusters = formData.get("clusters");
if (clusters == null) {
return true;
}
for (JsonNode cluster : formData.get("clusters")) {
JsonNode nodeToNodeEncryption = cluster.get("userIntent").get("enableNodeToNodeEncrypt");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can still result in a NPE if a cluster does not have a userIntent field. This method should not assume the data is in any specific shape since we don't have upstream validation of the shape of the JSON request payload before this method is called.

JsonNode clientToNodeEncryption = cluster.get("userIntent").get("enableClientToNodeEncrypt");

if (!nodeToNodeEncryption.asBoolean() && clientToNodeEncryption.asBoolean()) {
if (clientToNodeEncryption != null && !nodeToNodeEncryption.asBoolean(false) &&
(clientToNodeEncryption.asBoolean(false) || clientToNodeEncryption == null)) {
return false;
}
}
Expand Down
34 changes: 34 additions & 0 deletions managed/src/test/java/com/yugabyte/yw/controllers/UniverseControllerTest.java
View file
Open in desktop
Expand Up @@ -2205,6 +2205,40 @@ public void testExpandDiskSizeSuccess() {
verify(mockCommissioner).submit(eq(TaskType.UpdateDiskSize), argCaptor.capture());
assertAuditEntry(1, customer.uuid);
}
@Test
public void testUniverseListWithInvalidClientToNodeEncrypt() {
UUID fakeTaskUUID = UUID.randomUUID();
when(mockCommissioner.submit(Matchers.any(TaskType.class),
Matchers.any(UniverseDefinitionTaskParams.class))).thenReturn(fakeTaskUUID);

Provider p = ModelFactory.awsProvider(customer);
String accessKeyCode = "someKeyCode";
AccessKey.create(p.uuid, accessKeyCode, new AccessKey.KeyInfo());
Region r = Region.create(p, "region-1", "PlacementRegion 1", "default-image");
AvailabilityZone.create(r, "az-1", "PlacementAZ 1", "subnet-1");
InstanceType i = InstanceType.upsert(p.code, "c3.xlarge", 10, 5.5,
new InstanceType.InstanceTypeDetails());

ObjectNode bodyJson = Json.newObject();
ObjectNode userIntentJson = Json.newObject().put("universeName", "SingleUserUniverse")
.put("instanceType", i.getInstanceTypeCode()).put("replicationFactor", 3).put("numNodes", 3)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure line length does not exceed 100.

.put("enableYEDIS", "false").put("provider", p.uuid.toString())
.put("enableNodeToNodeEncrypt", false).put("enableClientToNodeEncrypt", 3);
ArrayNode regionList = Json.newArray().add(r.uuid.toString());
userIntentJson.set("regionList", regionList);
userIntentJson.put("accessKeyCode", accessKeyCode);
ArrayNode clustersJsonArray = Json.newArray()
.add(Json.newObject().set("userIntent", userIntentJson));
bodyJson.set("clusters", clustersJsonArray);
bodyJson.set("nodeDetailsSet", Json.newArray());

String url = "/api/customers/" + customer.uuid + "/universes";
Result result = doRequestWithAuthTokenAndBody("POST", url, authToken, bodyJson);
String expectedResult = String.format("It is imperative that the NodeToNode TLS encryption should be enabled for enabling the ClientToNode TLS encryption.");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same.

assertBadRequest(result, expectedResult);
assertAuditEntry(0, customer.uuid);
}


@Test
public void testUniverseCreateWithDisabledYedis() {
Expand Down