Skip to content

[Studio] Validate K8s certificate requests #556

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

Closed
Aias00 wants to merge 1 commit into from
Closed

[Studio] Validate K8s certificate requests #556

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
8 changes: 8 additions & 0 deletions server/src/main/java/com/rocketmq/studio/cluster/k8s/CreateCertDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package com.rocketmq.studio.cluster.k8s;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -28,10 +30,16 @@
@NoArgsConstructor
@AllArgsConstructor
public class CreateCertDTO {
@NotBlank(message = "name is required")
private String name;
@NotBlank(message = "namespace is required")
private String namespace;
@NotBlank(message = "cluster is required")
private String cluster;
@NotBlank(message = "type is required")
@Pattern(regexp = "TLS|mTLS|ServiceAccount", message = "type must be one of TLS, mTLS, ServiceAccount")
private String type;
@NotBlank(message = "issuer is required")
private String issuer;
private List<String> san;
}
2 changes: 2 additions & 0 deletions server/src/main/java/com/rocketmq/studio/cluster/k8s/DeleteCertDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.rocketmq.studio.cluster.k8s;

import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -26,5 +27,6 @@
@NoArgsConstructor
@AllArgsConstructor
public class DeleteCertDTO {
@NotBlank(message = "id is required")
private String id;
}
9 changes: 5 additions & 4 deletions server/src/main/java/com/rocketmq/studio/cluster/k8s/K8sCertController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.rocketmq.studio.cluster.k8s;

import com.rocketmq.studio.common.domain.Result;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
Expand All @@ -39,22 +40,22 @@ public Result<List<K8sCertVO>> listCerts() {
}

@PostMapping("/create")
public Result<K8sCertVO> createCert(@RequestBody CreateCertDTO command) {
public Result<K8sCertVO> createCert(@Valid @RequestBody CreateCertDTO command) {
return Result.ok(k8sCertService.createCert(command));
}

@PostMapping("/update")
public Result<K8sCertVO> updateCert(@RequestBody UpdateCertDTO command) {
public Result<K8sCertVO> updateCert(@Valid @RequestBody UpdateCertDTO command) {
return Result.ok(k8sCertService.updateCert(command));
}

@PostMapping("/renew")
public Result<K8sCertVO> renewCert(@RequestBody RenewCertDTO command) {
public Result<K8sCertVO> renewCert(@Valid @RequestBody RenewCertDTO command) {
return Result.ok(k8sCertService.renewCert(command));
}

@PostMapping("/delete")
public Result<Void> deleteCert(@RequestBody DeleteCertDTO command) {
public Result<Void> deleteCert(@Valid @RequestBody DeleteCertDTO command) {
k8sCertService.deleteCert(command);
return Result.ok();
}
Expand Down
2 changes: 2 additions & 0 deletions server/src/main/java/com/rocketmq/studio/cluster/k8s/RenewCertDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package com.rocketmq.studio.cluster.k8s;

import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -26,5 +27,6 @@
@NoArgsConstructor
@AllArgsConstructor
public class RenewCertDTO {
@NotBlank(message = "id is required")
private String id;
}
4 changes: 4 additions & 0 deletions server/src/main/java/com/rocketmq/studio/cluster/k8s/UpdateCertDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package com.rocketmq.studio.cluster.k8s;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -28,10 +30,12 @@
@NoArgsConstructor
@AllArgsConstructor
public class UpdateCertDTO {
@NotBlank(message = "id is required")
private String id;
private String name;
private String namespace;
private String cluster;
@Pattern(regexp = "TLS|mTLS|ServiceAccount", message = "type must be one of TLS, mTLS, ServiceAccount")
private String type;
private String issuer;
private List<String> san;
Expand Down
84 changes: 84 additions & 0 deletions server/src/test/java/com/rocketmq/studio/cluster/k8s/K8sCertControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.util.List;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
Expand Down Expand Up @@ -138,6 +139,89 @@ void createCertShouldAcceptMinimalCommand() throws Exception {
.andExpect(jsonPath("$.data.id").value("cert-min"));
}

@Test
void createCertShouldRejectMissingName() throws Exception {
mockMvc.perform(post("/api/k8s-certs/create")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"namespace": "default",
"cluster": "test-cluster",
"type": "TLS",
"issuer": "vault"
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code").value(400))
.andExpect(jsonPath("$.message").value("name is required"));

verifyNoInteractions(k8sCertService);
}

@Test
void createCertShouldRejectUnsupportedType() throws Exception {
mockMvc.perform(post("/api/k8s-certs/create")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"name": "new-cert",
"namespace": "default",
"cluster": "test-cluster",
"type": "PEM",
"issuer": "vault"
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code").value(400))
.andExpect(jsonPath("$.message").value("type must be one of TLS, mTLS, ServiceAccount"));

verifyNoInteractions(k8sCertService);
}

@Test
void updateCertShouldRejectMissingId() throws Exception {
mockMvc.perform(post("/api/k8s-certs/update")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"name": "updated-cert"
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code").value(400))
.andExpect(jsonPath("$.message").value("id is required"));

verifyNoInteractions(k8sCertService);
}

@Test
void renewCertShouldRejectBlankId() throws Exception {
mockMvc.perform(post("/api/k8s-certs/renew")
.contentType(MediaType.APPLICATION_JSON)
.content("""
{
"id": " "
}
"""))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code").value(400))
.andExpect(jsonPath("$.message").value("id is required"));

verifyNoInteractions(k8sCertService);
}

@Test
void deleteCertShouldRejectMissingId() throws Exception {
mockMvc.perform(post("/api/k8s-certs/delete")
.contentType(MediaType.APPLICATION_JSON)
.content("{}"))
.andExpect(status().isBadRequest())
.andExpect(jsonPath("$.code").value(400))
.andExpect(jsonPath("$.message").value("id is required"));

verifyNoInteractions(k8sCertService);
}

private K8sCertVO buildCert(String id, String name, CertType type, CertStatus status) {
K8sCertVO cert = K8sCertVO.builder()
.name(name)
Expand Down
Loading